Changeset 858 for trunk/source

Timestamp:

Oct 2, 2008, 10:29:48 AM (16 years ago)

Author:

garnier

Message:

protection against no scene + Qapp could be now get on external app

Location:

trunk/source

Files:

• interfaces/basic/src/G4UIQt.cc (modified) (2 diffs)
• visualization/OpenGL/src/G4OpenGLQtViewer.cc (modified) (3 diffs)
• visualization/OpenGL/src/G4OpenGLStoredQt.cc (modified) (1 diff)
• visualization/OpenGL/src/G4OpenGLStoredQtViewer.cc (modified) (2 diffs)
• visualization/OpenGL/src/G4OpenGLViewer.cc (modified) (1 diff)

trunk/source/interfaces/basic/src/G4UIQt.cc

@@ -30 +30 @@
 // L. Garnier
 
-//define GEANT4_QT_DEBUG
+//#define GEANT4_QT_DEBUG
 
 #ifdef G4UI_BUILD_QT_SESSION
@@ -113 +113 @@
   if(UI!=NULL) UI->SetSession(this);
 
+  // Check if already define in external app QMainWindow
+  bool found = false;
+#if QT_VERSION < 0x040000
+  // theses lines does nothing exept this one "GLWindow = new QDialog(0..."
+  // but if I comment them, it doesn't work...
+  QWidgetList  *list = QApplication::allWidgets();
+  QWidgetListIt it( *list );         // iterate over the widgets
+  QWidget * widget;
+  while ( (widget=it.current()) != 0 ) {  // for each widget...
+    ++it;
+    if ((found== false) && (widget->inherits("QMainWindow"))) {
+      found = true;
+    }
+  }
+  delete list;                      // delete the list, not the widgets
+#else
+  foreach (QWidget *widget, QApplication::allWidgets()) {
+    if ((found== false) && (widget->inherits("QMainWindow"))) {
+      found = true;
+    }
+  }
+#endif
+
+  if (found) {
+    G4cout        << "G4UIQt : Found an external App with a QMainWindow already defined. Aborted" << G4endl;
+    return ;
+  }
   fMainWindow = new QMainWindow();
 

trunk/source/visualization/OpenGL/src/G4OpenGLQtViewer.cc

@@ -317 +317 @@
 
   // launch Qt if not
-  G4Qt* interactorManager = G4Qt::getInstance ();
+  G4Qt::getInstance ();
 
   fLastPos3 = QPoint(-1,-1);    
@@ -689 +689 @@
 #if QT_VERSION < 0x040000
 #if QT_VERSION < 0x030200
-  QAction *movieParameters =  new QAction("&Movie parameters...","&Make movie ...",CTRL+Key_M,mActions,0,true);
-#else
-  QAction *movieParameters =  new QAction("&Movie parameters...",CTRL+Key_M,mActions);
+  QAction *movieParameters =  new QAction("&Make Movie...","&Make movie ...",CTRL+Key_M,mActions,0,true);
+#else
+  QAction *movieParameters =  new QAction("&Make Movie...",CTRL+Key_M,mActions);
 #endif
   movieParameters->addTo(mActions);
@@ -1710 +1710 @@
   printf("should rescale \n");
 #endif
-  GLfloat* feedback_buffer;
-  GLint returned;
-  FILE* file;
+  //  GLfloat* feedback_buffer;
+  //  GLint returned;
+  //  FILE* file;
   
 //   feedback_buffer = new GLfloat[size];

trunk/source/visualization/OpenGL/src/G4OpenGLStoredQt.cc

@@ -62 +62 @@
 
 G4VViewer* G4OpenGLStoredQt::CreateViewer
-(G4VSceneHandler& scene, const G4String& name) {
 #ifdef GEANT4_QT_DEBUG
   printf("G4OpenGLStoredQt::CreateViewer \n");
 #endif
+(G4VSceneHandler& scene, const G4String& name) {
   G4VViewer* pView =
     new G4OpenGLStoredQtViewer

trunk/source/visualization/OpenGL/src/G4OpenGLStoredQtViewer.cc

@@ -58 +58 @@
   nbPaint =0;
   hasToRepaint =false;
+
+  // if no scene...
+  if (fSceneHandler.GetScene() == 0) {
+    G4cerr << "G4OpenGLStoredQtViewer: Creating a Viewer without a scene is not allowed. \nPlease use /vis/scene/create before /vis/open/.... "
+           << G4endl;
+    return;
+  }
   if (fViewId < 0) return;  // In case error in base class instantiation.
 }
@@ -76 +83 @@
 void G4OpenGLStoredQtViewer::Initialise() {
 #ifdef GEANT4_QT_DEBUG
-  printf("GLWidget::Initialise \n");
+  printf("G4OpenGLStoredQtViewer::Initialise 1\n");
 #endif
   readyToPaint = false;

trunk/source/visualization/OpenGL/src/G4OpenGLViewer.cc

@@ -150 +150 @@
 
 void G4OpenGLViewer::SetView () {
-  
+
+  if (!fSceneHandler.GetScene()) {
+    G4cerr << "G4OpenGLStoredQtViewer: Creating a Viewer without a scene is not allowed. \nPlease use /vis/scene/create before /vis/open/.... "
+           << G4endl;
+    return;
+  }
   // Calculates view representation based on extent of object being
   // viewed and (initial) viewpoint.  (Note: it can change later due