Changeset 1307 for trunk/source/visualization/OpenGL/src
- Timestamp:
- Jun 4, 2010, 5:28:11 PM (14 years ago)
- Location:
- trunk/source/visualization/OpenGL/src
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/source/visualization/OpenGL/src/G4OpenGLImmediateQtViewer.cc
r1295 r1307 25 25 // 26 26 // 27 // $Id: G4OpenGLImmediateQtViewer.cc,v 1.1 8 2010/03/10 11:03:46lgarnier Exp $28 // GEANT4 tag $Name: vis-V09-03-06$27 // $Id: G4OpenGLImmediateQtViewer.cc,v 1.19 2010/06/04 15:27:47 lgarnier Exp $ 28 // GEANT4 tag $Name: $ 29 29 // 30 30 // … … 53 53 setFocusPolicy(Qt::StrongFocus); // enable keybord events 54 54 #endif 55 fHasToRepaint =false; 55 fHasToRepaint = false; 56 fIsRepainting = false; 56 57 57 58 if (fViewId < 0) return; // In case error in base class instantiation. … … 148 149 ,int aHeight) 149 150 { 150 ResizeWindow(aWidth,aHeight); 151 fHasToRepaint = sizeHasChanged(); 151 if ((aWidth > 0) && (aHeight > 0)) { 152 ResizeWindow(aWidth,aHeight); 153 fHasToRepaint = sizeHasChanged(); 154 } 152 155 } 153 156 … … 155 158 void G4OpenGLImmediateQtViewer::paintGL() 156 159 { 160 if (fIsRepainting) { 161 return ; 162 } 157 163 #ifdef G4DEBUG_VIS_OGL 158 164 printf("\n\nG4OpenGLImmediateQtViewer::paintGL ??\n"); … … 208 214 printf("G4OpenGLImmediateQtViewer::paintGL ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ready %d\n\n\n",fReadyToPaint); 209 215 #endif 216 fIsRepainting = false; 210 217 } 211 218 -
trunk/source/visualization/OpenGL/src/G4OpenGLImmediateSceneHandler.cc
r1295 r1307 25 25 // 26 26 // 27 // $Id: G4OpenGLImmediateSceneHandler.cc,v 1.3 2 2010/05/29 15:52:49 allison Exp $28 // GEANT4 tag $Name: vis-V09-03-06$27 // $Id: G4OpenGLImmediateSceneHandler.cc,v 1.35 2010/06/03 20:35:19 allison Exp $ 28 // GEANT4 tag $Name: $ 29 29 // 30 30 // … … 203 203 204 204 void G4OpenGLImmediateSceneHandler::ClearTransientStore () { 205 205 206 G4VSceneHandler::ClearTransientStore (); 207 208 // Make sure screen corresponds to graphical database... 209 if (fpViewer) { 210 fpViewer -> SetView (); 211 fpViewer -> ClearView (); 212 fpViewer -> DrawView (); 213 } 206 214 } 207 215 -
trunk/source/visualization/OpenGL/src/G4OpenGLStoredQtViewer.cc
r1295 r1307 25 25 // 26 26 // 27 // $Id: G4OpenGLStoredQtViewer.cc,v 1. 29 2010/03/10 11:03:46lgarnier Exp $28 // GEANT4 tag $Name: vis-V09-03-06$27 // $Id: G4OpenGLStoredQtViewer.cc,v 1.30 2010/06/04 15:27:47 lgarnier Exp $ 28 // GEANT4 tag $Name: $ 29 29 // 30 30 // … … 53 53 setFocusPolicy(Qt::StrongFocus); // enable keybord events 54 54 #endif 55 fHasToRepaint =false; 55 fHasToRepaint = false; 56 fIsRepainting = false; 56 57 57 58 if (fViewId < 0) return; // In case error in base class instantiation. … … 181 182 printf("G4OpenGLStoredQtViewer::ComputeView %d %d ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ \n",getWinWidth(), getWinHeight()); 182 183 #endif 183 fHasToRepaint = true;184 fHasToRepaint = true; 184 185 } 185 186 … … 193 194 { 194 195 // Set new size, it will be update when next Repaint()->SetView() called 195 ResizeWindow(aWidth,aHeight); 196 fHasToRepaint = sizeHasChanged(); 196 if ((aWidth > 0) && (aHeight > 0)) { 197 ResizeWindow(aWidth,aHeight); 198 fHasToRepaint = sizeHasChanged(); 199 } 197 200 } 198 201 … … 205 208 void G4OpenGLStoredQtViewer::paintGL() 206 209 { 210 if (fIsRepainting) { 211 return ; 212 } 213 fIsRepainting = true; 207 214 #ifdef G4DEBUG_VIS_OGL 208 215 printf("G4OpenGLStoredQtViewer::paintGL ready:%d fHasTo:%d??\n",fReadyToPaint,fHasToRepaint); … … 240 247 241 248 SetView(); 242 249 243 250 ClearView (); //ok, put the background correct 244 251 ComputeView(); 245 252 246 fHasToRepaint = false;253 fHasToRepaint = false; 247 254 248 255 #ifdef G4DEBUG_VIS_OGL 249 256 printf("G4OpenGLStoredQtViewer::paintGL ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ready %d\n",fReadyToPaint); 250 257 #endif 258 fIsRepainting = false; 251 259 } 252 260 -
trunk/source/visualization/OpenGL/src/G4OpenGLStoredSceneHandler.cc
r1286 r1307 25 25 // 26 26 // 27 // $Id: G4OpenGLStoredSceneHandler.cc,v 1.4 1 2010/05/29 15:52:49allison Exp $27 // $Id: G4OpenGLStoredSceneHandler.cc,v 1.42 2010/06/03 08:23:02 allison Exp $ 28 28 // GEANT4 tag $Name: $ 29 29 // … … 361 361 glDeleteLists(fTOList[i].fDisplayListId, 1); 362 362 fTOList.clear (); 363 364 // Make sure screen corresponds to graphical database... 365 if (fpViewer) { 366 fpViewer -> SetView (); 367 fpViewer -> ClearView (); 368 fpViewer -> DrawView (); 369 } 363 370 } 364 371 -
trunk/source/visualization/OpenGL/src/G4OpenGLStoredXViewer.cc
r1295 r1307 25 25 // 26 26 // 27 // $Id: G4OpenGLStoredXViewer.cc,v 1.2 6 2010/05/29 15:56:50allison Exp $28 // GEANT4 tag $Name: vis-V09-03-06$27 // $Id: G4OpenGLStoredXViewer.cc,v 1.27 2010/06/03 08:26:55 allison Exp $ 28 // GEANT4 tag $Name: $ 29 29 // 30 30 // … … 133 133 FinishView (); 134 134 } else { // ADD TO AVOID KernelVisit=1 and nothing to display 135 //DrawDisplayLists (); ????????? (JA)136 //FinishView (); ????????? (JA)135 DrawDisplayLists (); 136 FinishView (); 137 137 } 138 138 } -
trunk/source/visualization/OpenGL/src/G4OpenGLViewer.cc
r1274 r1307 177 177 glViewport(0, 0, fWinSize_x,fWinSize_y); 178 178 179 #ifdef G4DEBUG_VIS_OGL 180 printf("G4OpenGLViewer::ResizeGLView END %d %d &:%d\n",fWinSize_x,fWinSize_y,this); 181 #endif 179 182 180 183 } … … 186 189 return; 187 190 } 191 #ifdef G4DEBUG_VIS_OGL 192 printf("G4OpenGLViewer::SetView\n"); 193 #endif 188 194 // Calculates view representation based on extent of object being 189 195 // viewed and (initial) viewpoint. (Note: it can change later due … … 330 336 background = fVP.GetBackgroundColour (); 331 337 338 #ifdef G4DEBUG_VIS_OGL 339 printf("G4OpenGLViewer::SetView END\n"); 340 #endif 332 341 } 333 342
Note: See TracChangeset
for help on using the changeset viewer.