Changeset 912 for trunk/source/visualization/OpenGL

Timestamp:

Jan 22, 2009, 4:40:11 PM (16 years ago)

Author:

garnier

Message:

History change, and a Warning added

Location:

trunk/source/visualization/OpenGL

Files:

• History (modified) (2 diffs)
• src/G4OpenGLXViewer.cc (modified) (3 diffs)
• src/G4OpenGLXmViewer.cc (modified) (2 diffs)

trunk/source/visualization/OpenGL/History

@@ -1 @@
-$Id: History,v 1.123 2009/01/19 16:28:38 lgarnier Exp $
+$Id: History,v 1.124 2009/01/22 15:39:55 lgarnier Exp $
 -------------------------------------------------------------------
 
@@ -20 +20 @@
 History file for visualization/OpenGL
 -------------------------------------
+
+22th January 2009  Laurent Garnier
+- Fix bug in ratio and geometry on X/Xm/Qt/Win32 viewers
 
 19th January 2009  Laurent Garnier

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

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLXViewer.cc,v 1.45 2009/01/19 16:53:42 lgarnier Exp $
+// $Id: G4OpenGLXViewer.cc,v 1.47 2009/01/22 15:39:55 lgarnier Exp $
 // GEANT4 tag $Name:  $
 //
@@ -219 +219 @@
   fWinSize_y = fVP.GetWindowSizeHintY();
   G4int x_origin = fVP.GetWindowAbsoluteLocationHintX(DisplayWidth(dpy, vi -> screen));
+
+  // FIXME,  screen size != window size on MAC, but I don't know have to get the menuBar
+  // size on MAC. L.Garnier 01/2009
   G4int y_origin = fVP.GetWindowAbsoluteLocationHintY(DisplayHeight(dpy, vi -> screen));
 
@@ -225 +228 @@
   size_hints->x = x_origin;
   size_hints->y = y_origin;
-  size_hints->flags |= PSize | PPosition;
-
+  if (fVP.IsWindowSizeHintX () && fVP.IsWindowLocationHintX () && fVP.IsWindowLocationHintY ()) {
+    size_hints->flags |= PSize | PPosition;
+  } else if (fVP.IsWindowSizeHintX () && !(fVP.IsWindowLocationHintX () || fVP.IsWindowLocationHintY ())) {
+    size_hints->flags |= PSize;
+  } else if ((!fVP.IsWindowSizeHintX ()) && fVP.IsWindowLocationHintX () && fVP.IsWindowLocationHintY ()) {
+    size_hints->flags |= PPosition;
+  }
   G4cout << "Window name: " << fName << G4endl;
   strncpy (charViewName, fName, 100);

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

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLXmViewer.cc,v 1.27 2009/01/19 16:08:47 lgarnier Exp $
+// $Id: G4OpenGLXmViewer.cc,v 1.29 2009/01/22 15:39:55 lgarnier Exp $
 // GEANT4 tag $Name:  $
 //
@@ -129 +129 @@
   fWinSize_y = fVP.GetWindowSizeHintY();
   G4int x_origin = fVP.GetWindowAbsoluteLocationHintX(DisplayWidth(dpy, vi -> screen));
+
+  // FIXME,  screen size != window size on MAC, but I don't know have to get the menuBar
+  // size on MAC. L.Garnier 01/2009
   G4int y_origin = fVP.GetWindowAbsoluteLocationHintY(DisplayHeight(dpy, vi -> screen));
 
-  XtVaSetValues (shell, 
-                 XtNvisual, vi -> visual, 
-                 XtNdepth, vi -> depth,
-                 XtNcolormap, cmap, 
-                 XtNwidth, fWinSize_x,
-                 XtNheight, fWinSize_y,
-                 XtNx, x_origin,
-                 XtNy, y_origin,
-                 XtNborderColor, &borcol,
-                 XtNbackground, &bgnd,
-                 XmNtitle, fName.data(),
-                 NULL);
+  if (fVP.IsWindowSizeHintX () && fVP.IsWindowLocationHintX () && fVP.IsWindowLocationHintY ()) {
+    XtVaSetValues (shell, 
+                   XtNvisual, vi -> visual, 
+                   XtNdepth, vi -> depth,
+                   XtNcolormap, cmap, 
+                   XtNwidth, fWinSize_x,
+                   XtNheight, fWinSize_y,
+                   XtNx, x_origin,
+                   XtNy, y_origin,
+                   XtNborderColor, &borcol,
+                   XtNbackground, &bgnd,
+                   XmNtitle, fName.data(),
+                   NULL);
+  } else if (fVP.IsWindowSizeHintX () && !(fVP.IsWindowLocationHintX () || fVP.IsWindowLocationHintY ())) {
+    XtVaSetValues (shell, 
+                   XtNvisual, vi -> visual, 
+                   XtNdepth, vi -> depth,
+                   XtNcolormap, cmap, 
+                   XtNwidth, fWinSize_x,
+                   XtNheight, fWinSize_y,
+                   XtNborderColor, &borcol,
+                   XtNbackground, &bgnd,
+                   XmNtitle, fName.data(),
+                   NULL);
+  } else if ((!fVP.IsWindowSizeHintX ()) && fVP.IsWindowLocationHintX () && fVP.IsWindowLocationHintY ()) {
+    XtVaSetValues (shell, 
+                   XtNvisual, vi -> visual, 
+                   XtNdepth, vi -> depth,
+                   XtNcolormap, cmap, 
+                   XtNx, x_origin,
+                   XtNy, y_origin,
+                   XtNborderColor, &borcol,
+                   XtNbackground, &bgnd,
+                   XmNtitle, fName.data(),
+                   NULL);
+  } else {
+    XtVaSetValues (shell, 
+                   XtNvisual, vi -> visual, 
+                   XtNdepth, vi -> depth,
+                   XtNcolormap, cmap, 
+                   XtNborderColor, &borcol,
+                   XtNbackground, &bgnd,
+                   XmNtitle, fName.data(),
+                   NULL);
+  }
+
 
   main_win = XtVaCreateManagedWidget ("main_win",