Changeset 891 for trunk/source/visualization/OpenGL

Timestamp:

Nov 25, 2008, 5:28:38 PM (17 years ago)

Author:

garnier

Message:

pre-tag revision and some improvments

Location:

trunk/source/visualization/OpenGL/src

Files:

• G4OpenGLQtViewer.cc (modified) (1 diff)
• G4OpenGLXViewer.cc (modified) (1 diff)
• G4OpenGLXmViewer.cc (modified) (1 diff)

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

@@ -1032 +1032 @@
 void G4OpenGLQtViewer::toggleDrawingAction(int aAction) {
 
-  G4ViewParameters::DrawingStyle d_style;
+  G4ViewParameters::DrawingStyle d_style = G4ViewParameters::wireframe;
   
 

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

@@ -218 +218 @@
   y_origin = 0;
   size_hints = XAllocSizeHints();
-  const G4String& XGeometryString = fVP.GetXGeometryString();
-  int screen_num = DefaultScreen(dpy);
-  if (!XGeometryString.empty()) {
-    G4int geometryResultMask = XParseGeometry
-      ((char*)XGeometryString.c_str(),
-       &x_origin, &y_origin, &width, &height);
-    if (geometryResultMask & (WidthValue | HeightValue)) {
-      if (geometryResultMask & XValue) {
-        if (geometryResultMask & XNegative) {
-          x_origin = DisplayWidth(dpy, screen_num) + x_origin - width;
-        }
-        size_hints->flags |= PPosition;
-        size_hints->x = x_origin;
-      }
-      if (geometryResultMask & YValue) {
-        if (geometryResultMask & YNegative) {
-          y_origin = DisplayHeight(dpy, screen_num) + y_origin - height;
-        }
-        size_hints->flags |= PPosition;
-        size_hints->y = y_origin;
-      }
-    } else {
-      G4cout << "ERROR: Geometry string \""
-             << XGeometryString
-             << "\" invalid.  Using \"600x600\"."
-             << G4endl;
-      width = 600;
-      height = 600;
-    }
-  }
-  size_hints->width = width;
-  size_hints->height = height;
+
+  // already done in G4VViewer at creation
+
+//   const G4String& XGeometryString = fVP.GetXGeometryString();
+//   int screen_num = DefaultScreen(dpy);
+//   if (!XGeometryString.empty()) {
+//     G4int geometryResultMask = XParseGeometry
+//       ((char*)XGeometryString.c_str(),
+//        &x_origin, &y_origin, &width, &height);
+//     if (geometryResultMask & (WidthValue | HeightValue)) {
+//       if (geometryResultMask & XValue) {
+//      if (geometryResultMask & XNegative) {
+//        x_origin = DisplayWidth(dpy, screen_num) + x_origin - width;
+//      }
+//      size_hints->flags |= PPosition;
+//      size_hints->x = x_origin;
+//       }
+//       if (geometryResultMask & YValue) {
+//      if (geometryResultMask & YNegative) {
+//        y_origin = DisplayHeight(dpy, screen_num) + y_origin - height;
+//      }
+//      size_hints->flags |= PPosition;
+//      size_hints->y = y_origin;
+//       }
+//     } else {
+//       G4cout << "ERROR: Geometry string \""
+//           << XGeometryString
+//           << "\" invalid.  Using \"600x600\"."
+//           << G4endl;
+//       width = 600;
+//       height = 600;
+//     }
+//   }
+//  size_hints->width = width;
+//  size_hints->height = height;
+
+#ifdef G4DEBUG
+  printf("CreateWindow Size:%d=%d - %d=%d \n",width,fVP.GetWindowSizeHintX(),height, fVP.GetWindowSizeHintY());
+#endif
+
+  size_hints->width = fVP.GetWindowSizeHintX();
+  size_hints->height = fVP.GetWindowSizeHintY();
   size_hints->flags |= PSize;
 

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

@@ -596 +596 @@
   Dimension width, height;
   XtVaGetValues (glxarea,XmNwidth,&width,XmNheight,&height,NULL);
+#ifdef G4DEBUG
+  printf("CreateWindow Size:%d - %d \n",width,height);
+#endif
   WinSize_x = (G4int) width;
   WinSize_y = (G4int) height;