Changeset 893 for trunk/source/visualization/management/src/G4VisCommandsViewer.cc

Timestamp:

Nov 27, 2008, 4:56:05 PM (15 years ago)

Author:

garnier

Message:

make 3.80 added because 3.81 is bad

File:

• trunk/source/visualization/management/src/G4VisCommandsViewer.cc (modified) (2 diffs)

trunk/source/visualization/management/src/G4VisCommandsViewer.cc

@@ -685 +685 @@
     windowSizeHintString = ossw.str();
   }
-  fpVisManager->SetWindowSizeHint (windowSizeHint, windowSizeHint);
-  fpVisManager->SetXGeometryString(windowSizeHintString);
   // WindowSizeHint and XGeometryString are picked up from the vis
   // manager in the G4VViewer constructor.  They have to be held by
@@ -694 +692 @@
 
   int x,y = 0;
-  unsigned int w,h = 9999999;
+  unsigned int w,h = 0;
 
   int m = ParseGeometry( windowSizeHintString, &x, &y, &w, &h );
   //  QSize minSize = main_widget->minimumSize();
   //  QSize maxSize = main_widget->maximumSize();
-  if ( (m & XValue) == 0 )
-    x = -1;
-  if ( (m & YValue) == 0 )
-    y = -2;
-  if ( (m & WidthValue) == 0 )
-    w = -3;
-  if ( (m & HeightValue) == 0 )
-    h = -4;
-//   w = QMIN(w,maxSize.width());
-//   h = QMIN(h,maxSize.height());
-//   w = QMAX(w,minSize.width());
-//   h = QMAX(h,minSize.height());
-//   if ( (m & XNegative) ) {
-//     x = desktop()->width()  + x - w;
-//     qt_widget_tlw_gravity = 3;
-//   }
-//   if ( (m & YNegative) ) {
-//              y = desktop()->height() + y - h;
-//              qt_widget_tlw_gravity = (m & XNegative) ? 9 : 7;
-//   }
-//   main_widget->setGeometry( x, y, w, h );
+  if ( ((m & YValue) == 0) ||
+       ((m & XValue) == 0) ||
+       ((m & HeightValue) == 0 ) ||
+       ((m & WidthValue)  == 0 )) {
+    if (verbosity >= G4VisManager::errors) {
+      G4cout << "ERROR: Unrecognised geometry string \""
+             << windowSizeHintString
+             << "\".  Using 100 for X and Y location."
+             << "\".  Using 600 for Width and Height."
+             << G4endl;
+    }
+    x = 100;
+    y = 100;
+    w = 600;
+    h = 600;
+  }
 
 #ifdef G4DEBUG
   printf  ("Lecture X:%d Y:%d W:%d H:%d\n",x,y,w,h);
-  ////////
 #endif
+
 
   // Create viewer.
   fpVisManager -> CreateViewer (newName);
+
+  // set parameters AFTER
+  fpVisManager->SetWindowSizeHint (w,h);
+  fpVisManager->SetWindowLocationHint (x,y);
+  fpVisManager->SetXGeometryString(windowSizeHintString);
   G4VViewer* newViewer = fpVisManager -> GetCurrentViewer ();
   if (newViewer && newViewer -> GetName () == newName) {