Changeset 539 for trunk/geant4/visualization/OpenGL/src/G4OpenGLQtViewer.cc

Timestamp:

Jul 5, 2007, 5:54:48 PM (17 years ago)

Author:

garnier

Message:

r681@mac-90108: laurentgarnier | 2007-07-05 17:58:13 +0200
mise a jour de la visu OpenGl. Ne marche pas encore

File:

• trunk/geant4/visualization/OpenGL/src/G4OpenGLQtViewer.cc (modified) (5 diffs)

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

@@ -45 +45 @@
 #include "G4Normal3D.hh"
 
+#include "G4Qt.hh"
+#include "G4UIManager.hh"
+#include <QtGui/qboxlayout.h>
+#include <QtGui/qdialog.h>
+#include <QtGui/qpushbutton.h>
 
 //////////////////////////////////////////////////////////////////////////////
@@ -131 +136 @@
 //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!//
 {
-  printf("G4OpenGLQtViewer::CreateMainWindow \n");
 
   if(fWindow) return; //Done.
+  printf("G4OpenGLQtViewer::CreateMainWindow 2\n");
+
+  // launch Qt if not
+  G4Qt* interactorManager = G4Qt::getInstance ();
+  //  G4UImanager* UI = G4UImanager::GetUIpointer();
+  printf("G4OpenGLQtViewer::CreateMainWindow 3\n");
+
+  QPushButton hello("Hello world!");
+  hello.resize(100, 30);
+  hello.show();
 
   fWindow = new QGLWidget() ;
   fWindow->makeCurrent();
+
+  // create window
+  QDialog* GLWindow ;
+  if (qApp) {
+    GLWindow = new QDialog();//qApp->mainWidget());
+  } else {
+    GLWindow = new QDialog();
+  }
+
+  QHBoxLayout *mainLayout = new QHBoxLayout;
+  mainLayout->addWidget(fWindow);
+  GLWindow->setLayout(mainLayout);
+  GLWindow->setWindowTitle("QGl Viewer");
+  GLWindow->resize(100, 30);
+  GLWindow->show();
+
 
 //   // Bill Gates stuff...
@@ -157 +187 @@
 //   }  
   
-//   WinSize_x = 400;
-//   WinSize_y = 400;
-//   if (WinSize_x < fVP.GetWindowSizeHintX ())
-//     WinSize_x = fVP.GetWindowSizeHintX ();
-//   if (WinSize_y < fVP.GetWindowSizeHintY ())
-//     WinSize_y = fVP.GetWindowSizeHintY ();
+   WinSize_x = 400;
+   WinSize_y = 400;
+   if (WinSize_x < fVP.GetWindowSizeHintX ())
+     WinSize_x = fVP.GetWindowSizeHintX ();
+   if (WinSize_y < fVP.GetWindowSizeHintY ())
+     WinSize_y = fVP.GetWindowSizeHintY ();
 
 //   fWindow = ::CreateWindow(className,fName.c_str(), 
@@ -193 +223 @@
 
 //////////////////////////////////////////////////////////////////////////////
+void G4OpenGLQtViewer::CreateMainWindow (
+QGLWidget* glWidget
+) 
+//////////////////////////////////////////////////////////////////////////////
+//!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!//
+{
+
+  if(fWindow) return; //Done.
+  printf("G4OpenGLQtViewer::CreateMainWindow glWidget\n");
+
+  // launch Qt if not
+  G4Qt* interactorManager = G4Qt::getInstance ();
+  //  G4UImanager* UI = G4UImanager::GetUIpointer();
+  printf("G4OpenGLQtViewer::CreateMainWindow 3\n");
+
+  fWindow = glWidget ;
+  fWindow->makeCurrent();
+
+  // create window
+  QDialog* GLWindow ;
+  if (qApp) {
+    GLWindow = new QDialog();//qApp->mainWidget());
+  } else {
+    GLWindow = new QDialog();
+  }
+
+  QHBoxLayout *mainLayout = new QHBoxLayout;
+  mainLayout->addWidget(fWindow);
+  GLWindow->setLayout(mainLayout);
+  GLWindow->setWindowTitle("QGl Viewer");
+  GLWindow->resize(300, 300);
+  GLWindow->show();
+
+
+//   // Bill Gates stuff...
+//   static const char className[] = "G4OpenGLQt";
+//   static bool done = false;
+//   if(done==false) {
+//     WNDCLASS wc;
+//     wc.style = CS_HREDRAW | CS_VREDRAW;
+//     wc.lpfnWndProc = (WNDPROC)WindowProc;
+//     wc.cbClsExtra = 0;
+//     wc.cbWndExtra = 0;
+//     wc.hInstance = ::GetModuleHandle(NULL);
+//     wc.hIcon = LoadIcon  (NULL, IDI_APPLICATION);
+//     wc.hCursor = LoadCursor(NULL,IDC_CROSS);
+//     wc.hbrBackground = NULL;
+//     wc.lpszMenuName = className;
+//     wc.lpszClassName = className;
+//     ::RegisterClass(&wc);
+//     done = true;
+//   }  
+  
+   WinSize_x = 400;
+   WinSize_y = 400;
+   if (WinSize_x < fVP.GetWindowSizeHintX ())
+     WinSize_x = fVP.GetWindowSizeHintX ();
+   if (WinSize_y < fVP.GetWindowSizeHintY ())
+     WinSize_y = fVP.GetWindowSizeHintY ();
+
+//   fWindow = ::CreateWindow(className,fName.c_str(), 
+//                         WS_OVERLAPPEDWINDOW,
+//                         //WS_CHILD | WS_VISIBLE,
+//                         0,0,
+//                         WinSize_x,WinSize_y,
+//                         NULL, NULL, 
+//                         ::GetModuleHandle(NULL),
+//                         NULL);
+//   if(!fWindow) return;
+
+//   ::SetWindowLong(fWindow,GWL_USERDATA,LONG(this));
+
+//   // initialize OpenGL rendering :
+//   fHDC = ::GetDC(fWindow);
+//   if( fHDC && (SetWindowPixelFormat(fHDC)==TRUE) ) {
+//     fHGLRC = ::wglCreateContext(fHDC);
+//   }
+  
+//   if(fHDC && fHGLRC) {
+//     ::wglMakeCurrent(fHDC,fHGLRC);
+//   }
+
+//   ::SetForegroundWindow(fWindow);
+//   ::ShowWindow(fWindow,SW_SHOWDEFAULT);
+//   ::UpdateWindow(fWindow);
+//   ::DrawMenuBar(fWindow);
+}
+
+//////////////////////////////////////////////////////////////////////////////
 G4OpenGLQtViewer::G4OpenGLQtViewer (
  G4OpenGLSceneHandler& scene
@@ -198 +317 @@
 :G4VViewer (scene, -1)
 ,G4OpenGLViewer (scene)
-                                   //,fWindow(0)
+,fWindow(0)
                                    //,fHDC(0)
                                    //,fHGLRC(0)