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.
| ObjectSlice.cpp (pymol-v1.8.6.0.tar.bz2) | : | ObjectSlice.cpp (pymol-v2.1.0.tar.bz2) |
|---|
| | |
| skipping to change at line 44 | | skipping to change at line 44 |
|---|
| #include"main.h" | | #include"main.h" |
| #include"Scene.h" | | #include"Scene.h" |
| #include"Setting.h" | | #include"Setting.h" |
| #include"Executive.h" | | #include"Executive.h" |
| #include"PConv.h" | | #include"PConv.h" |
| #include"P.h" | | #include"P.h" |
| #include"Text.h" | | #include"Text.h" |
| #include"Util.h" | | #include"Util.h" |
| #include"ButMode.h" | | #include"ButMode.h" |
| #include"ObjectGadgetRamp.h" | | #include"ObjectGadgetRamp.h" |
|
| | #include"CGO.h" |
| | |
| #define START_STRIP -1 | | #define START_STRIP -1 |
| #define STOP_STRIP -2 | | #define STOP_STRIP -2 |
| | |
| ObjectSlice *ObjectSliceNew(PyMOLGlobals * G); | | ObjectSlice *ObjectSliceNew(PyMOLGlobals * G); |
| | |
| static void ObjectSliceFree(ObjectSlice * I); | | static void ObjectSliceFree(ObjectSlice * I); |
| void ObjectSliceStateInit(PyMOLGlobals * G, ObjectSliceState * ms); | | void ObjectSliceStateInit(PyMOLGlobals * G, ObjectSliceState * ms); |
| void ObjectSliceRecomputeExtent(ObjectSlice * I); | | void ObjectSliceRecomputeExtent(ObjectSlice * I); |
| | |
| | |
| skipping to change at line 809 | | skipping to change at line 810 |
|---|
| if(oss) { | | if(oss) { |
| if((offset >= 0) && (offset < oss->n_points)) | | if((offset >= 0) && (offset < oss->n_points)) |
| if(oss->flags[offset]) { | | if(oss->flags[offset]) { |
| copy3f(oss->points + 3 * offset, v); | | copy3f(oss->points + 3 * offset, v); |
| result = true; | | result = true; |
| } | | } |
| } | | } |
| return (result); | | return (result); |
| } | | } |
| | |
|
| /* | | |
| int ObjectSliceGetOrigin(ObjectSlice * I, int state, float *origin) | | |
| { | | |
| int ok = false; | | |
| | |
| int cur_state = 0; | | |
| ObjectSliceState *oss = NULL; | | |
| | |
| if(state >= 0) | | |
| if(state < I->NState) | | |
| if(I->State[state].Active) | | |
| oss = I->State + state; | | |
| | |
| while(1) { | | |
| if(state < 0) { // all_states | | |
| oss = I->State + cur_state; | | |
| } else { | | |
| if(!oss) { | | |
| if(I->NState && | | |
| ((SettingGetGlobal_b(I->Obj.G, cSetting_static_singletons) && (I->NSt | | |
| ate == 1)))) | | |
| oss = I->State; | | |
| } | | |
| } | | |
| if(oss) { | | |
| if(oss->Active) { | | |
| copy3f(oss->origin, origin); | | |
| ok = true; | | |
| } | | |
| } | | |
| if(state >= 0) | | |
| break; | | |
| cur_state = cur_state + 1; | | |
| if(cur_state >= I->NState) | | |
| break; | | |
| } | | |
| return ok; | | |
| }*/ | | |
| | | |
| static int ObjectSliceAddSlicePoint(float *pt0, float *pt1, float *zaxis, float
d, | | static int ObjectSliceAddSlicePoint(float *pt0, float *pt1, float *zaxis, float
d, |
| float *coords, float *origin) | | float *coords, float *origin) |
| { | | { |
| | |
| float p0[3]; | | float p0[3]; |
| float p1[3]; | | float p1[3]; |
| float u; | | float u; |
| | |
| p0[0] = pt0[0] - origin[0]; | | p0[0] = pt0[0] - origin[0]; |
| p0[1] = pt0[1] - origin[1]; | | p0[1] = pt0[1] - origin[1]; |
| | | |
| End of changes. 2 change blocks. |
|---|
| 39 lines changed or deleted | | 1 lines changed or added |
|---|
"Fossies" - the Fresh Open Source Software Archive 