Changeset 893 for trunk/source/visualization

Timestamp:

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

Author:

garnier

Message:

make 3.80 added because 3.81 is bad

Location:

trunk/source/visualization

Files:

• OpenGL/src/G4OpenGLXViewer.cc (modified) (2 diffs)
• management/include/G4ViewParameters.hh (modified) (3 diffs)
• management/include/G4ViewParameters.icc (modified) (2 diffs)
• management/include/G4VisManager.hh (modified) (3 diffs)
• management/include/G4VisManager.icc (modified) (2 diffs)
• management/src/G4VisCommandsViewer.cc (modified) (2 diffs)
• management/src/G4VisManager.cc (modified) (1 diff)

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

@@ -255 +255 @@
 
 #ifdef G4DEBUG
-  printf("CreateWindow Size:%d=%d - %d=%d \n",width,fVP.GetWindowSizeHintX(),height, fVP.GetWindowSizeHintY());
+  printf("G4OpenGLXViewer::CreateMainWindow CreateWindow Mauvais Size:W:%d X:%d H:%d Y:%d \n",width,fVP.GetWindowSizeHintX(),height, fVP.GetWindowSizeHintY());
 #endif
 
@@ -264 +264 @@
   //  G4int                             WinSize_x;
   //  G4int                             WinSize_y;
-  WinSize_x = width;
-  WinSize_y = height;
+  WinSize_x = fVP.GetWindowSizeHintX();
+  WinSize_y = fVP.GetWindowSizeHintY();
+  x_origin = fVP.GetWindowLocationHintX();
+  y_origin = fVP.GetWindowLocationHintY();
+
+#ifdef G4DEBUG
+  printf("G4OpenGLXViewer::CreateMainWindow CreateWindow Size:W:%d H:%d X:%d Y:%d \n",WinSize_x,WinSize_y,x_origin,y_origin);
+#endif
 
   G4cout << "Window name: " << fName << G4endl;

trunk/source/visualization/management/include/G4ViewParameters.hh

@@ -156 +156 @@
         G4int            GetWindowSizeHintX      () const;
         G4int            GetWindowSizeHintY      () const;
+        G4int            GetWindowLocationHintX  () const;
+        G4int            GetWindowLocationHintY  () const;
   const G4String&        GetXGeometryString      () const;
   // If non-null, can be interpreted with XParseGeometry (see man
@@ -222 +224 @@
   void SetMarkerNotHidden      ();
   void SetWindowSizeHint       (G4int xHint, G4int yHint);
+  void SetWindowLocationHint   (G4int xHint, G4int yHint);
   void SetXGeometryString      (const G4String&);
   void SetAutoRefresh          (G4bool);
@@ -270 +273 @@
   G4int        fWindowSizeHintX; // Size hints for pixel-based window systems.
   G4int        fWindowSizeHintY;
+  G4int        fWindowLocationHintX; // Location hints for pixel-based window systems.
+  G4int        fWindowLocationHintY;
   G4String     fXGeometryString; // If non-null, geometry string for X Windows.
   G4bool       fAutoRefresh;     // ...after change of view parameters.

trunk/source/visualization/management/include/G4ViewParameters.icc

@@ -170 +170 @@
 }
 
+inline G4int G4ViewParameters::GetWindowLocationHintX () const {
+#ifdef G4DEBUG
+        printf("G4ViewParameters::GetWindowLocationHintX () :: %d\n",fWindowLocationHintX);
+#endif
+  return fWindowLocationHintX;
+}
+
+inline G4int G4ViewParameters::GetWindowLocationHintY () const {
+#ifdef G4DEBUG
+        printf("G4ViewParameters::GetWindowLocationHintY () :: %d\n",fWindowLocationHintY);
+#endif
+  return fWindowLocationHintY;
+}
+
 inline const G4String& G4ViewParameters::GetXGeometryString () const {
   return fXGeometryString;
@@ -328 +342 @@
 }
 
+inline void G4ViewParameters::SetWindowLocationHint (G4int xHint, G4int yHint) {
+#ifdef G4DEBUG
+        printf("G4ViewParameters::SetWindowLocationHint () :: %d %d\n",xHint,yHint);
+#endif
+  fWindowLocationHintX = xHint;
+  fWindowLocationHintY = yHint;
+}
+
 inline void G4ViewParameters::SetXGeometryString (const G4String& geomString) {
   fXGeometryString = geomString;

trunk/source/visualization/management/include/G4VisManager.hh

@@ -355 +355 @@
   void  GetWindowSizeHint (G4int& xHint, G4int& yHint) const;
   // Note: GetWindowSizeHint information is returned via the G4int& arguments.
+  void  GetWindowLocationHint (G4int& xHint, G4int& yHint) const;
   const G4String&              GetXGeometryString          () const;
   // GetXGeometryString is intended to be parsed by XParseGeometry.
@@ -381 +382 @@
   void              SetVerboseLevel             (Verbosity);
   void              SetWindowSizeHint           (G4int xHint, G4int yHint);
+  void              SetWindowLocationHint           (G4int xHint, G4int yHint);
   void              SetXGeometryString          (const G4String&);
   void              SetEventRefreshing          (G4bool);
@@ -457 +459 @@
   G4VisStateDependent*  fpStateDependent;   // Friend state dependent class.
   G4int fWindowSizeHintX, fWindowSizeHintY; // For viewer...
+  G4int fWindowLocationHintX, fWindowLocationHintY; // For viewer...
   G4String              fXGeometryString;   // ...construction.
   G4TrajectoriesModel   dummyTrajectoriesModel;  // For passing drawing mode.

trunk/source/visualization/management/include/G4VisManager.icc

@@ -78 +78 @@
 }
 
+inline void G4VisManager::GetWindowLocationHint
+ (G4int& xHint, G4int& yHint) const {
+  xHint = fpViewer->GetViewParameters().GetWindowLocationHintX();
+  yHint = fpViewer->GetViewParameters().GetWindowLocationHintY();
+}
+
 inline const G4String& G4VisManager::GetXGeometryString () const {
   return fXGeometryString;
@@ -118 +124 @@
 }
 
+inline void G4VisManager::SetWindowLocationHint (G4int xHint, G4int yHint) {
+#ifdef G4DEBUG
+        printf("G4VisManager::SetWindowLocationHint () :: %d %d\n",xHint,yHint);
+#endif
+  G4ViewParameters vp = fpViewer->GetViewParameters();
+  vp.SetWindowLocationHint(xHint,yHint);
+  fpViewer->SetViewParameters(vp);
+}
+
 inline void G4VisManager::SetXGeometryString (const G4String& geomString) {
   fXGeometryString = geomString;

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) {

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

@@ -673 +673 @@
         fpViewer = p;                             // Make current.
         fpSceneHandler -> AddViewerToList (fpViewer);
+#ifdef G4DEBUG
+  printf("G4VisManager::CreateViewer\n");
+#endif
         fpSceneHandler -> SetCurrentViewer (fpViewer);