Changeset 1038 for trunk/source/visualization
- Timestamp:
- May 12, 2009, 11:04:00 AM (15 years ago)
- Location:
- trunk/source/visualization
- Files:
-
- 18 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/source/visualization/OpenGL/include/G4OpenGLViewer.hh
r1037 r1038 59 59 virtual ~G4OpenGLViewer (); 60 60 void SetView (); 61 // Set view and lights, resize 62 void RepaintGLView(); 63 // Refresh the view if needed 61 64 void HaloingFirstPass (); 62 65 void HaloingSecondPass (); … … 66 69 void InitializeGLView (); 67 70 void ResizeGLView(unsigned int, unsigned int); 71 // Resize the view and repaint if necessary 68 72 void Pick(GLdouble x, GLdouble y); 69 73 virtual void CreateFontLists () {} … … 83 87 G4int fPrintSizeX; 84 88 G4int fPrintSizeY; 89 G4bool fNeedRepaint; 90 // 0 : No need to repaint 1: Need Repaint 85 91 86 92 G4OpenGLSceneHandler& fOpenGLSceneHandler; -
trunk/source/visualization/OpenGL/src/G4OpenGLImmediateQtViewer.cc
r1037 r1038 56 56 setFocusPolicy(Qt::StrongFocus); // enable keybord events 57 57 #endif 58 hasToRepaint =false; 58 59 fNeedRepaint = false; 59 60 60 61 if (fViewId < 0) return; // In case error in base class instantiation. … … 73 74 CreateFontLists (); 74 75 76 #ifdef G4DEBUG_VIS_OGL 77 printf("G4OpenGLImmediateQtViewer::Initialise END\n"); 78 #endif 75 79 readyToPaint = true; 80 #ifdef G4DEBUG_VIS_OGL 81 printf("G4OpenGLImmediateQtViewer::Initialise END 2\n"); 82 #endif 83 76 84 } 77 85 78 86 void G4OpenGLImmediateQtViewer::initializeGL () { 87 #ifdef G4DEBUG_VIS_OGL 88 printf("G4OpenGLImmediateQtViewer::initializeGL\n"); 89 #endif 79 90 80 91 InitializeGLView (); 92 #ifdef G4DEBUG_VIS_OGL 93 printf("G4OpenGLImmediateQtViewer::initializeGL middle\n"); 94 #endif 81 95 82 96 … … 92 106 93 107 if (fSceneHandler.GetScene() == 0) { 94 hasToRepaint =false;108 fNeedRepaint = false; 95 109 } else { 96 hasToRepaint =true; 97 } 110 fNeedRepaint = true; 111 } 112 #ifdef G4DEBUG_VIS_OGL 113 printf("G4OpenGLImmediateQtViewer::initializeGL END\n"); 114 #endif 98 115 99 116 } … … 106 123 printf("G4OpenGLImmediateQtViewer::DrawView VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV\n"); 107 124 #endif 108 // That's no the same logic as Stored Viewer, I don't know why... 109 // see G4OpenGLStoredQtViewer::DrawView for more informations 110 111 updateQWidget(); 125 126 // avoid problems at initialisation 127 if (readyToPaint) { 128 ComputeView(); 129 } 130 112 131 #ifdef G4DEBUG_VIS_OGL 113 132 printf("G4OpenGLImmediateQtViewer::DrawView ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n"); … … 152 171 printf("G4OpenGLImmediateQtViewer::ComputeView ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ \n"); 153 172 #endif 154 hasToRepaint = true;173 fNeedRepaint = false; 155 174 } 156 175 … … 175 194 ,int aHeight) 176 195 { 196 #ifdef G4DEBUG_VIS_OGL 197 printf("\n\nG4OpenGLImmediateQtViewer::resizeGL VVVVVV %d %d ??\n",aWidth,aHeight); 198 #endif 177 199 ResizeGLView(aWidth,aHeight); 178 // hasToRepaint = true; 200 #ifdef G4DEBUG_VIS_OGL 201 printf("\n\nG4OpenGLImmediateQtViewer::resizeGL END\n"); 202 #endif 179 203 } 180 204 … … 182 206 void G4OpenGLImmediateQtViewer::paintGL() 183 207 { 208 184 209 #ifdef G4DEBUG_VIS_OGL 185 210 printf("\n\nG4OpenGLImmediateQtViewer::paintGL ??\n"); 186 211 #endif 187 if ( !readyToPaint) {188 readyToPaint= true; 189 return;190 } 191 // DO NOT RESIZE IF SIZE HAS NOT CHANGE192 // if ( !hasToRepaint) { 193 // if (((fWinSize_x == (unsigned int)width())) &&(fWinSize_y == (unsigned int) height())) { 194 // return; 195 // } 196 // } 197 #ifdef G4DEBUG_VIS_OGL 198 printf("G4OpenGLImmediateQtViewer::paintGL VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV ready %d\n",readyToPaint); 199 #endif 200 201 SetView(); 202 203 ClearView (); //ok, put the background correct 204 ComputeView();205 206 hasToRepaint = false; // could be set to false by ComputeView 207 208 #ifdef G4DEBUG_VIS_OGL 209 printf("G4OpenGLImmediateQtViewer::paintGL ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ready %d\n\n\n",readyToPaint);212 if (fNeedRepaint) { 213 #ifdef G4DEBUG_VIS_OGL 214 printf("\n\nG4OpenGLImmediateQtViewer::Need ??\n"); 215 #endif 216 if (readyToPaint) { 217 #ifdef G4DEBUG_VIS_OGL 218 printf("\n\nG4OpenGLImmediateQtViewer::ready ??\n"); 219 #endif 220 RepaintGLView(); 221 fNeedRepaint = false; 222 } 223 #ifdef G4DEBUG_VIS_OGL 224 else 225 printf("\n\nG4OpenGLImmediateQtViewer::NOT ready ??\n"); 226 #endif 227 } 228 #ifdef G4DEBUG_VIS_OGL 229 else 230 printf("\n\nG4OpenGLImmediateQtViewer::NOT need ??\n"); 231 #endif 232 233 #ifdef G4DEBUG_VIS_OGL 234 printf("G4OpenGLImmediateQtViewer::paintGL ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ready\n\n\n"); 210 235 #endif 211 236 } … … 252 277 253 278 void G4OpenGLImmediateQtViewer::updateQWidget() { 254 hasToRepaint= true;279 fNeedRepaint = true; 255 280 updateGL(); 256 hasToRepaint= false;281 fNeedRepaint = false; 257 282 } 258 283 -
trunk/source/visualization/OpenGL/src/G4OpenGLQtViewer.cc
r1037 r1038 182 182 YPos = offset; 183 183 } 184 // ResizeGLView(fVP.GetWindowSizeHintX(),fVP.GetWindowSizeHintY());184 GLWindow->resize(getWinWidth(),getWinHeight()); 185 185 GLWindow->move(fVP.GetWindowAbsoluteLocationHintX(QApplication::desktop()->width()),YPos); 186 186 GLWindow->show(); -
trunk/source/visualization/OpenGL/src/G4OpenGLStoredQtViewer.cc
r1037 r1038 57 57 setFocusPolicy(Qt::StrongFocus); // enable keybord events 58 58 #endif 59 hasToRepaint =false;59 fNeedRepaint =false; 60 60 61 61 if (fViewId < 0) return; // In case error in base class instantiation. … … 78 78 79 79 readyToPaint = true; 80 #ifdef G4DEBUG_VIS_OGL 81 printf("G4OpenGLStoredQtViewer::Initialise END\n"); 82 #endif 80 83 } 81 84 … … 96 99 97 100 if (fSceneHandler.GetScene() == 0) { 98 hasToRepaint =false;101 fNeedRepaint =false; 99 102 } else { 100 hasToRepaint =true;103 fNeedRepaint =true; 101 104 } 102 105 … … 117 120 // And we loose the redraw of things ! 118 121 119 ComputeView(); 122 // avoid problems at initialisation 123 if (readyToPaint) { 124 ComputeView(); 125 } 126 120 127 #ifdef G4DEBUG_VIS_OGL 121 128 printf("G4OpenGLStoredQtViewer::DrawView ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n"); … … 197 204 printf("G4OpenGLStoredQtViewer::ComputeView ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ \n"); 198 205 #endif 199 hasToRepaint =true;200 206 } 201 207 … … 205 211 */ 206 212 void G4OpenGLStoredQtViewer::resizeGL( 207 208 213 int aWidth 214 ,int aHeight) 209 215 { 210 216 // Set new size, it will be update when next Repaint()->SetView() called 211 217 ResizeGLView(aWidth,aHeight); 212 // hasToRepaint = true;218 // fNeedRepaint = true; 213 219 } 214 220 … … 223 229 return; 224 230 } 225 // DO NOT RESIZE IF SIZE HAS NOT CHANGE : 226 // WHEN CLICK ON THE FRAME FOR EXAMPLE 227 // EXECEPT WHEN MOUSE MOVE EVENT 228 // if ( !hasToRepaint) { 229 // if (((fWinSize_x == (unsigned int)width())) &&(fWinSize_y == (unsigned int) height())) { 230 // return; 231 // } 232 // } 233 #ifdef G4DEBUG_VIS_OGL 234 printf("G4OpenGLStoredQtViewer::paintGL VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV ready %d\n",readyToPaint); 235 #endif 236 237 SetView(); 238 239 ClearView (); //ok, put the background correct 240 ComputeView(); 241 242 hasToRepaint =false; 243 231 RepaintGLView(); 232 244 233 #ifdef G4DEBUG_VIS_OGL 245 234 printf("G4OpenGLStoredQtViewer::paintGL ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ready %d\n",readyToPaint); … … 288 277 289 278 void G4OpenGLStoredQtViewer::updateQWidget() { 290 hasToRepaint= true;279 fNeedRepaint= true; 291 280 updateGL(); 292 hasToRepaint= false;281 fNeedRepaint= false; 293 282 } 294 283 -
trunk/source/visualization/OpenGL/src/G4OpenGLViewer.cc
r1037 r1038 137 137 void G4OpenGLViewer::ResizeGLView(unsigned int aWidth,unsigned int aHeight) 138 138 { 139 if ((fWinSize_x != aWidth) &&(fWinSize_y != aHeight)) {139 if ((fWinSize_x != aWidth) || (fWinSize_y != aHeight)) { 140 140 fWinSize_x = aWidth; 141 141 fWinSize_y = aHeight; … … 144 144 } 145 145 146 void G4OpenGLViewer::RepaintGLView() 147 { 148 // DO NOT REPAINT IF NO REFRESH IS NEED 149 // if ( !fNeedRepaint) { 150 // return; 151 // } 152 #ifdef G4DEBUG_VIS_OGL 153 printf("G4OpenGLViewer::paintGL VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV \n"); 154 #endif 155 156 fNeedRepaint = true; // could be set to false by ComputeView 157 SetView(); 158 ClearView (); 159 DrawView(); 160 161 fNeedRepaint = false; // could be set to false by ComputeView 162 163 #ifdef G4DEBUG_VIS_OGL 164 printf("G4OpenGLViewer::paintGL ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ \n"); 165 #endif 166 167 } 146 168 147 169 /** … … 200 222 #endif 201 223 glViewport(X, Y, side, side); 224 225 RepaintGLView(); 226 202 227 // glViewport(0, 0, fWinSize_x,fWinSize_y); 203 228 … … 640 665 } 641 666 642 width=8192;643 height=8192;667 // width=8192; 668 // height=8192; 644 669 645 670 if (!fGL2PSAction) return false; -
trunk/source/visualization/OpenGL/src/G4OpenGLXmPanningCallbacks.cc
r915 r1038 76 76 77 77 pView->fVP.SetZoomFactor (zoomBy); 78 pView->SetView (); 79 pView->ClearView (); 80 pView -> DrawView (); 78 pView->RepaintGLView (); 81 79 } 82 80 … … 108 106 109 107 pView->fVP.SetDolly (dolly); 110 pView->SetView (); 111 pView->ClearView (); 112 pView->DrawView (); 108 pView->RepaintGLView (); 113 109 114 110 } … … 157 153 pView->fVP.SetCurrentTargetPoint (tp - stp); 158 154 159 pView->SetView (); 160 pView->ClearView (); 161 pView->DrawView (); 155 pView->RepaintGLView (); 162 156 163 157 pView->pan_timer = XtAppAddTimeOut … … 207 201 pView->fVP.SetCurrentTargetPoint (tp - stp); 208 202 209 pView->SetView (); 210 pView->ClearView (); 211 pView->DrawView (); 203 pView->RepaintGLView(); 212 204 213 205 pView->pan_timer = XtAppAddTimeOut -
trunk/source/visualization/OpenGL/src/G4OpenGLXmRotationCallbacks.cc
r976 r1038 109 109 */ 110 110 111 pView->SetView (); 112 pView->ClearView (); 113 pView->DrawView (); 111 pView->RepaintGLView (); 114 112 115 113 pView->rotation_timer = XtAppAddTimeOut … … 182 180 183 181 */ 184 pView->SetView (); 185 pView->ClearView (); 186 pView->DrawView (); 182 pView->RepaintGLView (); 187 183 188 184 pView->rotation_timer = XtAppAddTimeOut … … 275 271 pView->fVP.SetViewAndLights (pView->original_vp + d_up + d_third_axis); 276 272 277 pView->SetView (); 278 pView->ClearView (); 279 pView->DrawView (); 273 pView->RepaintGLView (); 280 274 281 275 if (pView->frameNo++ == 20) { … … 284 278 pView->frameNo = 0; 285 279 pView->fVP.SetViewAndLights (pView->original_vp); 286 pView->SetView (); 287 pView->ClearView (); 288 pView->DrawView (); 280 pView->RepaintGLView(); 289 281 } 290 282 } else { … … 311 303 pView->fVP.SetZoomFactor(1.0); 312 304 pView->fVP.SetDolly(0.0); 313 pView-> SetView();305 pView->RepaintGLView(); 314 306 pView->ClearView (); 315 307 pView->DrawView (); -
trunk/source/visualization/OpenGL/src/G4OpenGLXmStyleCallbacks.cc
r951 r1038 75 75 pView->fVP.SetDrawingStyle (style); 76 76 77 pView->SetView (); 78 pView->ClearView (); 79 pView->DrawView (); 77 pView->RepaintGLView(); 80 78 } 81 79 … … 108 106 pView->fVP.SetRepStyle (style); 109 107 110 pView->SetView (); 111 pView->ClearView (); 112 pView->DrawView (); 108 pView->RepaintGLView (); 113 109 } 114 110 … … 145 141 } 146 142 147 pView->SetView (); 148 pView->ClearView (); 149 pView->DrawView (); 143 pView->RepaintGLView (); 150 144 } 151 145 … … 175 169 176 170 pView->SetNeedKernelVisit (true); 177 pView->SetView (); 178 pView->ClearView (); 179 pView->DrawView (); 171 pView->RepaintGLView (); 180 172 } 181 173 … … 210 202 } 211 203 212 pView->SetView (); 213 pView->ClearView (); 214 pView->DrawView (); 204 pView->RepaintGLView (); 215 205 } 216 206 … … 239 229 } 240 230 241 pView->SetView (); 242 pView->ClearView (); 243 pView->DrawView (); 231 pView->RepaintGLView (); 244 232 } 245 233 … … 269 257 270 258 pView->SetNeedKernelVisit (true); 271 pView->SetView (); 272 pView->ClearView (); 273 pView->DrawView (); 259 pView->RepaintGLView (); 274 260 } 275 261 … … 306 292 } 307 293 308 pView->SetView (); 309 pView->ClearView (); 310 pView->DrawView (); 294 pView->RepaintGLView(); 311 295 } 312 296 -
trunk/source/visualization/OpenGL/src/G4OpenGLXmWindowHandlingCallbacks.cc
r1037 r1038 63 63 64 64 pView->ResizeGLView((G4int) width,(G4int) height); 65 // will call pView->RepaintGLView() if necessary; 65 66 66 67 glXMakeCurrent (pView->dpy, XtWindow(pView->glxarea), pView->cx); … … 69 70 printf("G4OpenGLXmViewer::expose_callback\n"); 70 71 #endif 71 // FIXME : L.Garnier 11 Mai 2009 : Should be erase72 pView->SetView ();73 pView->ClearView ();74 pView->DrawView ();75 // ENDOF Fixme76 72 77 73 } -
trunk/source/visualization/externals/gl2ps/History
r1023 r1038 1 $Id: History,v 1. 7 2009/04/27 15:29:46 allisonExp $1 $Id: History,v 1.8 2009/04/29 09:37:55 lgarnier Exp $ 2 2 ------------------------------------------------------------------- 3 3 … … 17 17 * Reverse chronological order (last date on top), please * 18 18 ---------------------------------------------------------- 19 20 29 April 2009, Laurent Garnier 21 - G4OpenGL2PSAction : Fix a circular dependency to G4OpenGL on Linux 19 22 20 23 27 April 2009, Laurent Garnier (visexternal-V09-02-03) -
trunk/source/visualization/externals/gl2ps/include/G4OpenGL2PSAction.hh
r1024 r1038 24 24 // ******************************************************************** 25 25 // 26 // $Id: G4OpenGL2PSAction.hh,v 1. 2 2009/04/08 15:26:59lgarnier Exp $26 // $Id: G4OpenGL2PSAction.hh,v 1.3 2009/04/29 09:37:55 lgarnier Exp $ 27 27 // GEANT4 tag $Name: $ 28 28 // -
trunk/source/visualization/externals/gl2ps/src/G4OpenGL2PSAction.cc
r1024 r1038 25 25 // 26 26 // 27 // $Id: G4OpenGL2PSAction.cc,v 1. 3 2009/03/19 11:59:35 lgarnier Exp $27 // $Id: G4OpenGL2PSAction.cc,v 1.4 2009/04/29 09:37:55 lgarnier Exp $ 28 28 // GEANT4 tag $Name: $ 29 29 // -
trunk/source/visualization/management/src/G4VSceneHandler.cc
r959 r1038 451 451 if (pPolyhedron) { 452 452 pPolyhedron -> SetVisAttributes (fpVisAttribs); 453 printf("G4VSceneHandler::RequestPrimitives VSolid: %d\n",pPolyhedron); 454 G4cout << 455 "G4VSceneHandler::RequestPrimitives VSolid " << solid.GetName () <<G4endl; 453 456 AddPrimitive (*pPolyhedron); 454 457 } … … 565 568 566 569 if (visManager->GetRequestedEvent()) { 570 #ifdef G4DEBUG_VIS_MANAGEMENT 571 printf("G4VSceneHandler::ProcessScene : DrawEvent\n"); 572 #endif 567 573 DrawEvent(visManager->GetRequestedEvent()); 568 574 569 575 } else { 570 576 577 #ifdef G4DEBUG_VIS_MANAGEMENT 578 printf("G4VSceneHandler::ProcessScene : no event\n"); 579 #endif 571 580 G4RunManager* runManager = G4RunManager::GetRunManager(); 572 581 if (runManager) { 582 #ifdef G4DEBUG_VIS_MANAGEMENT 583 printf("G4VSceneHandler::ProcessScene : runManager\n"); 584 #endif 573 585 const G4Run* run = runManager->GetCurrentRun(); 574 586 const std::vector<const G4Event*>* events = … … 578 590 if (nKeptEvents) { 579 591 592 #ifdef G4DEBUG_VIS_MANAGEMENT 593 printf("G4VSceneHandler::ProcessScene : 1\n"); 594 #endif 580 595 if (fpScene->GetRefreshAtEndOfEvent()) { 596 #ifdef G4DEBUG_VIS_MANAGEMENT 597 printf("G4VSceneHandler::ProcessScene : 2\n"); 598 #endif 581 599 582 600 if (verbosity >= G4VisManager::confirmations) { … … 588 606 589 607 } else { // Accumulating events. 608 #ifdef G4DEBUG_VIS_MANAGEMENT 609 printf("G4VSceneHandler::ProcessScene : 3\n"); 610 #endif 590 611 591 612 if (verbosity >= G4VisManager::confirmations) { … … 593 614 } 594 615 for (size_t i = 0; i < nKeptEvents; ++i) { 616 #ifdef G4DEBUG_VIS_MANAGEMENT 617 printf("G4VSceneHandler::ProcessScene : 4\n"); 618 #endif 595 619 const G4Event* event = (*events)[i]; 596 620 if (event) DrawEvent(event); … … 598 622 599 623 if (!fpScene->GetRefreshAtEndOfRun()) { 624 #ifdef G4DEBUG_VIS_MANAGEMENT 625 printf("G4VSceneHandler::ProcessScene : 5\n"); 626 #endif 600 627 if (verbosity >= G4VisManager::warnings) { 601 628 G4cout << -
trunk/source/visualization/management/src/G4VisManager.cc
r944 r1038 1243 1243 void G4VisManager::EndOfEvent () 1244 1244 { 1245 printf("G4VisManager::EndOfEvent \n"); 1246 1245 1247 //G4cout << "G4VisManager::EndOfEvent" << G4endl; 1246 1248 … … 1258 1260 if (!currentEvent) return; 1259 1261 1262 // FIXME : OK 1263 printf("G4VisManager::EndOfEvent 0\n"); 1260 1264 ClearTransientStoreIfMarked(); 1265 printf("G4VisManager::EndOfEvent 1\n"); 1266 // FIXME : OK 1261 1267 fpSceneHandler->DrawEvent(currentEvent); 1262 1268 … … 1264 1270 G4int nKeptEvents = 0; 1265 1271 G4int eventID = -2; // (If no run manager, triggers ShowView as normal.) 1272 printf("G4VisManager::EndOfEvent 2\n"); 1266 1273 if (currentRun) { 1274 printf("G4VisManager::EndOfEvent currentRun?\n"); 1267 1275 nEventsToBeProcessed = currentRun->GetNumberOfEventToBeProcessed(); 1268 1276 eventID = currentEvent->GetEventID(); … … 1271 1279 if (events) nKeptEvents = events->size(); 1272 1280 } 1273 1281 1274 1282 if (fpScene->GetRefreshAtEndOfEvent()) { 1283 printf("G4VisManager::EndOfEvent GetRefreshAtEndOfEvent()\n"); 1275 1284 1276 1285 // Unless last event (in which case wait end of run)... 1277 1286 if (eventID < nEventsToBeProcessed - 1) { 1287 printf("G4VisManager::EndOfEvent 3 \n"); 1278 1288 fpViewer->ShowView(); 1279 1289 fpSceneHandler->SetMarkForClearingTransientStore(true); 1280 1290 } else { // Last event... 1291 printf("G4VisManager::EndOfEvent 4 \n"); 1281 1292 // Keep, but only if user has not kept any... 1282 1293 if (!nKeptEvents) { … … 1287 1298 1288 1299 } else { // Accumulating events... 1300 printf("G4VisManager::EndOfEvent NOT GetRefreshAtEndOfEvent()\n"); 1289 1301 1290 1302 G4int maxNumberOfKeptEvents = fpScene->GetMaxNumberOfKeptEvents(); 1291 1303 if (maxNumberOfKeptEvents > 0 && nKeptEvents >= maxNumberOfKeptEvents) { 1304 printf("G4VisManager::EndOfEvent 5 \n"); 1292 1305 fEventKeepingSuspended = true; 1293 1306 static G4bool warned = false; 1294 1307 if (!warned) { 1308 printf("G4VisManager::EndOfEvent 6 \n"); 1295 1309 if (fVerbosity >= warnings) { 1310 printf("G4VisManager::EndOfEvent 7 \n"); 1296 1311 G4cout << 1297 1312 "WARNING: G4VisManager::EndOfEvent: Event keeping suspended." … … 1303 1318 } 1304 1319 } else if (maxNumberOfKeptEvents != 0) { 1320 printf("G4VisManager::EndOfEvent 8 \n"); 1305 1321 eventManager->KeepTheCurrentEvent(); 1306 1322 } 1307 1323 } 1324 printf("G4VisManager::EndOfEvent 9 \n"); 1308 1325 } 1309 1326 … … 1311 1328 { 1312 1329 //G4cout << "G4VisManager::EndOfRun" << G4endl; 1313 1330 printf("G4VisManager::EndOfRun 1\n"); 1314 1331 // Don't call IsValidView unless there is a scene handler. This 1315 1332 // avoids WARNING message at end of event and run when the user has 1316 1333 // not instantiated a scene handler, e.g., in batch mode. 1317 1334 G4bool valid = GetConcreteInstance() && fpSceneHandler && IsValidView(); 1335 printf("G4VisManager::EndOfRun 2\n"); 1318 1336 if (valid) { 1337 printf("G4VisManager::EndOfRun 3\n"); 1319 1338 if (!fpSceneHandler->GetMarkForClearingTransientStore()) { 1339 printf("G4VisManager::EndOfRun 4\n"); 1320 1340 if (fpScene->GetRefreshAtEndOfRun()) { 1341 printf("G4VisManager::EndOfRun 5\n"); 1321 1342 fpViewer->ShowView(); 1343 printf("G4VisManager::EndOfRun 6\n"); 1322 1344 fpSceneHandler->SetMarkForClearingTransientStore(true); 1323 } 1324 } 1325 1345 printf("G4VisManager::EndOfRun 7\n"); 1346 } 1347 } 1348 1349 printf("G4VisManager::EndOfRun 8\n"); 1326 1350 if (fEventKeepingSuspended && fVerbosity >= warnings) { 1327 1351 G4cout << … … 1337 1361 fEventRefreshing = false; 1338 1362 1363 printf("++++++++++++++++++++++++++++++++++++++++++++++++++++++++\n"); 1339 1364 G4RunManager* runManager = G4RunManager::GetRunManager(); 1340 1365 const G4Run* currentRun = runManager->GetCurrentRun(); -
trunk/source/visualization/management/src/G4VisStateDependent.cc
r954 r1038 37 37 38 38 G4bool G4VisStateDependent::Notify (G4ApplicationState requestedState) { 39 #ifdef G4DEBUG_VIS_MANAGEMENT 40 printf("G4VisStateDependent::Notify vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv\n"); 41 #endif 39 42 G4StateManager* stateManager = G4StateManager::GetStateManager(); 40 43 G4ApplicationState previousState = stateManager->GetPreviousState(); 41 44 if (previousState == G4State_Idle && requestedState == G4State_GeomClosed) { 45 #ifdef G4DEBUG_VIS_MANAGEMENT 46 printf("G4VisStateDependent::Notify BeginOfRun \n"); 47 #endif 42 48 fpVisManager -> BeginOfRun (); 43 49 } 44 50 else if (previousState == G4State_GeomClosed && requestedState == G4State_EventProc) { 51 #ifdef G4DEBUG_VIS_MANAGEMENT 52 printf("G4VisStateDependent::Notify BeginOfEvent \n"); 53 #endif 45 54 fpVisManager -> BeginOfEvent (); 46 55 } 47 56 else if (previousState == G4State_EventProc && requestedState == G4State_GeomClosed) { 57 #ifdef G4DEBUG_VIS_MANAGEMENT 58 printf("G4VisStateDependent::Notify EndOfEvent \n"); 59 #endif 48 60 fpVisManager -> EndOfEvent (); 49 61 } 50 62 else if (previousState == G4State_GeomClosed && requestedState == G4State_Idle) { 63 #ifdef G4DEBUG_VIS_MANAGEMENT 64 printf("G4VisStateDependent::Notify EndOfRun -----------------------------------------------------------------------------\n"); 65 #endif 51 66 fpVisManager -> EndOfRun (); 67 #ifdef G4DEBUG_VIS_MANAGEMENT 68 printf("G4VisStateDependent::Notify EndOfRun -----------------------------------------XXXXXXXXXXXXXXXXXXXX-----------------\n"); 69 #endif 52 70 } 71 #ifdef G4DEBUG_VIS_MANAGEMENT 72 printf("G4VisStateDependent::Notify G4VisStateDependent::Notify END ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n"); 73 #endif 53 74 return true; 54 75 } -
trunk/source/visualization/modeling/src/G4LogicalVolumeModel.cc
r954 r1038 96 96 // Add Voxels. 97 97 G4DrawVoxels dv; 98 99 // FIXME : LG 1 May 2009 : return a pointer...should be destroy by the compiler 98 100 G4PlacedPolyhedronList* pPPL = 99 101 dv.CreatePlacedPolyhedra (fpTopPV -> GetLogicalVolume ()); … … 102 104 const G4Polyhedron& polyhedron = (*pPPL)[i].GetPolyhedron (); 103 105 sceneHandler.BeginPrimitives (transform); 104 sceneHandler.AddPrimitive (polyhedron); 106 printf("G4LogicalVolumeModel::DescribeYourselfTo BEFORE ADD %d\n",fpTopPV -> GetLogicalVolume ()); 107 if (&polyhedron) { 108 printf("G4LogicalVolumeModel::DescribeYourselfTo poly FAILED\n"); 109 } else { 110 printf("G4LogicalVolumeModel::DescribeYourselfTo poly OK\n"); 111 } 112 sceneHandler.AddPrimitive (polyhedron); 113 printf("G4LogicalVolumeModel::DescribeYourselfTo AFTER ADD\n"); 105 114 sceneHandler.EndPrimitives (); 106 115 } -
trunk/source/visualization/modeling/src/G4PhysicalVolumeModel.cc
r954 r1038 761 761 } 762 762 values->push_back(G4AttValue("PVPath", oss.str(),"")); 763 if (fpCurrentLV) { 764 printf("G4PhysicalVolumeModel::CreateCurrentAttValues OK\n"); 765 } else { 766 printf("G4PhysicalVolumeModel::CreateCurrentAttValues Failed\n"); 767 } 763 768 values->push_back(G4AttValue("LVol", fpCurrentLV->GetName(),"")); 764 769 G4VSolid* pSol = fpCurrentLV->GetSolid(); -
trunk/source/visualization/test/test19.g4m
r834 r1038 41 41 #/vis/sceneHandler/create OGLSXm 42 42 #/vis/sceneHandler/create OGLIX 43 /vis/sceneHandler/create OGLS X43 /vis/sceneHandler/create OGLSQt 44 44 #/vis/sceneHandler/create VRML1 45 45 #/vis/sceneHandler/create VRML1FILE … … 106 106 /vis/scene/create 107 107 /vis/scene/add/logicalVolume expHall_L 108 /vis/sceneHandler/create OGLS Xm108 /vis/sceneHandler/create OGLSQt 109 109 /vis/viewer/create 110 110 /vis/viewer/set/viewpointThetaPhi 35 35 … … 115 115 /vis/scene/create 116 116 /vis/scene/add/logicalVolume intersection_L 117 /vis/sceneHandler/create OGLS Xm117 /vis/sceneHandler/create OGLSQt 118 118 /vis/viewer/create 119 119 /vis/viewer/reset … … 143 143 /vis/scene/add/trajectories 5000 144 144 #/vis/sceneHandler/create OGLSX 145 /vis/sceneHandler/create OGLS Xm145 /vis/sceneHandler/create OGLSQt 146 146 /vis/viewer/create 147 147 /vis/viewer/reset
Note: See TracChangeset
for help on using the changeset viewer.