Changeset 1141 for trunk/source/visualization
- Timestamp:
- Nov 3, 2009, 2:00:34 PM (15 years ago)
- Location:
- trunk/source/visualization
- Files:
-
- 2 added
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/source/visualization/OpenGL/History
r1140 r1141 1 $Id: History,v 1.15 6 2009/10/21 15:21:09 allisonExp $1 $Id: History,v 1.158 2009/11/03 11:02:32 lgarnier Exp $ 2 2 ------------------------------------------------------------------- 3 3 … … 17 17 * Reverse chronological order (last date on top), please * 18 18 ---------------------------------------------------------- 19 20 3rd November October 2009 Laurent Garnier 21 - G4OpenGLImmediateQtViewer, G4OpenGLStoredQtViewer : Protec Qt4 method 22 introduce 13rd october 09 by ifdef 23 24 3rd November October 2009 John Allison 25 - G4OpenGLXmPanningCallbacks: Fixed pView compilation problem. 19 26 20 27 21 October 2009 Laurent Garnier -
trunk/source/visualization/OpenGL/src/G4OpenGLImmediateQtViewer.cc
r1132 r1141 25 25 // 26 26 // 27 // $Id: G4OpenGLImmediateQtViewer.cc,v 1.1 6 2009/10/14 14:51:20lgarnier Exp $27 // $Id: G4OpenGLImmediateQtViewer.cc,v 1.17 2009/11/03 11:02:32 lgarnier Exp $ 28 28 // GEANT4 tag $Name: $ 29 29 // … … 188 188 // DO NOT RESIZE IF SIZE HAS NOT CHANGE 189 189 if ( !fHasToRepaint) { 190 #if QT_VERSION < 0x040000 191 if (((getWinWidth() == (unsigned int)width())) &&(getWinHeight() == (unsigned int) height())) { 192 #else 190 193 // L. Garnier : Trap to get the size with mac OSX 10.6 and Qt 4.6(devel) 191 194 // Tested on Qt4.5 on mac, 4.4 on windows, 4.5 on unbuntu … … 200 203 } 201 204 if ((getWinWidth() == (unsigned int)sw) &&(getWinHeight() == (unsigned int)sh)) { 205 #endif 202 206 return; 203 207 } -
trunk/source/visualization/OpenGL/src/G4OpenGLStoredQtViewer.cc
r1137 r1141 25 25 // 26 26 // 27 // $Id: G4OpenGLStoredQtViewer.cc,v 1.2 7 2009/10/14 14:51:20lgarnier Exp $27 // $Id: G4OpenGLStoredQtViewer.cc,v 1.28 2009/11/03 11:02:32 lgarnier Exp $ 28 28 // GEANT4 tag $Name: $ 29 29 // … … 204 204 ,int aHeight) 205 205 { 206 #ifdef G4DEBUG_VIS_OGL207 printf("G4OpenGLStoredQtViewer::resizeGL %d %d ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ \n",aWidth, aHeight);208 #endif209 206 // Set new size, it will be update when next Repaint()->SetView() called 210 207 ResizeWindow(aWidth,aHeight); … … 226 223 // EXECEPT WHEN MOUSE MOVE EVENT 227 224 if ( !fHasToRepaint) { 225 #if QT_VERSION < 0x040000 226 if (((getWinWidth() == (unsigned int)width())) &&(getWinHeight() == (unsigned int) height())) { 227 #else 228 228 // L. Garnier : Trap to get the size with mac OSX 10.6 and Qt 4.6(devel) 229 229 // Tested on Qt4.5 on mac, 4.4 on windows, 4.5 on unbuntu … … 238 238 } 239 239 if ((getWinWidth() == (unsigned int)sw) &&(getWinHeight() == (unsigned int)sh)) { 240 #endif 240 241 return; 241 242 } … … 245 246 #endif 246 247 247 //SetView();248 SetView(); 248 249 249 250 ClearView (); //ok, put the background correct 250 251 ComputeView(); 251 252 -
trunk/source/visualization/OpenGL/src/G4OpenGLXmPanningCallbacks.cc
r1137 r1141 25 25 // 26 26 // 27 // $Id: G4OpenGLXmPanningCallbacks.cc,v 1.1 1 2009/10/20 12:47:45 lgarnierExp $27 // $Id: G4OpenGLXmPanningCallbacks.cc,v 1.12 2009/11/03 10:21:49 allison Exp $ 28 28 // GEANT4 tag $Name: $ 29 29 // … … 49 49 XtPointer callData) 50 50 { 51 52 51 XmScaleCallbackStruct *cbs = (XmScaleCallbackStruct*) callData; 53 52 G4OpenGLXmViewer* pView = (G4OpenGLXmViewer*) clientData; 54 53 short dp = -1; 55 54 G4float ten_to_the_dp = 10.; 56 57 // No callback allowed when no scene58 if (!pView->GetSceneHandler()->GetScene()) {59 return;60 }61 55 62 56 XtVaGetValues (w, … … 91 85 XtPointer callData) 92 86 { 93 94 87 XmScaleCallbackStruct *cbs = (XmScaleCallbackStruct*) callData; 95 88 G4OpenGLXmViewer* pView = (G4OpenGLXmViewer*) clientData; 96 89 short dp = -1; 97 90 G4float ten_to_the_dp = 10.; 98 99 // No callback allowed when no scene100 if (!pView->GetSceneHandler()->GetScene()) {101 return;102 }103 91 104 92 XtVaGetValues (w, … … 146 134 147 135 { 148 149 136 G4OpenGLXmViewer* pView = (G4OpenGLXmViewer*) clientData; 150 137 G4double delta; 151 138 152 // No callback allowed when no scene153 if (!pView->GetSceneHandler()->GetScene()) {154 return;155 }156 157 139 if (pView->pan_right) { 158 140 delta = (G4double)pView->pan_sens; … … 205 187 XtIntervalId* timer_id) 206 188 { 207 208 189 G4OpenGLXmViewer* pView = (G4OpenGLXmViewer*) clientData; 209 190 G4double delta; 210 191 211 // No callback allowed when no scene212 if (!pView->GetSceneHandler()->GetScene()) {213 return;214 }215 192 if (pView->pan_up) { 216 193 delta = (G4double)pView->pan_sens;
Note: See TracChangeset
for help on using the changeset viewer.