is a Python-enhanced molecular graphics tool. It excels at 3D visualization of proteins, small molecules, density, surfaces, and trajectories. It also includes molecular editing, ray tracing, and movies. Open Source version.
| DistSet.cpp (pymol-v2.1.0.tar.bz2) | : | DistSet.cpp (pymol-open-source-2.2.0) |
|---|
| | |
| skipping to change at line 428 | | skipping to change at line 428 |
|---|
| } | | } |
| /* status bar 100% */ | | /* status bar 100% */ |
| OrthoBusyFast(I->State.G, 1, 1); | | OrthoBusyFast(I->State.G, 1, 1); |
| } | | } |
| | |
| /*========================================================================*/ | | /*========================================================================*/ |
| void DistSet::render(RenderInfo * info) | | void DistSet::render(RenderInfo * info) |
| { | | { |
| DistSet * I = this; | | DistSet * I = this; |
| CRay *ray = info->ray; | | CRay *ray = info->ray; |
|
| int pass = info->pass; | | |
| Picking **pick = info->pick; | | Picking **pick = info->pick; |
|
| int float_labels = SettingGet_i(I->State.G, | | |
| NULL, | | |
| I->Obj->Obj.Setting, | | |
| cSetting_float_labels); | | |
| int a; | | int a; |
| ::Rep *r; | | ::Rep *r; |
| for(a = 0; a < I->NRep; a++) | | for(a = 0; a < I->NRep; a++) |
| { | | { |
| if(!GET_BIT(I->Obj->Obj.visRep, a)) | | if(!GET_BIT(I->Obj->Obj.visRep, a)) |
| continue; | | continue; |
| if(!I->Rep[a]) { | | if(!I->Rep[a]) { |
| switch(a) { | | switch(a) { |
| case cRepDash: | | case cRepDash: |
| I->Rep[a] = RepDistDashNew(I, -1); | | I->Rep[a] = RepDistDashNew(I, -1); |
| | |
| skipping to change at line 465 | | skipping to change at line 460 |
|---|
| } | | } |
| if(I->Rep[a]) | | if(I->Rep[a]) |
| { | | { |
| r = I->Rep[a]; | | r = I->Rep[a]; |
| if(ray || pick) { | | if(ray || pick) { |
| if(ray) | | if(ray) |
| ray->color3fv(ColorGet(I->State.G, I->Obj->Obj.Color)); | | ray->color3fv(ColorGet(I->State.G, I->Obj->Obj.Color)); |
| r->fRender(r, info); | | r->fRender(r, info); |
| } else { | | } else { |
| ObjectUseColor((CObject *) I->Obj); | | ObjectUseColor((CObject *) I->Obj); |
|
| switch (a) { | | // now all filtering for passes happen in ObjectDistRender |
| case cRepLabel: | | |
| if(float_labels) { | | |
| if(pass == -1) | | |
| r->fRender(r, info); | | |
| } else if(pass == 0) | | |
| r->fRender(r, info); | | r->fRender(r, info); |
|
| break; | | |
| default: | | |
| if(pass == 0) { | | |
| r->fRender(r, info); | | |
| } | | |
| break; | | |
| } | | |
| } | | } |
| } | | } |
| } | | } |
| } | | } |
| | |
| /*========================================================================*/ | | /*========================================================================*/ |
| DistSet *DistSetNew(PyMOLGlobals * G) | | DistSet *DistSetNew(PyMOLGlobals * G) |
| { | | { |
| int a; | | int a; |
| OOAlloc(G, DistSet); | | OOAlloc(G, DistSet); |
| | | |
| End of changes. 4 change blocks. |
|---|
| 18 lines changed or deleted | | 1 lines changed or added |
|---|
"Fossies" - the Fresh Open Source Software Archive 