"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "layer1/Ortho.h" between
pymol-open-source-2.2.0.tar.gz and pymol-open-source-2.3.0.tar.gz

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 ]

Ortho.h  (pymol-open-source-2.2.0):Ortho.h  (pymol-open-source-2.3.0)
skipping to change at line 28 skipping to change at line 28
#define _H_Ortho #define _H_Ortho
#define cOrthoSHIFT 1 #define cOrthoSHIFT 1
#define cOrthoCTRL 2 #define cOrthoCTRL 2
#define cOrthoALT 4 #define cOrthoALT 4
#define cOrthoRightSceneMargin DIP2PIXEL(220) #define cOrthoRightSceneMargin DIP2PIXEL(220)
#define cOrthoBottomSceneMargin DIP2PIXEL(18) #define cOrthoBottomSceneMargin DIP2PIXEL(18)
#define cOrthoLineHeight DIP2PIXEL(12) #define cOrthoLineHeight DIP2PIXEL(12)
#include <vector>
#include <memory>
#include <string>
#include"os_gl.h" #include"os_gl.h"
#include"Block.h" #include"Block.h"
#include"Feedback.h" #include"Feedback.h"
#include"Deferred.h" #include"Deferred.h"
#include"Image.h"
#define cOrthoScene 1 #define cOrthoScene 1
#define cOrthoTool 2 #define cOrthoTool 2
#define cOrthoHidden 3 #define cOrthoHidden 3
int OrthoInit(PyMOLGlobals * G, int showSplash); int OrthoInit(PyMOLGlobals * G, int showSplash);
void OrthoFree(PyMOLGlobals * G); void OrthoFree(PyMOLGlobals * G);
void OrthoAttach(PyMOLGlobals * G, Block * block, int type); void OrthoAttach(PyMOLGlobals * G, Block * block, int type);
void OrthoDetach(PyMOLGlobals * G, Block * block); void OrthoDetach(PyMOLGlobals * G, Block * block);
void OrthoSetMargins(Block * block, int t, int l, int b, int r);
Block *OrthoNewBlock(PyMOLGlobals * G, Block * block);
void OrthoFreeBlock(PyMOLGlobals * G, Block * block);
void OrthoReshape(PyMOLGlobals * G, int width, int height, int force); void OrthoReshape(PyMOLGlobals * G, int width, int height, int force);
int OrthoGetWidth(PyMOLGlobals * G); int OrthoGetWidth(PyMOLGlobals * G);
int OrthoGetHeight(PyMOLGlobals * G); int OrthoGetHeight(PyMOLGlobals * G);
void OrthoDoDraw(PyMOLGlobals * G, int render_mode); void OrthoDoDraw(PyMOLGlobals * G, int render_mode);
void OrthoDoViewportWhenReleased(PyMOLGlobals *G); void OrthoDoViewportWhenReleased(PyMOLGlobals *G);
void OrthoPushMatrix(PyMOLGlobals * G); void OrthoPushMatrix(PyMOLGlobals * G);
void OrthoPopMatrix(PyMOLGlobals * G); void OrthoPopMatrix(PyMOLGlobals * G);
int OrthoGetPushed(PyMOLGlobals * G); int OrthoGetPushed(PyMOLGlobals * G);
int OrthoButton(PyMOLGlobals * G, int button, int state, int x, int y, int mod); int OrthoButton(PyMOLGlobals * G, int button, int state, int x, int y, int mod);
skipping to change at line 76 skipping to change at line 76
void OrthoGrab(PyMOLGlobals * G, Block * block); void OrthoGrab(PyMOLGlobals * G, Block * block);
int OrthoGrabbedBy(PyMOLGlobals * G, Block * block); int OrthoGrabbedBy(PyMOLGlobals * G, Block * block);
void OrthoUngrab(PyMOLGlobals * G); void OrthoUngrab(PyMOLGlobals * G);
void OrthoSetLoopRect(PyMOLGlobals * G, int flag, BlockRect * rect); void OrthoSetLoopRect(PyMOLGlobals * G, int flag, BlockRect * rect);
void OrthoRestorePrompt(PyMOLGlobals * G); void OrthoRestorePrompt(PyMOLGlobals * G);
void OrthoBusyDraw(PyMOLGlobals * G, int force); void OrthoBusyDraw(PyMOLGlobals * G, int force);
void OrthoDirty(PyMOLGlobals * G); void OrthoDirty(PyMOLGlobals * G);
int OrthoGetDirty(PyMOLGlobals * G); int OrthoGetDirty(PyMOLGlobals * G);
void OrthoWorking(PyMOLGlobals * G);
void OrthoClear(PyMOLGlobals * G); void OrthoClear(PyMOLGlobals * G);
void OrthoFakeDrag(PyMOLGlobals * G); void OrthoFakeDrag(PyMOLGlobals * G);
void OrthoBusyMessage(PyMOLGlobals * G, const char *message); void OrthoBusyMessage(PyMOLGlobals * G, const char *message);
void OrthoBusySlow(PyMOLGlobals * G, int progress, int total); void OrthoBusySlow(PyMOLGlobals * G, int progress, int total);
void OrthoBusyFast(PyMOLGlobals * G, int progress, int total); void OrthoBusyFast(PyMOLGlobals * G, int progress, int total);
void OrthoBusyPrime(PyMOLGlobals * G); void OrthoBusyPrime(PyMOLGlobals * G);
void OrthoCommandSetBusy(PyMOLGlobals * G, int busy); void OrthoCommandSetBusy(PyMOLGlobals * G, int busy);
void OrthoCommandIn(PyMOLGlobals * G, const char *buffer); void OrthoCommandIn(COrtho&, const char *buffer);
int OrthoCommandSize(PyMOLGlobals * G); inline void OrthoCommandIn(PyMOLGlobals * G, const char *buffer){
int OrthoCommandOut(PyMOLGlobals * G, char *buffer); OrthoCommandIn(*G->Ortho, buffer);
}
std::string OrthoCommandOut(COrtho& ortho);
void OrthoCommandNest(PyMOLGlobals * G, int dir); void OrthoCommandNest(PyMOLGlobals * G, int dir);
int OrthoCommandOutSize(PyMOLGlobals * G); bool OrthoCommandIsEmpty(COrtho& ortho);
void OrthoFeedbackIn(PyMOLGlobals * G, const char *buffer); void OrthoFeedbackIn(COrtho& ortho, std::string str);
int OrthoFeedbackOut(PyMOLGlobals * G, char *buffer); std::string OrthoFeedbackOut(PyMOLGlobals* G, COrtho& ortho);
void OrthoSetWizardPrompt(PyMOLGlobals * G, char *vla); void OrthoSetWizardPrompt(PyMOLGlobals * G, char *vla);
int OrthoGetOverlayStatus(PyMOLGlobals * G); int OrthoGetOverlayStatus(PyMOLGlobals * G);
void OrthoPasteIn(PyMOLGlobals * G, const char *buffer); void OrthoPasteIn(PyMOLGlobals * G, const char *buffer);
void OrthoRemoveSplash(PyMOLGlobals * G); void OrthoRemoveSplash(PyMOLGlobals * G);
void OrthoRemoveAutoOverlay(PyMOLGlobals * G); void OrthoRemoveAutoOverlay(PyMOLGlobals * G);
void OrthoSplash(PyMOLGlobals * G); void OrthoSplash(PyMOLGlobals * G);
int OrthoArrowsGrabbed(PyMOLGlobals * G); int OrthoArrowsGrabbed(PyMOLGlobals * G);
void OrthoSpecial(PyMOLGlobals * G, int k, int x, int y, int mod); void OrthoSpecial(PyMOLGlobals * G, int k, int x, int y, int mod);
int OrthoCommandWaiting(PyMOLGlobals * G); int OrthoCommandWaiting(PyMOLGlobals * G);
int OrthoTextVisible(PyMOLGlobals * G); int OrthoTextVisible(PyMOLGlobals * G);
void OrthoReshapeWizard(PyMOLGlobals * G, ov_size height); void OrthoReshapeWizard(PyMOLGlobals * G, ov_size height);
void OrthoDefer(PyMOLGlobals * G, CDeferred * D); void OrthoDefer(PyMOLGlobals * G, std::unique_ptr<CDeferred> && D);
void OrthoExecDeferred(PyMOLGlobals * G); void OrthoExecDeferred(PyMOLGlobals * G);
int OrthoDeferredWaiting(PyMOLGlobals * G); int OrthoDeferredWaiting(PyMOLGlobals * G);
void OrthoSetLoop(PyMOLGlobals * G, int flag, int l, int r, int t, int b);
int OrthoGetRenderMode(PyMOLGlobals * G); int OrthoGetRenderMode(PyMOLGlobals * G);
void OrthoDrawBuffer(PyMOLGlobals * G, GLenum mode); void OrthoDrawBuffer(PyMOLGlobals * G, GLenum mode);
int OrthoGetWrapClickSide(PyMOLGlobals * G); int OrthoGetWrapClickSide(PyMOLGlobals * G);
float *OrthoGetOverlayColor(PyMOLGlobals * G); float *OrthoGetOverlayColor(PyMOLGlobals * G);
void OrthoDrawWizardPrompt(PyMOLGlobals * G ORTHOCGOARG); void OrthoDrawWizardPrompt(PyMOLGlobals * G, CGO *orthoCGO);
void bg_grad(PyMOLGlobals * G); void bg_grad(PyMOLGlobals * G);
GLuint OrthoGetBackgroundTextureID(PyMOLGlobals * G); GLuint OrthoGetBackgroundTextureID(PyMOLGlobals * G);
void OrthoInvalidateBackgroundTexture(PyMOLGlobals * G); void OrthoInvalidateBackgroundTexture(PyMOLGlobals * G);
void OrthoBackgroundTextureNeedsUpdate(PyMOLGlobals * G); void OrthoBackgroundTextureNeedsUpdate(PyMOLGlobals * G);
void OrthoGetBackgroundSize(PyMOLGlobals * G, int *width, int *height); std::pair<int, int> OrthoGetBackgroundSize(const COrtho& ortho);
void OrthoSetBackgroundImage(PyMOLGlobals * G, const char *image_data, int width , int height); void OrthoSetBackgroundImage(PyMOLGlobals * G, const char *image_data, int width , int height);
int OrthoBackgroundDataIsSet(PyMOLGlobals *G); bool OrthoBackgroundDataIsSet(const COrtho& ortho);
void *OrthoBackgroundDataGet(PyMOLGlobals *G, int *width, int *height); std::shared_ptr<pymol::Image> OrthoBackgroundDataGet(const COrtho& ortho);
void OrthoGetSize(PyMOLGlobals *G, int *width, int *height); std::pair<int, int> OrthoGetSize(const COrtho& ortho);
void OrthoInvalidateDoDraw(PyMOLGlobals * G); void OrthoInvalidateDoDraw(PyMOLGlobals * G);
void OrthoRenderCGO(PyMOLGlobals * G); void OrthoRenderCGO(PyMOLGlobals * G);
#define OrthoLineLength 1024 #define OrthoLineLength 1024
typedef char OrthoLineType[OrthoLineLength]; typedef char OrthoLineType[OrthoLineLength];
#endif #endif
 End of changes. 12 change blocks. 
19 lines changed or deleted 19 lines changed or added
To the Header Files 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)