Changeset 911
- Timestamp:
- Jan 20, 2009, 12:12:15 PM (16 years ago)
- Location:
- trunk/source/visualization
- Files:
-
- 48 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/source/visualization/OpenGL/History
r906 r911 1 $Id: History,v 1.12 2 2009/01/13 09:47:05lgarnier Exp $1 $Id: History,v 1.123 2009/01/19 16:28:38 lgarnier Exp $ 2 2 ------------------------------------------------------------------- 3 3 … … 20 20 History file for visualization/OpenGL 21 21 ------------------------------------- 22 23 19th January 2009 Laurent Garnier 24 - Change G4DEBUG defiition by G4DEBUG_VIS_OGL 22 25 23 26 12th January 2009 John Allison -
trunk/source/visualization/OpenGL/include/G4OpenGLQtViewer.hh
r906 r911 25 25 // 26 26 // 27 // $Id: G4OpenGLQtViewer.hh,v 1.1 3 2008/11/06 13:43:44lgarnier Exp $27 // $Id: G4OpenGLQtViewer.hh,v 1.14 2009/01/19 16:08:47 lgarnier Exp $ 28 28 // GEANT4 tag $Name: $ 29 29 // … … 73 73 void SetView (); 74 74 virtual void updateQWidget()=0; 75 void setupViewport(int, int);76 75 QString setEncoderPath(QString path); 77 76 QString getEncoderPath(); -
trunk/source/visualization/OpenGL/include/G4OpenGLXViewer.hh
r897 r911 25 25 // 26 26 // 27 // $Id: G4OpenGLXViewer.hh,v 1.2 8 2007/11/10 14:50:01 allisonExp $28 // GEANT4 tag $Name: HEAD$27 // $Id: G4OpenGLXViewer.hh,v 1.29 2009/01/19 16:08:47 lgarnier Exp $ 28 // GEANT4 tag $Name: $ 29 29 // 30 30 // -
trunk/source/visualization/OpenGL/src/G4OpenGLBitMapStore.cc
r850 r911 25 25 // 26 26 // 27 // $Id: G4OpenGLBitMapStore.cc,v 1. 4 2007/11/15 10:14:23 allisonExp $28 // GEANT4 tag $Name: HEAD$27 // $Id: G4OpenGLBitMapStore.cc,v 1.5 2009/01/19 16:53:42 lgarnier Exp $ 28 // GEANT4 tag $Name: $ 29 29 // 30 30 // -
trunk/source/visualization/OpenGL/src/G4OpenGLFontBaseStore.cc
r850 r911 25 25 // 26 26 // 27 // $Id: G4OpenGLFontBaseStore.cc,v 1. 3 2006/06/29 21:18:56 gunter Exp $28 // GEANT4 tag $Name: HEAD$27 // $Id: G4OpenGLFontBaseStore.cc,v 1.4 2009/01/19 16:53:42 lgarnier Exp $ 28 // GEANT4 tag $Name: $ 29 29 // 30 30 -
trunk/source/visualization/OpenGL/src/G4OpenGLImmediateQt.cc
r897 r911 25 25 // 26 26 // 27 // $Id: G4OpenGLImmediateQt.cc,v 1. 4 2008/10/24 13:49:19lgarnier Exp $27 // $Id: G4OpenGLImmediateQt.cc,v 1.5 2009/01/19 16:26:40 lgarnier Exp $ 28 28 // GEANT4 tag $Name: $ 29 29 // … … 58 58 G4VViewer* G4OpenGLImmediateQt::CreateViewer 59 59 (G4VSceneHandler& scene, const G4String& name) { 60 #ifdef G4DEBUG 60 #ifdef G4DEBUG_VIS_OGL 61 61 printf("G4OpenGLImmediateQt::CreateViewer \n"); 62 62 #endif … … 78 78 " new G4OpenGLImmediateQtViewer." << G4endl; 79 79 } 80 #ifdef G4DEBUG 80 #ifdef G4DEBUG_VIS_OGL 81 81 printf("G4OpenGLImmediateQt::CreateViewer END \n"); 82 82 #endif -
trunk/source/visualization/OpenGL/src/G4OpenGLImmediateQtViewer.cc
r908 r911 25 25 // 26 26 // 27 // $Id: G4OpenGLImmediateQtViewer.cc,v 1. 9 2009/01/15 18:14:58lgarnier Exp $27 // $Id: G4OpenGLImmediateQtViewer.cc,v 1.11 2009/01/19 16:53:42 lgarnier Exp $ 28 28 // GEANT4 tag $Name: $ 29 29 // … … 65 65 66 66 void G4OpenGLImmediateQtViewer::Initialise() { 67 #ifdef G4DEBUG 67 #ifdef G4DEBUG_VIS_OGL 68 68 printf("G4OpenGLImmediateQtViewer::Initialise \n"); 69 69 #endif … … 102 102 */ 103 103 void G4OpenGLImmediateQtViewer::DrawView() { 104 #ifdef G4DEBUG 104 #ifdef G4DEBUG_VIS_OGL 105 105 printf("G4OpenGLImmediateQtViewer::DrawView VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV\n"); 106 106 #endif … … 109 109 110 110 updateQWidget(); 111 #ifdef G4DEBUG 111 #ifdef G4DEBUG_VIS_OGL 112 112 printf("G4OpenGLImmediateQtViewer::DrawView ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n"); 113 113 #endif … … 117 117 void G4OpenGLImmediateQtViewer::ComputeView () { 118 118 119 #ifdef G4DEBUG 119 #ifdef G4DEBUG_VIS_OGL 120 120 printf("G4OpenGLImmediateQtViewer::ComputeView %d %d VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV\n",fWinSize_x, fWinSize_y); 121 121 #endif … … 127 127 G4ViewParameters::DrawingStyle style = GetViewParameters().GetDrawingStyle(); 128 128 129 //Make sure current viewer is attached and clean...130 //Qt version needed131 // glViewport (0, 0, fWinSize_x, fWinSize_y);132 133 129 if(style!=G4ViewParameters::hlr && 134 130 haloing_enabled) { … … 138 134 ProcessView (); 139 135 glFlush (); 140 #ifdef G4DEBUG 136 #ifdef G4DEBUG_VIS_OGL 141 137 printf("G4OpenGLImmediateQtViewer::ComputeView First ProcessView ok\n"); 142 138 #endif … … 152 148 } 153 149 154 #ifdef G4DEBUG 150 #ifdef G4DEBUG_VIS_OGL 155 151 printf("G4OpenGLImmediateQtViewer::ComputeView %d %d ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ \n",fWinSize_x, fWinSize_y); 156 152 #endif … … 160 156 void G4OpenGLImmediateQtViewer::FinishView() 161 157 { 162 #ifdef G4DEBUG 158 #ifdef G4DEBUG_VIS_OGL 163 159 printf("G4OpenGLImmediateQtViewer::FinishView() BEGIN\n"); 164 160 #endif 165 161 glFlush (); 166 #ifdef G4DEBUG 162 #ifdef G4DEBUG_VIS_OGL 167 163 printf("G4OpenGLImmediateQtViewer::FinishView() END\n"); 168 164 #endif … … 186 182 void G4OpenGLImmediateQtViewer::paintGL() 187 183 { 188 #ifdef G4DEBUG 184 #ifdef G4DEBUG_VIS_OGL 189 185 printf("\n\nG4OpenGLImmediateQtViewer::paintGL ??\n"); 190 186 #endif … … 199 195 } 200 196 } 201 #ifdef G4DEBUG 197 #ifdef G4DEBUG_VIS_OGL 202 198 printf("G4OpenGLImmediateQtViewer::paintGL VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV ready %d\n",readyToPaint); 203 199 #endif … … 210 206 hasToRepaint = false; // could be set to false by ComputeView 211 207 212 #ifdef G4DEBUG 208 #ifdef G4DEBUG_VIS_OGL 213 209 printf("G4OpenGLImmediateQtViewer::paintGL ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ready %d\n\n\n",readyToPaint); 214 210 #endif -
trunk/source/visualization/OpenGL/src/G4OpenGLImmediateViewer.cc
r850 r911 25 25 // 26 26 // 27 // $Id: G4OpenGLImmediateViewer.cc,v 1. 8 2006/09/04 12:07:59 allisonExp $28 // GEANT4 tag $Name: HEAD$27 // $Id: G4OpenGLImmediateViewer.cc,v 1.9 2009/01/19 16:53:42 lgarnier Exp $ 28 // GEANT4 tag $Name: $ 29 29 // 30 30 // -
trunk/source/visualization/OpenGL/src/G4OpenGLImmediateWin32.cc
r850 r911 25 25 // 26 26 // 27 // $Id: G4OpenGLImmediateWin32.cc,v 1.1 1 2006/08/14 12:07:19 allisonExp $28 // GEANT4 tag $Name: HEAD$27 // $Id: G4OpenGLImmediateWin32.cc,v 1.12 2009/01/19 16:53:42 lgarnier Exp $ 28 // GEANT4 tag $Name: $ 29 29 // 30 30 // -
trunk/source/visualization/OpenGL/src/G4OpenGLImmediateX.cc
r897 r911 25 25 // 26 26 // 27 // $Id: G4OpenGLImmediateX.cc,v 1.1 3 2007/08/21 14:05:51 allisonExp $28 // GEANT4 tag $Name: HEAD$27 // $Id: G4OpenGLImmediateX.cc,v 1.14 2009/01/19 16:53:42 lgarnier Exp $ 28 // GEANT4 tag $Name: $ 29 29 // 30 30 // -
trunk/source/visualization/OpenGL/src/G4OpenGLImmediateXViewer.cc
r906 r911 25 25 // 26 26 // 27 // $Id: G4OpenGLImmediateXViewer.cc,v 1.1 7 2009/01/13 09:47:05lgarnier Exp $27 // $Id: G4OpenGLImmediateXViewer.cc,v 1.18 2009/01/19 16:53:42 lgarnier Exp $ 28 28 // GEANT4 tag $Name: $ 29 29 // … … 86 86 //Make sure current viewer is attached and clean... 87 87 glXMakeCurrent (dpy, win, cx); 88 // glViewport (0, 0, fWinSize_x, fWinSize_y);89 88 90 89 if(style!=G4ViewParameters::hlr && -
trunk/source/visualization/OpenGL/src/G4OpenGLImmediateXm.cc
r850 r911 25 25 // 26 26 // 27 // $Id: G4OpenGLImmediateXm.cc,v 1.1 3 2006/08/14 12:07:19 allisonExp $28 // GEANT4 tag $Name: HEAD$27 // $Id: G4OpenGLImmediateXm.cc,v 1.14 2009/01/19 16:53:42 lgarnier Exp $ 28 // GEANT4 tag $Name: $ 29 29 // 30 30 // -
trunk/source/visualization/OpenGL/src/G4OpenGLImmediateXmViewer.cc
r908 r911 25 25 // 26 26 // 27 // $Id: G4OpenGLImmediateXmViewer.cc,v 1.1 8 2009/01/13 12:07:12 allisonExp $27 // $Id: G4OpenGLImmediateXmViewer.cc,v 1.19 2009/01/19 16:53:42 lgarnier Exp $ 28 28 // GEANT4 tag $Name: $ 29 29 // … … 92 92 //Make sure current viewer is attached and clean... 93 93 glXMakeCurrent (dpy, win, cx); 94 glViewport (0, 0, fWinSize_x, fWinSize_y);95 94 96 95 if(style!=G4ViewParameters::hlr && -
trunk/source/visualization/OpenGL/src/G4OpenGLQtViewer.cc
r908 r911 25 25 // 26 26 // 27 // $Id: G4OpenGLQtViewer.cc,v 1.3 2 2009/01/15 18:14:58lgarnier Exp $27 // $Id: G4OpenGLQtViewer.cc,v 1.34 2009/01/19 16:53:42 lgarnier Exp $ 28 28 // GEANT4 tag $Name: $ 29 29 // … … 103 103 104 104 if(fWindow) return; //Done. 105 #ifdef G4DEBUG 105 #ifdef G4DEBUG_VIS_OGL 106 106 printf("G4OpenGLQtViewer::CreateMainWindow glWidget\n"); 107 107 #endif … … 148 148 149 149 if (found==false) { 150 #ifdef G4DEBUG 150 #ifdef G4DEBUG_VIS_OGL 151 151 printf("G4OpenGLQtViewer::CreateMainWindow case Qapp exist, but not found\n"); 152 152 #endif … … 154 154 } 155 155 } else { 156 #ifdef G4DEBUG 156 #ifdef G4DEBUG_VIS_OGL 157 157 printf("G4OpenGLQtViewer::CreateMainWindow case Qapp exist\n"); 158 158 #endif … … 186 186 187 187 if(!fWindow) return; 188 #ifdef G4DEBUG 188 #ifdef G4DEBUG_VIS_OGL 189 189 printf("G4OpenGLQtViewer::CreateMainWindow glWidget END\n"); 190 190 #endif … … 248 248 fLastEventTime = new QTime(); 249 249 250 #ifdef G4DEBUG 250 #ifdef G4DEBUG_VIS_OGL 251 251 printf("G4OpenGLQtViewer::G4OpenGLQtViewer END\n"); 252 252 #endif … … 1645 1645 // glRenderMode (GL_FEEDBACK); 1646 1646 1647 // glViewport (0, 0, aWidth, aHeight);1648 1647 // DrawView(); 1649 1648 // returned = glRenderMode (GL_RENDER); … … 1676 1675 glRenderMode (GL_FEEDBACK); 1677 1676 1678 int side = aWidth; 1679 if (aHeight < aWidth) side = aHeight; 1680 glViewport((aWidth - side) / 2, (aHeight - side) / 2, side, side); 1677 ResizeGLView(); 1681 1678 DrawView(); 1682 1679 -
trunk/source/visualization/OpenGL/src/G4OpenGLStoredQt.cc
r873 r911 25 25 // 26 26 // 27 // $Id: G4OpenGLStoredQt.cc,v 1. 9 2008/10/24 14:21:34lgarnier Exp $27 // $Id: G4OpenGLStoredQt.cc,v 1.10 2009/01/19 16:26:40 lgarnier Exp $ 28 28 // GEANT4 tag $Name: $ 29 29 // … … 58 58 G4VViewer* G4OpenGLStoredQt::CreateViewer 59 59 (G4VSceneHandler& scene, const G4String& name) { 60 #ifdef G4DEBUG 60 #ifdef G4DEBUG_VIS_OGL 61 61 printf("G4OpenGLStoredQt::CreateViewer \n"); 62 62 #endif … … 78 78 " new G4OpenGLStoredQtViewer." << G4endl; 79 79 } 80 #ifdef G4DEBUG 80 #ifdef G4DEBUG_VIS_OGL 81 81 printf("G4OpenGLStoredQt::CreateViewer END \n"); 82 82 #endif -
trunk/source/visualization/OpenGL/src/G4OpenGLStoredQtViewer.cc
r908 r911 25 25 // 26 26 // 27 // $Id: G4OpenGLStoredQtViewer.cc,v 1.2 2 2009/01/15 18:14:58lgarnier Exp $27 // $Id: G4OpenGLStoredQtViewer.cc,v 1.23 2009/01/19 16:26:40 lgarnier Exp $ 28 28 // GEANT4 tag $Name: $ 29 29 // … … 70 70 71 71 void G4OpenGLStoredQtViewer::Initialise() { 72 #ifdef G4DEBUG 72 #ifdef G4DEBUG_VIS_OGL 73 73 printf("G4OpenGLStoredQtViewer::Initialise 1\n"); 74 74 #endif … … 84 84 InitializeGLView (); 85 85 86 #ifdef G4DEBUG 86 #ifdef G4DEBUG_VIS_OGL 87 87 printf("G4OpenGLStoredQtViewer::InitialiseGL () 1\n"); 88 88 #endif … … 101 101 } 102 102 103 #ifdef G4DEBUG 103 #ifdef G4DEBUG_VIS_OGL 104 104 printf("G4OpenGLStoredQtViewer::InitialiseGL END\n"); 105 105 #endif … … 108 108 109 109 void G4OpenGLStoredQtViewer::DrawView () { 110 #ifdef G4DEBUG 110 #ifdef G4DEBUG_VIS_OGL 111 111 printf("G4OpenGLStoredQtViewer::DrawView VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV\n"); 112 112 #endif … … 118 118 119 119 ComputeView(); 120 #ifdef G4DEBUG 120 #ifdef G4DEBUG_VIS_OGL 121 121 printf("G4OpenGLStoredQtViewer::DrawView ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n"); 122 122 #endif … … 125 125 void G4OpenGLStoredQtViewer::ComputeView () { 126 126 127 #ifdef G4DEBUG 127 #ifdef G4DEBUG_VIS_OGL 128 128 printf("G4OpenGLStoredQtViewer::ComputeView %d %d VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV\n",fWinSize_x, fWinSize_y); 129 129 #endif … … 146 146 if(style!=G4ViewParameters::hlr && 147 147 haloing_enabled) { 148 #ifdef G4DEBUG 148 #ifdef G4DEBUG_VIS_OGL 149 149 printf("G4OpenGLStoredQtViewer::ComputeView DANS LE IF\n"); 150 150 #endif … … 164 164 // have been done, so... 165 165 if (!kernelVisitWasNeeded) { 166 #ifdef G4DEBUG 166 #ifdef G4DEBUG_VIS_OGL 167 167 printf("************************** G4OpenGLStoredQtViewer::ComputeView Don't need kernel Visit \n"); 168 168 #endif … … 170 170 FinishView (); 171 171 } else { 172 #ifdef G4DEBUG 172 #ifdef G4DEBUG_VIS_OGL 173 173 printf("************************** G4OpenGLStoredQtViewer::ComputeView need kernel Visit \n"); 174 174 #endif … … 180 180 DrawDisplayLists (); 181 181 FinishView (); 182 #ifdef G4DEBUG 182 #ifdef G4DEBUG_VIS_OGL 183 183 printf("*************************** CASE 4 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ \n"); 184 184 #endif … … 194 194 } 195 195 196 #ifdef G4DEBUG 196 #ifdef G4DEBUG_VIS_OGL 197 197 printf("G4OpenGLStoredQtViewer::ComputeView %d %d ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ \n",fWinSize_x, fWinSize_y); 198 198 #endif … … 217 217 void G4OpenGLStoredQtViewer::paintGL() 218 218 { 219 #ifdef G4DEBUG 219 #ifdef G4DEBUG_VIS_OGL 220 220 printf("G4OpenGLStoredQtViewer::paintGL ??\n"); 221 221 #endif … … 232 232 } 233 233 } 234 #ifdef G4DEBUG 234 #ifdef G4DEBUG_VIS_OGL 235 235 printf("G4OpenGLStoredQtViewer::paintGL VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV ready %d\n",readyToPaint); 236 236 #endif … … 243 243 hasToRepaint =false; 244 244 245 #ifdef G4DEBUG 245 #ifdef G4DEBUG_VIS_OGL 246 246 printf("G4OpenGLStoredQtViewer::paintGL ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ready %d\n",readyToPaint); 247 247 #endif -
trunk/source/visualization/OpenGL/src/G4OpenGLStoredViewer.cc
r850 r911 25 25 // 26 26 // 27 // $Id: G4OpenGLStoredViewer.cc,v 1.2 4 2008/04/04 13:32:22 allisonExp $28 // GEANT4 tag $Name: HEAD$27 // $Id: G4OpenGLStoredViewer.cc,v 1.25 2009/01/19 16:53:42 lgarnier Exp $ 28 // GEANT4 tag $Name: $ 29 29 // 30 30 // -
trunk/source/visualization/OpenGL/src/G4OpenGLStoredWin32.cc
r850 r911 25 25 // 26 26 // 27 // $Id: G4OpenGLStoredWin32.cc,v 1.1 4 2006/08/14 12:07:19 allisonExp $28 // GEANT4 tag $Name: HEAD$27 // $Id: G4OpenGLStoredWin32.cc,v 1.15 2009/01/19 16:53:42 lgarnier Exp $ 28 // GEANT4 tag $Name: $ 29 29 // 30 30 // -
trunk/source/visualization/OpenGL/src/G4OpenGLStoredX.cc
r850 r911 25 25 // 26 26 // 27 // $Id: G4OpenGLStoredX.cc,v 1.1 4 2007/08/21 14:05:51 allisonExp $28 // GEANT4 tag $Name: HEAD$27 // $Id: G4OpenGLStoredX.cc,v 1.15 2009/01/19 16:53:42 lgarnier Exp $ 28 // GEANT4 tag $Name: $ 29 29 // 30 30 // -
trunk/source/visualization/OpenGL/src/G4OpenGLStoredXViewer.cc
r906 r911 25 25 // 26 26 // 27 // $Id: G4OpenGLStoredXViewer.cc,v 1.2 3 2009/01/13 09:47:05lgarnier Exp $27 // $Id: G4OpenGLStoredXViewer.cc,v 1.24 2009/01/19 16:53:42 lgarnier Exp $ 28 28 // GEANT4 tag $Name: $ 29 29 // … … 79 79 //Make sure current viewer is attached and clean... 80 80 glXMakeCurrent (dpy, win, cx); 81 // glViewport (0, 0, fWinSize_x, fWinSize_y);82 81 83 82 G4ViewParameters::DrawingStyle style = GetViewParameters().GetDrawingStyle(); -
trunk/source/visualization/OpenGL/src/G4OpenGLStoredXm.cc
r850 r911 25 25 // 26 26 // 27 // $Id: G4OpenGLStoredXm.cc,v 1.1 1 2006/08/14 12:07:19 allisonExp $28 // GEANT4 tag $Name: HEAD$27 // $Id: G4OpenGLStoredXm.cc,v 1.12 2009/01/19 16:53:42 lgarnier Exp $ 28 // GEANT4 tag $Name: $ 29 29 // 30 30 // -
trunk/source/visualization/OpenGL/src/G4OpenGLStoredXmViewer.cc
r906 r911 25 25 // 26 26 // 27 // $Id: G4OpenGLStoredXmViewer.cc,v 1.2 3 2009/01/13 09:47:05lgarnier Exp $27 // $Id: G4OpenGLStoredXmViewer.cc,v 1.24 2009/01/19 16:53:42 lgarnier Exp $ 28 28 // GEANT4 tag $Name: $ 29 29 // … … 85 85 //Make sure current viewer is attached and clean... 86 86 glXMakeCurrent (dpy, win, cx); 87 // glViewport (0, 0, fWinSize_x, fWinSize_y);88 87 89 88 G4ViewParameters::DrawingStyle style = GetViewParameters().GetDrawingStyle(); -
trunk/source/visualization/OpenGL/src/G4OpenGLTransform3D.cc
r850 r911 25 25 // 26 26 // 27 // $Id: G4OpenGLTransform3D.cc,v 1. 8 2006/06/29 21:19:32 gunter Exp $28 // GEANT4 tag $Name: HEAD$27 // $Id: G4OpenGLTransform3D.cc,v 1.9 2009/01/19 16:53:42 lgarnier Exp $ 28 // GEANT4 tag $Name: $ 29 29 // 30 30 // -
trunk/source/visualization/OpenGL/src/G4OpenGLViewer.cc
r908 r911 25 25 // 26 26 // 27 // $Id: G4OpenGLViewer.cc,v 1.4 5 2009/01/15 18:14:58lgarnier Exp $27 // $Id: G4OpenGLViewer.cc,v 1.46 2009/01/19 16:53:42 lgarnier Exp $ 28 28 // GEANT4 tag $Name: $ 29 29 // … … 155 155 void G4OpenGLViewer::ResizeGLView() 156 156 { 157 #ifdef G4DEBUG158 printf("G4OpenGLViewer::setupViewport\n");159 #endif160 161 157 int side = fWinSize_x; 162 158 if (fWinSize_y < fWinSize_x) side = fWinSize_y; -
trunk/source/visualization/OpenGL/src/G4OpenGLViewerMessenger.cc
r850 r911 25 25 // 26 26 // 27 // $Id: G4OpenGLViewerMessenger.cc,v 1.1 2 2008/04/04 13:32:22 allisonExp $28 // GEANT4 tag $Name: HEAD$27 // $Id: G4OpenGLViewerMessenger.cc,v 1.13 2009/01/19 16:53:42 lgarnier Exp $ 28 // GEANT4 tag $Name: $ 29 29 30 30 #ifdef G4VIS_BUILD_OPENGL_DRIVER -
trunk/source/visualization/OpenGL/src/G4OpenGLXViewer.cc
r908 r911 25 25 // 26 26 // 27 // $Id: G4OpenGLXViewer.cc,v 1.4 3 2009/01/13 09:47:05lgarnier Exp $27 // $Id: G4OpenGLXViewer.cc,v 1.45 2009/01/19 16:53:42 lgarnier Exp $ 28 28 // GEANT4 tag $Name: $ 29 29 // … … 226 226 size_hints->y = y_origin; 227 227 size_hints->flags |= PSize | PPosition; 228 #ifdef G4DEBUG229 printf("G4OpenGLXViewer::CreateMainWindow CreateWindow Size:W:%d H:%d X:%d Y:%d \n",fWinSize_x,fWinSize_y,x_origin,y_origin);230 #endif231 228 232 229 G4cout << "Window name: " << fName << G4endl; … … 440 437 win, 441 438 cx); 442 443 // glViewport (0, 0, fWinSize_x, fWinSize_y); 444 439 445 440 ClearView (); 446 441 SetView (); -
trunk/source/visualization/OpenGL/src/G4OpenGLXmBox.cc
r850 r911 25 25 // 26 26 // 27 // $Id: G4OpenGLXmBox.cc,v 1. 6 2006/06/29 21:19:40 gunter Exp $28 // GEANT4 tag $Name: HEAD$27 // $Id: G4OpenGLXmBox.cc,v 1.7 2009/01/19 16:53:42 lgarnier Exp $ 28 // GEANT4 tag $Name: $ 29 29 // 30 30 //Box container class -
trunk/source/visualization/OpenGL/src/G4OpenGLXmConvenienceRoutines.cc
r850 r911 25 25 // 26 26 // 27 // $Id: G4OpenGLXmConvenienceRoutines.cc,v 1.1 1 2006/06/29 21:19:42 gunter Exp $28 // GEANT4 tag $Name: HEAD$27 // $Id: G4OpenGLXmConvenienceRoutines.cc,v 1.12 2009/01/19 16:53:42 lgarnier Exp $ 28 // GEANT4 tag $Name: $ 29 29 // 30 30 // -
trunk/source/visualization/OpenGL/src/G4OpenGLXmFourArrowButtons.cc
r850 r911 25 25 // 26 26 // 27 // $Id: G4OpenGLXmFourArrowButtons.cc,v 1. 5 2006/06/29 21:19:44 gunter Exp $28 // GEANT4 tag $Name: HEAD$27 // $Id: G4OpenGLXmFourArrowButtons.cc,v 1.6 2009/01/19 16:53:42 lgarnier Exp $ 28 // GEANT4 tag $Name: $ 29 29 // 30 30 //Four arrow buttons class. Inherits from G4OpenGLXmVWidgetComponent -
trunk/source/visualization/OpenGL/src/G4OpenGLXmFramedBox.cc
r850 r911 25 25 // 26 26 // 27 // $Id: G4OpenGLXmFramedBox.cc,v 1. 6 2006/06/29 21:19:46 gunter Exp $28 // GEANT4 tag $Name: HEAD$27 // $Id: G4OpenGLXmFramedBox.cc,v 1.7 2009/01/19 16:53:42 lgarnier Exp $ 28 // GEANT4 tag $Name: $ 29 29 // 30 30 //Framed box container class -
trunk/source/visualization/OpenGL/src/G4OpenGLXmMainMenubarCallbacks.cc
r850 r911 25 25 // 26 26 // 27 // $Id: G4OpenGLXmMainMenubarCallbacks.cc,v 1.1 3 2006/06/29 21:19:48 gunter Exp $28 // GEANT4 tag $Name: HEAD$27 // $Id: G4OpenGLXmMainMenubarCallbacks.cc,v 1.14 2009/01/19 16:53:42 lgarnier Exp $ 28 // GEANT4 tag $Name: $ 29 29 // 30 30 // -
trunk/source/visualization/OpenGL/src/G4OpenGLXmPanningCallbacks.cc
r850 r911 25 25 // 26 26 // 27 // $Id: G4OpenGLXmPanningCallbacks.cc,v 1. 8 2006/06/29 21:19:50 gunter Exp $28 // GEANT4 tag $Name: HEAD$27 // $Id: G4OpenGLXmPanningCallbacks.cc,v 1.9 2009/01/19 16:53:42 lgarnier Exp $ 28 // GEANT4 tag $Name: $ 29 29 // 30 30 // -
trunk/source/visualization/OpenGL/src/G4OpenGLXmPushButton.cc
r850 r911 25 25 // 26 26 // 27 // $Id: G4OpenGLXmPushButton.cc,v 1. 6 2006/06/29 21:19:52 gunter Exp $28 // GEANT4 tag $Name: HEAD$27 // $Id: G4OpenGLXmPushButton.cc,v 1.7 2009/01/19 16:53:42 lgarnier Exp $ 28 // GEANT4 tag $Name: $ 29 29 // 30 30 //Push button class. Inherits from G4OpenGLXmVWidgetComponent -
trunk/source/visualization/OpenGL/src/G4OpenGLXmRadioButton.cc
r850 r911 25 25 // 26 26 // 27 // $Id: G4OpenGLXmRadioButton.cc,v 1. 6 2006/06/29 21:19:54 gunter Exp $28 // GEANT4 tag $Name: HEAD$27 // $Id: G4OpenGLXmRadioButton.cc,v 1.7 2009/01/19 16:53:42 lgarnier Exp $ 28 // GEANT4 tag $Name: $ 29 29 // 30 30 //Radio button class. Inherits from G4OpenGLXmVWidgetComponent -
trunk/source/visualization/OpenGL/src/G4OpenGLXmRotationCallbacks.cc
r850 r911 25 25 // 26 26 // 27 // $Id: G4OpenGLXmRotationCallbacks.cc,v 1.1 6 2008/07/28 15:36:45lgarnier Exp $28 // GEANT4 tag $Name: HEAD$27 // $Id: G4OpenGLXmRotationCallbacks.cc,v 1.17 2009/01/19 16:53:42 lgarnier Exp $ 28 // GEANT4 tag $Name: $ 29 29 // 30 30 // -
trunk/source/visualization/OpenGL/src/G4OpenGLXmSeparator.cc
r850 r911 25 25 // 26 26 // 27 // $Id: G4OpenGLXmSeparator.cc,v 1. 5 2006/06/29 21:19:58 gunter Exp $28 // GEANT4 tag $Name: HEAD$27 // $Id: G4OpenGLXmSeparator.cc,v 1.6 2009/01/19 16:53:42 lgarnier Exp $ 28 // GEANT4 tag $Name: $ 29 29 // 30 30 //Separator class. Inherits from G4OpenGLXmVWidgetComponent -
trunk/source/visualization/OpenGL/src/G4OpenGLXmSliderBar.cc
r850 r911 25 25 // 26 26 // 27 // $Id: G4OpenGLXmSliderBar.cc,v 1. 7 2006/06/29 21:20:00 gunter Exp $28 // GEANT4 tag $Name: HEAD$27 // $Id: G4OpenGLXmSliderBar.cc,v 1.8 2009/01/19 16:53:42 lgarnier Exp $ 28 // GEANT4 tag $Name: $ 29 29 // 30 30 //Slider bar class. Inherits from G4OpenGLXmVWidgetComponent -
trunk/source/visualization/OpenGL/src/G4OpenGLXmStyleCallbacks.cc
r850 r911 25 25 // 26 26 // 27 // $Id: G4OpenGLXmStyleCallbacks.cc,v 1.1 4 2006/06/29 21:20:02 gunter Exp $28 // GEANT4 tag $Name: HEAD$27 // $Id: G4OpenGLXmStyleCallbacks.cc,v 1.15 2009/01/19 16:53:42 lgarnier Exp $ 28 // GEANT4 tag $Name: $ 29 29 // 30 30 // -
trunk/source/visualization/OpenGL/src/G4OpenGLXmTextField.cc
r850 r911 25 25 // 26 26 // 27 // $Id: G4OpenGLXmTextField.cc,v 1. 7 2006/06/29 21:20:04 gunter Exp $28 // GEANT4 tag $Name: HEAD$27 // $Id: G4OpenGLXmTextField.cc,v 1.8 2009/01/19 16:53:42 lgarnier Exp $ 28 // GEANT4 tag $Name: $ 29 29 // 30 30 //Text field class. Inherits from G4OpenGLXmVWidgetComponent -
trunk/source/visualization/OpenGL/src/G4OpenGLXmTopLevelShell.cc
r850 r911 25 25 // 26 26 // 27 // $Id: G4OpenGLXmTopLevelShell.cc,v 1. 5 2006/06/29 21:20:06 gunter Exp $28 // GEANT4 tag $Name: HEAD$27 // $Id: G4OpenGLXmTopLevelShell.cc,v 1.6 2009/01/19 16:53:42 lgarnier Exp $ 28 // GEANT4 tag $Name: $ 29 29 // 30 30 //Top level shell class -
trunk/source/visualization/OpenGL/src/G4OpenGLXmVWidgetComponent.cc
r850 r911 25 25 // 26 26 // 27 // $Id: G4OpenGLXmVWidgetComponent.cc,v 1. 5 2006/06/29 21:20:08 gunter Exp $28 // GEANT4 tag $Name: HEAD$27 // $Id: G4OpenGLXmVWidgetComponent.cc,v 1.6 2009/01/19 16:53:42 lgarnier Exp $ 28 // GEANT4 tag $Name: $ 29 29 // 30 30 //Base class for all Motif component widgets -
trunk/source/visualization/OpenGL/src/G4OpenGLXmVWidgetContainer.cc
r850 r911 25 25 // 26 26 // 27 // $Id: G4OpenGLXmVWidgetContainer.cc,v 1. 5 2006/06/29 21:20:10 gunter Exp $28 // GEANT4 tag $Name: HEAD$27 // $Id: G4OpenGLXmVWidgetContainer.cc,v 1.6 2009/01/19 16:53:42 lgarnier Exp $ 28 // GEANT4 tag $Name: $ 29 29 // 30 30 //Base class for all Motif container widgets -
trunk/source/visualization/OpenGL/src/G4OpenGLXmVWidgetObject.cc
r850 r911 25 25 // 26 26 // 27 // $Id: G4OpenGLXmVWidgetObject.cc,v 1. 5 2006/06/29 21:20:12 gunter Exp $28 // GEANT4 tag $Name: HEAD$27 // $Id: G4OpenGLXmVWidgetObject.cc,v 1.6 2009/01/19 16:53:42 lgarnier Exp $ 28 // GEANT4 tag $Name: $ 29 29 // 30 30 //Virtual base class for all Motif widgets. -
trunk/source/visualization/OpenGL/src/G4OpenGLXmVWidgetShell.cc
r850 r911 25 25 // 26 26 // 27 // $Id: G4OpenGLXmVWidgetShell.cc,v 1. 5 2006/06/29 21:20:14 gunter Exp $28 // GEANT4 tag $Name: HEAD$27 // $Id: G4OpenGLXmVWidgetShell.cc,v 1.6 2009/01/19 16:53:42 lgarnier Exp $ 28 // GEANT4 tag $Name: $ 29 29 // 30 30 //Base class for all Motif shell widgets -
trunk/source/visualization/OpenGL/src/G4OpenGLXmViewer.cc
r908 r911 25 25 // 26 26 // 27 // $Id: G4OpenGLXmViewer.cc,v 1.2 6 2009/01/15 18:14:58lgarnier Exp $27 // $Id: G4OpenGLXmViewer.cc,v 1.27 2009/01/19 16:08:47 lgarnier Exp $ 28 28 // GEANT4 tag $Name: $ 29 29 // -
trunk/source/visualization/OpenGL/src/G4OpenGLXmViewerMessenger.cc
r850 r911 25 25 // 26 26 // 27 // $Id: G4OpenGLXmViewerMessenger.cc,v 1. 4 2006/06/29 21:20:18 gunter Exp $28 // GEANT4 tag $Name: HEAD$27 // $Id: G4OpenGLXmViewerMessenger.cc,v 1.5 2009/01/19 16:53:42 lgarnier Exp $ 28 // GEANT4 tag $Name: $ 29 29 30 30 #ifdef G4VIS_BUILD_OPENGLXM_DRIVER -
trunk/source/visualization/OpenGL/src/G4OpenGLXmWindowHandlingCallbacks.cc
r906 r911 25 25 // 26 26 // 27 // $Id: G4OpenGLXmWindowHandlingCallbacks.cc,v 1. 7 2009/01/13 09:47:05lgarnier Exp $27 // $Id: G4OpenGLXmWindowHandlingCallbacks.cc,v 1.8 2009/01/19 16:26:40 lgarnier Exp $ 28 28 // GEANT4 tag $Name: $ 29 29 // -
trunk/source/visualization/management/src/G4ViewParameters.cc
r910 r911 25 25 // 26 26 // 27 // $Id: G4ViewParameters.cc,v 1.3 3 2009/01/19 15:47:49lgarnier Exp $27 // $Id: G4ViewParameters.cc,v 1.34 2009/01/19 16:26:40 lgarnier Exp $ 28 28 // GEANT4 tag $Name: $ 29 29 // … … 599 599 600 600 G4int G4ViewParameters::GetWindowAbsoluteLocationHintX (G4int sizeX ) const { 601 #ifdef G4DEBUG602 printf("G4ViewParameters::GetWindowLocationHintX () :: %d\n",fWindowLocationHintX);603 #endif604 601 if ( fWindowLocationHintXNegative ) { 605 602 return sizeX + fWindowLocationHintX - fWindowSizeHintX; … … 609 606 610 607 G4int G4ViewParameters::GetWindowAbsoluteLocationHintY (G4int sizeY ) const { 611 #ifdef G4DEBUG612 printf("G4ViewParameters::GetWindowLocationHintY () :: %d\n",fWindowLocationHintY);613 #endif614 608 if ( fWindowLocationHintYNegative ) { 615 609 return sizeY + fWindowLocationHintY - fWindowSizeHintY; … … 654 648 strind = (char *)string; 655 649 if (*strind != '+' && *strind != '-' && *strind != 'x') { 656 #ifdef G4DEBUG657 printf("G4ViewParameters::ParseGeometry !+-x\n");658 #endif659 650 tempWidth = ReadInteger(strind, &nextCharacter); 660 651 if (strind == nextCharacter) … … 664 655 } 665 656 if (*strind == 'x' || *strind == 'X') { 666 #ifdef G4DEBUG667 printf("G4ViewParameters::ParseGeometry = xX\n");668 #endif669 657 strind++; 670 658 tempHeight = ReadInteger(strind, &nextCharacter); … … 676 664 677 665 if ((*strind == '+') || (*strind == '-')) { 678 #ifdef G4DEBUG679 printf("G4ViewParameters::ParseGeometry = +-\n");680 #endif681 666 if (*strind == '-') { 682 667 strind++;
Note: See TracChangeset
for help on using the changeset viewer.