Changeset 1196 for trunk/source/visualization/OpenGL/src
- Timestamp:
- Nov 25, 2009, 5:13:58 PM (15 years ago)
- Location:
- trunk/source/visualization/OpenGL/src
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/source/visualization/OpenGL/src/G4OpenGLImmediateQtViewer.cc
r1172 r1196 60 60 G4OpenGLImmediateQtViewer::~G4OpenGLImmediateQtViewer() { 61 61 makeCurrent(); 62 GetSceneHandler()->RemoveViewerFromList(this);63 62 } 64 63 -
trunk/source/visualization/OpenGL/src/G4OpenGLSceneHandler.cc
r1160 r1196 198 198 void G4OpenGLSceneHandler::AddPrimitive (const G4Polymarker& polymarker) 199 199 { 200 #ifdef G4DEBUG_VIS_OGL 201 printf("G4OpenGLSceneHandler::AddPrimitive polymarker"); 202 #endif 200 203 G4int nPoints = polymarker.size (); 201 204 if (nPoints <= 0) return; … … 214 217 case G4Polymarker::dots: 215 218 { 219 #ifdef G4DEBUG_VIS_OGL 220 printf(" dots "); 221 #endif 216 222 for (size_t iPoint = 0; iPoint < polymarker.size (); iPoint++) { 217 223 G4Circle dot (polymarker); … … 225 231 case G4Polymarker::circles: 226 232 { 233 #ifdef G4DEBUG_VIS_OGL 234 printf(" circle "); 235 #endif 227 236 for (size_t iPoint = 0; iPoint < polymarker.size (); iPoint++) { 228 237 G4Circle circle (polymarker); … … 234 243 case G4Polymarker::squares: 235 244 { 245 #ifdef G4DEBUG_VIS_OGL 246 printf(" square "); 247 #endif 236 248 for (size_t iPoint = 0; iPoint < polymarker.size (); iPoint++) { 237 249 G4Square square (polymarker); … … 243 255 } 244 256 257 #ifdef G4DEBUG_VIS_OGL 258 printf(" \n"); 259 #endif 245 260 fProcessingPolymarker = false; 246 261 } … … 319 334 // Note: colour treated in sub-class. 320 335 321 if (fpViewer -> GetViewParameters ().IsMarkerNotHidden ()) 336 if (fpViewer -> GetViewParameters ().IsMarkerNotHidden ()) { 337 #ifdef G4DEBUG_VIS_OGL 338 printf("+"); 339 #endif 322 340 glDisable (GL_DEPTH_TEST); 323 else {glEnable (GL_DEPTH_TEST); glDepthFunc (GL_LESS);} 341 } else { 342 #ifdef G4DEBUG_VIS_OGL 343 printf("-"); 344 #endif 345 glEnable (GL_DEPTH_TEST); glDepthFunc (GL_LESS);} 324 346 325 347 glDisable (GL_LIGHTING); … … 365 387 MarkerSizeType sizeType; 366 388 G4double size = GetMarkerSize(marker, sizeType); 389 367 390 368 391 // Draw... -
trunk/source/visualization/OpenGL/src/G4OpenGLStoredQtViewer.cc
r1172 r1196 63 63 // when close event. 64 64 // ((QDialog*)window())->reject(); 65 GetSceneHandler()->RemoveViewerFromList(this);66 65 } 67 66 -
trunk/source/visualization/OpenGL/src/G4OpenGLStoredXViewer.cc
r975 r1196 57 57 } 58 58 59 G4OpenGLStoredXViewer::~G4OpenGLStoredXViewer () {} 59 G4OpenGLStoredXViewer::~G4OpenGLStoredXViewer () { 60 #ifdef G4DEBUG_VIS_OGL 61 printf("G4OpenGLStoredXViewer::~G4OpenGLStoredXViewer DELETE\n"); 62 #endif 63 // GetSceneHandler()->RemoveViewerFromList(this); 64 } 60 65 61 66 void G4OpenGLStoredXViewer::Initialise () { -
trunk/source/visualization/OpenGL/src/G4OpenGLStoredXmViewer.cc
r1125 r1196 58 58 } 59 59 60 G4OpenGLStoredXmViewer::~G4OpenGLStoredXmViewer () {} 60 G4OpenGLStoredXmViewer::~G4OpenGLStoredXmViewer () { 61 GetSceneHandler()->RemoveViewerFromList(this); 62 } 61 63 62 64 void G4OpenGLStoredXmViewer::Initialise () { -
trunk/source/visualization/OpenGL/src/G4OpenGLViewer.cc
r1160 r1196 103 103 } 104 104 105 G4OpenGLViewer::~G4OpenGLViewer () {} 105 G4OpenGLViewer::~G4OpenGLViewer () { 106 #ifdef G4DEBUG_VIS_OGL 107 printf("G4OpenGLViewer::~G4OpenGLViewer DELETING \n"); 108 #endif 109 } 106 110 107 111 void G4OpenGLViewer::InitializeGLView () … … 640 644 fGL2PSAction->setLineWidth(1); 641 645 // By default, we choose the point size (markers...) 642 fGL2PSAction->setPointSize(2); 643 646 647 #ifdef G4DEBUG_VIS_OGL 648 // printf("G4OpenGLViewer::printGl2PS marker size:%f\n", GetSceneHandler()->GetMarkerSize()); 649 #endif 650 #ifdef G4DEBUG_VIS_OGL 651 // printf("G4OpenGLViewer::printGl2PS marker2 size:%f\n",fpViewer -> GetViewParameters ()->GetDefaultMarker ().GetScreenSize()); 652 #endif 653 // if (fpViewer -> GetViewParameters ().IsMarkerNotHidden ()) { 654 // fGL2PSAction->setPointSize(fpViewer -> GetViewParameters ()->GetDefaultMarker ().GetScreenSize()); 655 // } else { 656 fGL2PSAction->setPointSize(2); 657 // } 644 658 DrawView (); 645 659 fGL2PSAction->disableFileWriting();
Note: See TracChangeset
for help on using the changeset viewer.