Changeset 891 for trunk

Timestamp:

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

Author:

garnier

Message:

pre-tag revision and some improvments

Location:

trunk/source/visualization

Files:

• History (modified) (2 diffs)
• OpenGL/src/G4OpenGLQtViewer.cc (modified) (1 diff)
• OpenGL/src/G4OpenGLXViewer.cc (modified) (1 diff)
• OpenGL/src/G4OpenGLXmViewer.cc (modified) (1 diff)
• management/include/G4VisCommandsViewer.hh (modified) (1 diff)
• management/src/G4VisCommandsViewer.cc (modified) (5 diffs)

trunk/source/visualization/History

@@ -1 @@
-$Id: History,v 1.423 2008/04/30 10:09:46 allison Exp $
+$Id: History,v 1.424 2008/11/21 22:03:51 perl Exp $
 -------------------------------------------------------------------
 
@@ -24 +24 @@
 History file for visualization category
 ---------------------------------------
+
+21st November 2008  Joseph Perl  (vis-V09-01-06)
+- visman-V09-01-05: Trap recursive use of /vis/reviewKeptEvents.
+- modeling-V09-01-01: Improve message.
+- opengl-V09-01-03: Many changes to add Qt support.
 
 30th April 2008  John Allison  (vis-V09-01-05)

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;

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

@@ -138 +138 @@
   G4VisCommandViewerCreate (const G4VisCommandViewerCreate&);
   G4VisCommandViewerCreate& operator = (const G4VisCommandViewerCreate&);
+  int ParseGeometry ( const char *string, int *x, int *y, unsigned int *width, unsigned int *height);
+  int ReadInteger(char *string, char **NextString);
   G4String NextName ();
   G4UIcommand* fpCommand;
   G4int fId;
+  int NoValue;
+  int XValue;
+  int YValue;
+  int WidthValue;
+  int HeightValue;
+  int AllValues;
+  int XNegative;
+  int YNegative;
 };
 

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

@@ -488 +488 @@
 ////////////// /vis/viewer/create ///////////////////////////////////////
 
-G4VisCommandViewerCreate::G4VisCommandViewerCreate (): fId (0) {
+G4VisCommandViewerCreate::G4VisCommandViewerCreate ():
+  fId (0),
+  NoValue(0x0000),
+  XValue(0x0001),
+  YValue(0x0002),
+  WidthValue(0x0004),
+  HeightValue(0x0008),
+  AllValues(0x000F),
+  XNegative(0x0010),
+  YNegative(0x0020) {
   G4bool omitable;
   fpCommand = new G4UIcommand ("/vis/viewer/create", this);
@@ -636 +645 @@
   }
 
+
   // Parse windowSizeHintString to extract first field for backwards
   // compatibility...
@@ -641 +651 @@
   G4int windowSizeHint;
   size_t i;
+#ifdef G4DEBUG
+    printf("G4VisCommandViewerCreate::SetNewValue string\n");
+#endif
   for (i = 0; i < windowSizeHintString.size(); ++i) {
     char c = windowSizeHintString[i];
+#ifdef G4DEBUG
+    printf("%c",c);
+#endif
     if (c == 'x' || c == 'X' || c == '+' || c == '-') break;
   }
+#ifdef G4DEBUG
+    printf("\n");
+#endif
   if (i != windowSizeHintString.size()) {
     // x or X or + or - found - must be a X-Window-type geometry string...
@@ -671 +690 @@
   // manager in the G4VViewer constructor.  They have to be held by
   // the vis manager until the viewer is contructed - next line...
+
+  ////////
+
+  int x,y = 0;
+  unsigned int w,h = 9999999;
+
+  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 );
+
+#ifdef G4DEBUG
+  printf  ("Lecture X:%d Y:%d W:%d H:%d\n",x,y,w,h);
+  ////////
+#endif
 
   // Create viewer.
@@ -1518 +1572 @@
   SetViewParameters(currentViewer, vp);
 }
+
+/* Keep from :
+ * ftp://ftp.trolltech.com/qt/source/qt-embedded-free-3.0.6.tar.gz/qt-embedded-free-3.0.6/src/kernel/qapplication_qws.cpp
+ *
+ *    ParseGeometry parses strings of the form
+ *   "=<width>x<height>{+-}<xoffset>{+-}<yoffset>", where
+ *   width, height, xoffset, and yoffset are unsigned integers.
+ *   Example:  "=80x24+300-49"
+ *   The equal sign is optional.
+ *   It returns a bitmask that indicates which of the four values
+ *   were actually found in the string. For each value found,
+ *   the corresponding argument is updated;  for each value
+ *   not found, the corresponding argument is left unchanged.
+ */
+
+
+int G4VisCommandViewerCreate::ParseGeometry (
+ const char *string,
+ int *x,
+ int *y,
+ unsigned int *width,
+ unsigned int *height)
+{
+
+  int mask = NoValue;
+  register char *strind;
+  unsigned int tempWidth, tempHeight;
+  int tempX, tempY;
+  char *nextCharacter;
+  if ( (string == NULL) || (*string == '\0')) {
+    return(mask);
+  }
+  if (*string == '=')
+    string++;  /* ignore possible '=' at beg of geometry spec */
+  strind = (char *)string;
+  if (*strind != '+' && *strind != '-' && *strind != 'x') {
+    tempWidth = ReadInteger(strind, &nextCharacter);
+    if (strind == nextCharacter)
+      return (0);
+    strind = nextCharacter;
+    mask |= WidthValue;
+  }
+  if (*strind == 'x' || *strind == 'X') {
+    strind++;
+    tempHeight = ReadInteger(strind, &nextCharacter);
+    if (strind == nextCharacter)
+      return (0);
+    strind = nextCharacter;
+    mask |= HeightValue;
+  }
+
+  if ((*strind == '+') || (*strind == '-')) {
+    if (*strind == '-') {
+      strind++;
+      tempX = -ReadInteger(strind, &nextCharacter);
+      if (strind == nextCharacter)
+        return (0);
+      strind = nextCharacter;
+      mask |= XNegative;
+
+    }
+    else
+      { strind++;
+        tempX = ReadInteger(strind, &nextCharacter);
+        if (strind == nextCharacter)
+          return(0);
+        strind = nextCharacter;
+      }
+    mask |= XValue;
+    if ((*strind == '+') || (*strind == '-')) {
+      if (*strind == '-') {
+        strind++;
+        tempY = -ReadInteger(strind, &nextCharacter);
+        if (strind == nextCharacter)
+          return(0);
+        strind = nextCharacter;
+        mask |= YNegative;
+      }
+      else
+        {
+          strind++;
+          tempY = ReadInteger(strind, &nextCharacter);
+          if (strind == nextCharacter)
+            return(0);
+          strind = nextCharacter;
+        }
+      mask |= YValue;
+    }
+  }
+  /* If strind isn't at the end of the string the it's an invalid
+     geometry specification. */
+  if (*strind != '\0') return (0);
+  if (mask & XValue)
+    *x = tempX;
+  if (mask & YValue)
+    *y = tempY;
+  if (mask & WidthValue)
+    *width = tempWidth;
+  if (mask & HeightValue)
+    *height = tempHeight;
+  return (mask);
+}
+
+/* Keep from :
+ * ftp://ftp.trolltech.com/qt/source/qt-embedded-free-3.0.6.tar.gz/qt-embedded-free-3.0.6/src/kernel/qapplication_qws.cpp
+ *
+ */
+int G4VisCommandViewerCreate::ReadInteger(char *string, char **NextString)
+{
+    register int Result = 0;
+    int Sign = 1;
+
+    if (*string == '+')
+        string++;
+    else if (*string == '-')
+    {
+        string++;
+        Sign = -1;
+    }
+    for (; (*string >= '0') && (*string <= '9'); string++)
+    {
+        Result = (Result * 10) + (*string - '0');
+    }
+    *NextString = string;
+    if (Sign >= 0)
+        return (Result);
+    else
+        return (-Result);
+}