Changeset 898 for trunk/source/visualization

Timestamp:

Dec 5, 2008, 2:48:29 PM (16 years ago)

Author:

garnier

Message:

x,y position should be ok

Location:

trunk/source/visualization/OpenGL

Files:

• History (modified) (1 diff)
• src/G4OpenGLQtViewer.cc (modified) (2 diffs)
• src/G4OpenGLWin32Viewer.cc (modified) (1 diff)
• src/G4OpenGLXViewer.cc (modified) (1 diff)
• src/G4OpenGLXmViewer.cc (modified) (2 diffs)

trunk/source/visualization/OpenGL/History

@@ -30 +30 @@
 
  - G4OpenGLQtViewer.hh : Suppress WinSize private variable
+ - Now Could pass XString like 400x600-0+0 to viewers and set position and location. It
+   will work for Qt, X, Win32 for the moment.
 
 24 October, Laurent Garnier

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

@@ -55 +55 @@
 #include <qprocess.h>
 #include <qapplication.h>
+#include <qdesktopwidget.h>
 
 #if QT_VERSION >= 0x040000
@@ -186 +187 @@
   GLWindow->setWindowTitle( name);
 #endif
-  GLWindow->resize(fVP.GetWindowSizeHintX(), fVP.GetWindowSizeHintY());
-  GLWindow->move(900,300);
+  fWinSize_x = fVP.GetWindowSizeHintX();
+  fWinSize_y = fVP.GetWindowSizeHintY();
+
+  //useful for MACOSX, we have to compt the menuBar height
+  unsigned int offset = QApplication::desktop()->height() 
+                      - QApplication::desktop()->availableGeometry().height();
+
+  G4int YPos= fVP.GetWindowAbsoluteLocationHintY(QApplication::desktop()->height());
+  if (fVP.GetWindowAbsoluteLocationHintY(QApplication::desktop()->height())< offset) {
+    YPos = offset;
+  }
+  GLWindow->resize(fWinSize_x, fWinSize_y);
+  GLWindow->move(fVP.GetWindowAbsoluteLocationHintX(QApplication::desktop()->width()),YPos);
   GLWindow->show();
   
-  // delete the pointer if close this
-  //  GLWindow->setAttribute(Qt::WA_DeleteOnClose);
-
-#if QT_VERSION >= 0x040000
-//   QObject ::connect(GLWindow, 
-//                     SIGNAL(rejected()),
-//                     this, 
-//                     SLOT(dialogClosed()));
-#endif
-
   if(!fWindow) return;
 #ifdef G4DEBUG

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

@@ -117 +117 @@
   }  
   
+  fWinSize_x = fVP.GetWindowSizeHintX();
+  fWinSize_y = fVP.GetWindowSizeHintY();
+  int x_res=GetSystemMetrics(SM_CXSCREEN);
+  int y_res=GetSystemMetrics(SM_CYSCREEN);
+  
+  //FIXME : NOT tested !
   fWindow = ::CreateWindow(className,fName.c_str(), 
                            WS_OVERLAPPEDWINDOW,
                            //WS_CHILD | WS_VISIBLE,
-                           0,0,
+                           //                      0,0,
+                           fVP.GetWindowAbsoluteLocationHintX(x_res),
+                           fVP.GetWindowAbsoluteLocationHintY(y_res),
                            fWinSize_x,fWinSize_y,
                            NULL, NULL, 

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

@@ -214 +214 @@
 
   // Window size and position...
-  G4int x_origin = 0;
-  G4int y_origin = 0;
   size_hints = XAllocSizeHints();
-
-  Window root_return;
-  int x_return, y_return;
-  unsigned int width_return, height_return;
-  unsigned int border_width_return;
-  unsigned int depth_return;
-  
-  // get the parent window's geometry
-  XGetGeometry(dpy, XRootWindow (dpy, vi -> screen), &root_return, &x_return, &y_return,
-               &width_return, &height_return, &border_width_return,
-               &depth_return);
-  
+    
   fWinSize_x = fVP.GetWindowSizeHintX();
   fWinSize_y = fVP.GetWindowSizeHintY();
-  x_origin = fVP.GetWindowAbsoluteLocationHintX(width_return);
-  y_origin = fVP.GetWindowAbsoluteLocationHintY(height_return);
+  G4int x_origin = fVP.GetWindowAbsoluteLocationHintX(DisplayWidth(dpy, vi -> screen));
+  G4int y_origin = fVP.GetWindowAbsoluteLocationHintY(DisplayHeight(dpy, vi -> screen));
+
   size_hints->base_width = fWinSize_x;
   size_hints->base_height = fWinSize_y;

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

@@ -126 +126 @@
   borcol = XBlackPixelOfScreen (XtScreen(shell));
   
+  fWinSize_x = fVP.GetWindowSizeHintX();
+  fWinSize_y = fVP.GetWindowSizeHintY();
+  G4int x_origin = fVP.GetWindowAbsoluteLocationHintX(DisplayWidth(dpy, vi -> screen));
+  G4int y_origin = fVP.GetWindowAbsoluteLocationHintY(DisplayHeight(dpy, vi -> screen));
+
   XtVaSetValues (shell, 
                  XtNvisual, vi -> visual, 
-                 XtNdepth, vi -> depth, 
+                 XtNdepth, vi -> depth,
                  XtNcolormap, cmap, 
+                 XtNwidth, fWinSize_x,
+                 XtNheight, fWinSize_y,
+                 XtNx, x_origin,
+                 XtNy, y_origin,
                  XtNborderColor, &borcol,
                  XtNbackground, &bgnd,
@@ -593 +602 @@
   // Once widget is realized (ie, associated with a created X window), we
   // can bind the OpenGL rendering context to the window.
-
-  Dimension width, height;
-  XtVaGetValues (glxarea,XmNwidth,&width,XmNheight,&height,NULL);
-  fWinSize_x = (unsigned int) width;
-  fWinSize_y = (unsigned int) height;
 
   win = XtWindow (glxarea);