"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "layer1/ButMode.cpp" between
pymol-v1.8.6.0.tar.bz2 and pymol-v2.1.0.tar.bz2

About: PyMOL 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.

[ To the main PyMOL source changes report ]

ButMode.cpp  (pymol-v1.8.6.0.tar.bz2):ButMode.cpp  (pymol-v2.1.0.tar.bz2)
skipping to change at line 36 skipping to change at line 36
#include "Scene.h" #include "Scene.h"
#include "Util.h" #include "Util.h"
#include "Ortho.h" #include "Ortho.h"
#include "Setting.h" #include "Setting.h"
#include "P.h" #include "P.h"
#include "Text.h" #include "Text.h"
#include "Menu.h" #include "Menu.h"
#include "CGO.h" #include "CGO.h"
#include "Movie.h" #include "Movie.h"
#define cButModeLineHeight 12 #define cButModeLineHeight DIP2PIXEL(12)
#define cButModeLeftMargin 2 #define cButModeLeftMargin DIP2PIXEL(2)
#define cButModeTopMargin 1 #define cButModeTopMargin DIP2PIXEL(1)
#define cButModeBottomMargin 2 #define cButModeBottomMargin DIP2PIXEL(2)
struct _CButMode { struct _CButMode {
::Block *Block; ::Block *Block;
CodeType Code[cButModeCount + 1]; CodeType Code[cButModeCount + 1];
int NCode; int NCode;
int Mode[cButModeInputCount]; int Mode[cButModeInputCount];
int NBut; int NBut;
float Rate; float Rate;
float RateShown; float RateShown;
float Samples, Delay; float Samples, Delay;
skipping to change at line 69 skipping to change at line 69
{ {
CButMode *I = G->ButMode; CButMode *I = G->ButMode;
{ {
return (I->Block); return (I->Block);
} }
} }
int ButModeGetHeight(PyMOLGlobals * G) int ButModeGetHeight(PyMOLGlobals * G)
{ {
if(SettingGetGlobal_b(G, cSetting_mouse_grid)) if(SettingGetGlobal_b(G, cSetting_mouse_grid))
return 124; return DIP2PIXEL(124);
else else
return 40; return DIP2PIXEL(40);
} }
/*========================================================================*/ /*========================================================================*/
int ButModeGet(PyMOLGlobals * G, int button) int ButModeGet(PyMOLGlobals * G, int button)
{ {
CButMode *I = G->ButMode; CButMode *I = G->ButMode;
if((button >= 0) && (button < I->NBut)) { if((button >= 0) && (button < I->NBut)) {
return I->Mode[button]; return I->Mode[button];
} }
return 0; return 0;
skipping to change at line 152 skipping to change at line 152
PyMOLGlobals *G = block->G; PyMOLGlobals *G = block->G;
int dy = (y - block->rect.bottom) / cButModeLineHeight; int dy = (y - block->rect.bottom) / cButModeLineHeight;
// int dx = (x - block->rect.left); // int dx = (x - block->rect.left);
int forward = 1; int forward = 1;
// TAKEN OUT : BB 12/11 : Mouse position should not have // TAKEN OUT : BB 12/11 : Mouse position should not have
// an effect on whether the mouse ring goes forwards or // an effect on whether the mouse ring goes forwards or
// backwards. // backwards.
// forward = (dx > ((block->rect.right - block->rect.left) / 2)); // forward = (dx > ((block->rect.right - block->rect.left) / 2));
// //
/* register CButMode *I=block->G->ButMode; */ /* register CButMode *I=block->G->ButMode; */
if(button == P_GLUT_BUTTON_SCROLL_BACKWARD || button == P_GLUT_RIGHT_BUTTON)
forward = !forward;
if(mod == cOrthoSHIFT)
forward = !forward;
if(dy < 2) { if(dy < 2) {
if(ButModeTranslate(G, P_GLUT_SINGLE_LEFT, 0) != cButModePickAtom) { if(ButModeTranslate(G, P_GLUT_SINGLE_LEFT, 0) != cButModePickAtom) {
switch (mod) {
case cOrthoSHIFT:
forward = !forward;
break;
}
if(!forward) { if(!forward) {
PLog(G, "cmd.mouse('select_backward')", cPLog_pym); PLog(G, "cmd.mouse('select_backward')", cPLog_pym);
OrthoCommandIn(G, "mouse select_backward,quiet=1"); OrthoCommandIn(G, "mouse select_backward,quiet=1");
} else { } else {
PLog(G, "cmd.mouse('select_forward')", cPLog_pym); PLog(G, "cmd.mouse('select_forward')", cPLog_pym);
OrthoCommandIn(G, "mouse select_forward,quiet=1"); OrthoCommandIn(G, "mouse select_forward,quiet=1");
} }
} }
} else { } else {
if(button == P_GLUT_RIGHT_BUTTON) { if(button == P_GLUT_RIGHT_BUTTON) {
MenuActivate0Arg(G,x,y,x,y,false,"mouse_config"); MenuActivate0Arg(G,x,y,x,y,false,"mouse_config");
} else { } else {
switch (mod) {
case cOrthoSHIFT:
forward = !forward;
break;
}
if(!forward) { if(!forward) {
PLog(G, "cmd.mouse('backward')", cPLog_pym); PLog(G, "cmd.mouse('backward')", cPLog_pym);
OrthoCommandIn(G, "mouse backward,quiet=1"); OrthoCommandIn(G, "mouse backward,quiet=1");
} else { } else {
PLog(G, "cmd.mouse('forward')", cPLog_pym); PLog(G, "cmd.mouse('forward')", cPLog_pym);
OrthoCommandIn(G, "mouse forward,quiet=1"); OrthoCommandIn(G, "mouse forward,quiet=1");
} }
} }
} }
return (1); return (1);
skipping to change at line 205 skipping to change at line 199
int mode; int mode;
float *textColor = I->Block->TextColor; float *textColor = I->Block->TextColor;
float *textColor2 = I->TextColor2; float *textColor2 = I->TextColor2;
#define BLANK_STR " " #define BLANK_STR " "
if(G->HaveGUI && G->ValidContext && ((block->rect.right - block->rect.left) > 6)) { if(G->HaveGUI && G->ValidContext && ((block->rect.right - block->rect.left) > 6)) {
if(SettingGetGlobal_b(G, cSetting_internal_gui_mode) == 0) { if(SettingGetGlobal_b(G, cSetting_internal_gui_mode) == 0) {
if (orthoCGO) if (orthoCGO)
CGOColorv(orthoCGO, I->Block->BackColor); CGOColorv(orthoCGO, I->Block->BackColor);
#ifndef PURE_OPENGL_ES_2
else else
glColor3fv(I->Block->BackColor); glColor3fv(I->Block->BackColor);
#endif
BlockFill(I->Block ORTHOCGOARGVAR); BlockFill(I->Block ORTHOCGOARGVAR);
BlockDrawLeftEdge(I->Block ORTHOCGOARGVAR); BlockDrawLeftEdge(I->Block ORTHOCGOARGVAR);
} else { } else {
BlockDrawLeftEdge(I->Block ORTHOCGOARGVAR); BlockDrawLeftEdge(I->Block ORTHOCGOARGVAR);
if (orthoCGO) if (orthoCGO)
CGOColor(orthoCGO, .5f, .5f, .5f); CGOColor(orthoCGO, .5f, .5f, .5f);
#ifndef PURE_OPENGL_ES_2
else else
glColor3f(0.5, 0.5, 0.5); glColor3f(0.5, 0.5, 0.5);
#endif
BlockDrawTopEdge(I->Block); BlockDrawTopEdge(I->Block);
textColor2 = OrthoGetOverlayColor(G); textColor2 = OrthoGetOverlayColor(G);
textColor = textColor2; textColor = textColor2;
} }
x = I->Block->rect.left + cButModeLeftMargin; x = I->Block->rect.left + cButModeLeftMargin;
y = (I->Block->rect.top - cButModeLineHeight) - cButModeTopMargin; y = (I->Block->rect.top - cButModeLineHeight) - cButModeTopMargin;
TextSetColor(G, textColor); TextSetColor(G, textColor);
TextDrawStrAt(G, "Mouse Mode ", x + 1, y ORTHOCGOARGVAR); TextDrawStrAt(G, "Mouse Mode ", x + 1, y ORTHOCGOARGVAR);
TextSetColor(G, I->TextColor3); TextSetColor(G, I->TextColor3);
TextDrawStrAt(G, SettingGetGlobal_s(G, cSetting_button_mode_name), x + 88, y ORTHOCGOARGVAR); TextDrawStrAt(G, SettingGetGlobal_s(G, cSetting_button_mode_name), x + DIP2P IXEL(88), y ORTHOCGOARGVAR);
/* TextDrawStrAt(G,"2-Bttn Selecting",x+88,y); */ /* TextDrawStrAt(G,"2-Bttn Selecting",x+88,y); */
y -= cButModeLineHeight; y -= cButModeLineHeight;
if(SettingGetGlobal_b(G, cSetting_mouse_grid)) { if(SettingGetGlobal_b(G, cSetting_mouse_grid)) {
TextSetColor(G, I->TextColor3); TextSetColor(G, I->TextColor3);
TextDrawStrAt(G, "Buttons", x + 6, y ORTHOCGOARGVAR); TextDrawStrAt(G, "Buttons", x + DIP2PIXEL(6), y ORTHOCGOARGVAR);
TextSetColor(G, I->TextColor1); TextSetColor(G, I->TextColor1);
/* TextDrawStrAt(G," Left Mddl Rght Scrl",x+48,y); */ /* TextDrawStrAt(G," Left Mddl Rght Scrl",x+48,y); */
TextDrawStrAt(G, " L M R Wheel", x + 43, y ORTHOCGOARGVAR); TextDrawStrAt(G, " L M R Wheel", x + DIP2PIXEL(43), y ORTHOCGOAR GVAR);
y -= cButModeLineHeight; y -= cButModeLineHeight;
/* glColor3fv(I->Block->TextColor); /* glColor3fv(I->Block->TextColor);
TextDrawStrAt(G,"K",x,y-4); */ TextDrawStrAt(G,"K",x,y-4); */
TextSetColor(G, I->TextColor3); TextSetColor(G, I->TextColor3);
TextDrawStrAt(G, "&", x + 12, y ORTHOCGOARGVAR); TextDrawStrAt(G, "&", x + DIP2PIXEL(12), y ORTHOCGOARGVAR);
TextDrawStrAt(G, "Keys", x + 24, y ORTHOCGOARGVAR); TextDrawStrAt(G, "Keys", x + DIP2PIXEL(24), y ORTHOCGOARGVAR);
TextSetColor(G, textColor2); TextSetColor(G, textColor2);
TextSetPos2i(G, x + 64, y); TextSetPos2i(G, x + DIP2PIXEL(64), y);
for(a = 0; a < 3; a++) { for(a = 0; a < 3; a++) {
mode = I->Mode[a]; mode = I->Mode[a];
if(mode < 0) if(mode < 0)
TextDrawStr(G, BLANK_STR ORTHOCGOARGVAR); TextDrawStr(G, BLANK_STR ORTHOCGOARGVAR);
else else
TextDrawStr(G, I->Code[mode] ORTHOCGOARGVAR); TextDrawStr(G, I->Code[mode] ORTHOCGOARGVAR);
} }
mode = I->Mode[12]; mode = I->Mode[12];
if(mode < 0) if(mode < 0)
TextDrawStr(G, BLANK_STR ORTHOCGOARGVAR); TextDrawStr(G, BLANK_STR ORTHOCGOARGVAR);
else else
TextDrawStr(G, I->Code[mode] ORTHOCGOARGVAR); TextDrawStr(G, I->Code[mode] ORTHOCGOARGVAR);
y -= cButModeLineHeight; y -= cButModeLineHeight;
/* TextSetColor(G,I->Block->TextColor); /* TextSetColor(G,I->Block->TextColor);
TextDrawStrAt(G,"e",x+5,y-1); */ TextDrawStrAt(G,"e",x+5,y-1); */
TextSetColor(G, I->TextColor1); TextSetColor(G, I->TextColor1);
TextSetColor(G, I->TextColor1); TextSetColor(G, I->TextColor1);
TextDrawStrAt(G, "Shft ", x + 24, y ORTHOCGOARGVAR); TextDrawStrAt(G, "Shft ", x + DIP2PIXEL(24), y ORTHOCGOARGVAR);
TextSetColor(G, textColor2); TextSetColor(G, textColor2);
TextSetPos2i(G, x + 64, y); TextSetPos2i(G, x + DIP2PIXEL(64), y);
for(a = 3; a < 6; a++) { for(a = 3; a < 6; a++) {
mode = I->Mode[a]; mode = I->Mode[a];
if(mode < 0) if(mode < 0)
TextDrawStr(G, BLANK_STR ORTHOCGOARGVAR); TextDrawStr(G, BLANK_STR ORTHOCGOARGVAR);
else else
TextDrawStr(G, I->Code[mode] ORTHOCGOARGVAR); TextDrawStr(G, I->Code[mode] ORTHOCGOARGVAR);
} }
mode = I->Mode[13]; mode = I->Mode[13];
if(mode < 0) if(mode < 0)
TextDrawStr(G, BLANK_STR ORTHOCGOARGVAR); TextDrawStr(G, BLANK_STR ORTHOCGOARGVAR);
else else
TextDrawStr(G, I->Code[mode] ORTHOCGOARGVAR); TextDrawStr(G, I->Code[mode] ORTHOCGOARGVAR);
y -= cButModeLineHeight; y -= cButModeLineHeight;
/* glColor3fv(I->Block->TextColor); /* glColor3fv(I->Block->TextColor);
TextDrawStrAt(G,"y",x+10,y+2); */ TextDrawStrAt(G,"y",x+10,y+2); */
TextSetColor(G, I->TextColor1); TextSetColor(G, I->TextColor1);
TextDrawStrAt(G, "Ctrl ", x + 24, y ORTHOCGOARGVAR); TextDrawStrAt(G, "Ctrl ", x + DIP2PIXEL(24), y ORTHOCGOARGVAR);
TextSetColor(G, textColor2); TextSetColor(G, textColor2);
TextSetPos2i(G, x + 64, y); TextSetPos2i(G, x + DIP2PIXEL(64), y);
for(a = 6; a < 9; a++) { for(a = 6; a < 9; a++) {
mode = I->Mode[a]; mode = I->Mode[a];
if(mode < 0) if(mode < 0)
TextDrawStr(G, BLANK_STR ORTHOCGOARGVAR); TextDrawStr(G, BLANK_STR ORTHOCGOARGVAR);
else else
TextDrawStr(G, I->Code[mode] ORTHOCGOARGVAR); TextDrawStr(G, I->Code[mode] ORTHOCGOARGVAR);
} }
mode = I->Mode[14]; mode = I->Mode[14];
if(mode < 0) if(mode < 0)
TextDrawStr(G, BLANK_STR ORTHOCGOARGVAR); TextDrawStr(G, BLANK_STR ORTHOCGOARGVAR);
else else
TextDrawStr(G, I->Code[mode] ORTHOCGOARGVAR); TextDrawStr(G, I->Code[mode] ORTHOCGOARGVAR);
y -= cButModeLineHeight; y -= cButModeLineHeight;
/* glColor3fv(I->Block->TextColor); /* glColor3fv(I->Block->TextColor);
TextDrawStrAt(G,"s",x+15,y+3); */ TextDrawStrAt(G,"s",x+15,y+3); */
TextSetColor(G, I->TextColor1); TextSetColor(G, I->TextColor1);
TextSetColor(G, I->TextColor1); TextSetColor(G, I->TextColor1);
TextDrawStrAt(G, "CtSh ", x + 24, y ORTHOCGOARGVAR); TextDrawStrAt(G, "CtSh ", x + DIP2PIXEL(24), y ORTHOCGOARGVAR);
TextSetColor(G, textColor2); TextSetColor(G, textColor2);
TextSetPos2i(G, x + 64, y); TextSetPos2i(G, x + DIP2PIXEL(64), y);
for(a = 9; a < 12; a++) { for(a = 9; a < 12; a++) {
mode = I->Mode[a]; mode = I->Mode[a];
if(mode < 0) if(mode < 0)
TextDrawStr(G, BLANK_STR ORTHOCGOARGVAR); TextDrawStr(G, BLANK_STR ORTHOCGOARGVAR);
else else
TextDrawStr(G, I->Code[mode] ORTHOCGOARGVAR); TextDrawStr(G, I->Code[mode] ORTHOCGOARGVAR);
} }
mode = I->Mode[15]; mode = I->Mode[15];
if(mode < 0) if(mode < 0)
TextDrawStr(G, BLANK_STR ORTHOCGOARGVAR); TextDrawStr(G, BLANK_STR ORTHOCGOARGVAR);
else else
TextDrawStr(G, I->Code[mode] ORTHOCGOARGVAR); TextDrawStr(G, I->Code[mode] ORTHOCGOARGVAR);
y -= cButModeLineHeight; y -= cButModeLineHeight;
TextSetColor(G, I->Block->TextColor); TextSetColor(G, I->Block->TextColor);
TextSetColor(G, I->TextColor1); TextSetColor(G, I->TextColor1);
TextDrawStrAt(G, " SnglClk", x - 8, y ORTHOCGOARGVAR); TextDrawStrAt(G, " SnglClk", x - DIP2PIXEL(8), y ORTHOCGOARGVAR);
TextSetColor(G, textColor2); TextSetColor(G, textColor2);
TextSetPos2i(G, x + 64, y); TextSetPos2i(G, x + DIP2PIXEL(64), y);
for(a = 19; a < 22; a++) { for(a = 19; a < 22; a++) {
mode = I->Mode[a]; mode = I->Mode[a];
if(mode < 0) if(mode < 0)
TextDrawStr(G, BLANK_STR ORTHOCGOARGVAR); TextDrawStr(G, BLANK_STR ORTHOCGOARGVAR);
else else
TextDrawStr(G, I->Code[mode] ORTHOCGOARGVAR); TextDrawStr(G, I->Code[mode] ORTHOCGOARGVAR);
} }
TextSetColor(G, I->Block->TextColor); TextSetColor(G, I->Block->TextColor);
y -= cButModeLineHeight; y -= cButModeLineHeight;
TextSetColor(G, I->Block->TextColor); TextSetColor(G, I->Block->TextColor);
TextSetColor(G, I->TextColor1); TextSetColor(G, I->TextColor1);
TextDrawStrAt(G, " DblClk", x, y ORTHOCGOARGVAR); TextDrawStrAt(G, " DblClk", x, y ORTHOCGOARGVAR);
TextSetColor(G, textColor2); TextSetColor(G, textColor2);
TextSetPos2i(G, x + 64, y); TextSetPos2i(G, x + DIP2PIXEL(64), y);
for(a = 16; a < 19; a++) { for(a = 16; a < 19; a++) {
mode = I->Mode[a]; mode = I->Mode[a];
if(mode < 0) if(mode < 0)
TextDrawStr(G, BLANK_STR ORTHOCGOARGVAR); TextDrawStr(G, BLANK_STR ORTHOCGOARGVAR);
else else
TextDrawStr(G, I->Code[mode] ORTHOCGOARGVAR); TextDrawStr(G, I->Code[mode] ORTHOCGOARGVAR);
} }
TextSetColor(G, I->Block->TextColor); TextSetColor(G, I->Block->TextColor);
y -= cButModeLineHeight; y -= cButModeLineHeight;
} }
{ {
TextSetColor(G, textColor); TextSetColor(G, textColor);
if(ButModeTranslate(G, P_GLUT_SINGLE_LEFT, 0) == cButModePickAtom) { if(ButModeTranslate(G, P_GLUT_SINGLE_LEFT, 0) == cButModePickAtom) {
TextDrawStrAt(G, "Picking ", x, y ORTHOCGOARGVAR); TextDrawStrAt(G, "Picking ", x, y ORTHOCGOARGVAR);
TextSetColor(G, I->TextColor3); TextSetColor(G, I->TextColor3);
TextDrawStrAt(G, "Atoms (and Joints)", x + 64, y ORTHOCGOARGVAR); TextDrawStrAt(G, "Atoms (and Joints)", x + DIP2PIXEL(64), y ORTHOCGOARGV AR);
} else { } else {
TextDrawStrAt(G, "Selecting ", x, y ORTHOCGOARGVAR); TextDrawStrAt(G, "Selecting ", x, y ORTHOCGOARGVAR);
TextSetColor(G, I->TextColor3); TextSetColor(G, I->TextColor3);
switch (SettingGetGlobal_i(G, cSetting_mouse_selection_mode)) { switch (SettingGetGlobal_i(G, cSetting_mouse_selection_mode)) {
case 0: case 0:
TextDrawStrAt(G, "Atoms", x + 80, y ORTHOCGOARGVAR); TextDrawStrAt(G, "Atoms", x + DIP2PIXEL(80), y ORTHOCGOARGVAR);
break; break;
case 1: case 1:
TextDrawStrAt(G, "Residues", x + 80, y ORTHOCGOARGVAR); TextDrawStrAt(G, "Residues", x + DIP2PIXEL(80), y ORTHOCGOARGVAR);
break; break;
case 2: case 2:
TextDrawStrAt(G, "Chains", x + 80, y ORTHOCGOARGVAR); TextDrawStrAt(G, "Chains", x + DIP2PIXEL(80), y ORTHOCGOARGVAR);
break; break;
case 3: case 3:
TextDrawStrAt(G, "Segments", x + 80, y ORTHOCGOARGVAR); TextDrawStrAt(G, "Segments", x + DIP2PIXEL(80), y ORTHOCGOARGVAR);
break; break;
case 4: case 4:
TextDrawStrAt(G, "Objects", x + 80, y ORTHOCGOARGVAR); TextDrawStrAt(G, "Objects", x + DIP2PIXEL(80), y ORTHOCGOARGVAR);
break; break;
case 5: case 5:
TextDrawStrAt(G, "Molecules", x + 80, y ORTHOCGOARGVAR); TextDrawStrAt(G, "Molecules", x + DIP2PIXEL(80), y ORTHOCGOARGVAR);
break; break;
case 6: case 6:
TextDrawStrAt(G, "C-alphas", x + 80, y ORTHOCGOARGVAR); TextDrawStrAt(G, "C-alphas", x + DIP2PIXEL(80), y ORTHOCGOARGVAR);
break; break;
} }
} }
} }
} }
if (!ORTHOCGOARGB || !(SettingGetGlobal_b(G, cSetting_show_frame_rate) || Movi ePlaying(G))) { if (!ORTHOCGOARGB || !(SettingGetGlobal_b(G, cSetting_show_frame_rate) || Movi ePlaying(G))) {
ButModeDrawFastImpl(block, true ORTHOCGOARGVAR); ButModeDrawFastImpl(block, true ORTHOCGOARGVAR);
} }
} }
skipping to change at line 455 skipping to change at line 453
if(nf == 0) if(nf == 0)
nf = 1; nf = 1;
TextSetColor(G, textColor); TextSetColor(G, textColor);
if(has_movie) { if(has_movie) {
TextDrawStrAt(G, "Frame ", x, y ORTHOCGOARGVAR); TextDrawStrAt(G, "Frame ", x, y ORTHOCGOARGVAR);
} else { } else {
TextDrawStrAt(G, "State ", x, y ORTHOCGOARGVAR); TextDrawStrAt(G, "State ", x, y ORTHOCGOARGVAR);
} }
TextSetColor(G, textColor2); TextSetColor(G, textColor2);
sprintf(rateStr, "%4d/%4d ", SceneGetFrame(G) + 1, nf); sprintf(rateStr, "%4d/%4d ", SceneGetFrame(G) + 1, nf);
TextDrawStrAt(G, rateStr, x + 48, y ORTHOCGOARGVAR); TextDrawStrAt(G, rateStr, x + DIP2PIXEL(48), y ORTHOCGOARGVAR);
if(frame_rate) { if(frame_rate) {
sprintf(rateStr,"%5.1f",I->RateShown); sprintf(rateStr,"%5.1f",I->RateShown);
TextDrawStrAt(G, rateStr, x + 144, y ORTHOCGOARGVAR); TextDrawStrAt(G, rateStr, x + DIP2PIXEL(144), y ORTHOCGOARGVAR);
TextSetColor(G, textColor); TextSetColor(G, textColor);
TextDrawStrAt(G, "Hz ", x + 192, y ORTHOCGOARGVAR); TextDrawStrAt(G, "Hz ", x + DIP2PIXEL(192), y ORTHOCGOARGVAR);
TextSetColor(G, textColor2); TextSetColor(G, textColor2);
} else if(has_movie) { } else if(has_movie) {
TextSetColor(G, textColor); TextSetColor(G, textColor);
TextDrawStrAt(G, "State ", x + 128, y ORTHOCGOARGVAR); TextDrawStrAt(G, "State ", x + DIP2PIXEL(128), y ORTHOCGOARGVAR);
TextSetColor(G, textColor2); TextSetColor(G, textColor2);
sprintf(rateStr," %4d",SceneGetState(G)+1); sprintf(rateStr," %4d",SceneGetState(G)+1);
TextDrawStrAt(G, rateStr, x + 168, y ORTHOCGOARGVAR); TextDrawStrAt(G, rateStr, x + DIP2PIXEL(168), y ORTHOCGOARGVAR);
} else if(frame_rate) { } else if(frame_rate) {
} }
} }
return true; return true;
} }
/*========================================================================*/ /*========================================================================*/
int ButModeInit(PyMOLGlobals * G) int ButModeInit(PyMOLGlobals * G)
{ {
CButMode *I = NULL; CButMode *I = NULL;
 End of changes. 37 change blocks. 
44 lines changed or deleted 42 lines changed or added
To the C++ Programs section of the PyMOL source changes report or the top of this page
Mainly generated by pkgdiff using rfcdiff
Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)