Changeset 539 for trunk/geant4/visualization/OpenGL

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

Location:

trunk/geant4/visualization/OpenGL

Files:

• GNUmakefile (modified) (1 diff)
• include/G4OpenGLImmediateQtViewer.hh (modified) (3 diffs)
• include/G4OpenGLQtViewer.hh (modified) (1 diff)
• src/G4OpenGLImmediateQt.cc (modified) (2 diffs)
• src/G4OpenGLImmediateQtViewer.cc (modified) (6 diffs)
• src/G4OpenGLQtViewer.cc (modified) (5 diffs)

trunk/geant4/visualization/OpenGL/GNUmakefile

@@ -28 +28 @@
 CPPFLAGS += -I$(G4BASE)/intercoms/include
 CPPFLAGS += -I$(G4BASE)/interfaces/common/include
+CPPFLAGS += -I$(G4BASE)/interfaces/basic/include
 CPPFLAGS += -I$(G4BASE)/tracking/include
 CPPFLAGS += -I$(G4BASE)/digits_hits/hits/include

trunk/geant4/visualization/OpenGL/include/G4OpenGLImmediateQtViewer.hh

@@ -40 +40 @@
 #include "G4OpenGLImmediateViewer.hh"
 #include "G4OpenGLQtViewer.hh"
+#include <QGLWidget>
 
 #include "globals.hh"
@@ -46 +47 @@
 
 class G4OpenGLImmediateQtViewer:
-public G4OpenGLQtViewer, public G4OpenGLImmediateViewer{
+  public G4OpenGLQtViewer, public G4OpenGLImmediateViewer, public QGLWidget {
   
 public:
@@ -54 +55 @@
   void DrawView ();
   void FinishView ();
+  void resizeGL(int width,int height);
+  void paintGL();
 };
 

trunk/geant4/visualization/OpenGL/include/G4OpenGLQtViewer.hh

@@ -59 +59 @@
   void CreateGLQtContext ();
   virtual void CreateMainWindow ();
+  void CreateMainWindow (QGLWidget*);
 protected:
   G4int WinSize_x;

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

@@ -28 +28 @@
 // GEANT4 tag $Name: geant4-08-02-patch-01 $
 //
-//
+// 
 // OpenGLImmediateQt graphics system factory.
 
@@ -42 +42 @@
 
 G4OpenGLImmediateQt::G4OpenGLImmediateQt ():
-        G4VGraphicsSystem ("OpenGLImmediateQt",
-                           "OGLIQT",
-                           G4VisFeaturesOfOpenGLIQt (),
-                   G4VGraphicsSystem::threeD) {
-    G4OpenGLViewerMessenger::GetInstance();
+  G4VGraphicsSystem ("OpenGLImmediateQt",
+                     "OGLIQT",
+                     G4VisFeaturesOfOpenGLIQt (),
+                     G4VGraphicsSystem::threeD)
+{
+  G4OpenGLViewerMessenger::GetInstance();
 }
 
 G4VSceneHandler* G4OpenGLImmediateQt::CreateSceneHandler
 (const G4String& name) {
-    G4VSceneHandler* pScene = new G4OpenGLImmediateSceneHandler (*this, name);
-    return    pScene;
+  G4VSceneHandler* pScene = new G4OpenGLImmediateSceneHandler (*this, name);
+  return    pScene;
 }
 
 G4VViewer* G4OpenGLImmediateQt::CreateViewer
 (G4VSceneHandler& scene, const G4String& name) {
-    G4VViewer* pView =
-        new G4OpenGLImmediateQtViewer
-        ((G4OpenGLImmediateSceneHandler&) scene, name);
-    if (pView) {
-        if (pView -> GetViewId () < 0) {
-            G4cerr << "G4OpenGLImmediateQt::CreateViewer: error flagged by negative"
-            " view id in G4OpenGLImmediateQtViewer creation."
-            "\n Destroying view and returning null pointer."
-            << G4endl;
-            delete pView;
-            pView = 0;
-        }
-    } else {
-        G4cerr << "G4OpenGLImmediateQt::CreateViewer: null pointer on"
-        " new G4OpenGLImmediateQtViewer." << G4endl;
+  G4VViewer* pView =
+    new G4OpenGLImmediateQtViewer
+    ((G4OpenGLImmediateSceneHandler&) scene, name);
+  if (pView) {
+    if (pView -> GetViewId () < 0) {
+      G4cerr << "G4OpenGLImmediateQt::CreateViewer: error flagged by negative"
+        " view id in G4OpenGLImmediateQtViewer creation."
+        "\n Destroying view and returning null pointer."
+           << G4endl;
+      delete pView;
+      pView = 0;
     }
-    return pView;
+  }
+  else {
+    G4cerr << "G4OpenGLImmediateQt::CreateViewer: null pointer on"
+      " new G4OpenGLImmediateQtViewer." << G4endl;
+  }
+   return pView;
 }
 

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

@@ -28 +28 @@
 // GEANT4 tag $Name: geant4-08-02-patch-01 $
 //
-// 
+//
 // Class G4OpenGLImmediateQtViewer : a class derived from G4OpenGLQtViewer and
 //                                G4OpenGLImmediateViewer.
@@ -53 +53 @@
 // ensure a suitable window was found
 
+  printf("G4OpenGLImmediateQtViewer::Initialise () 1\n");
   CreateGLQtContext ();
-  CreateMainWindow ();
+  CreateMainWindow (this);
   CreateFontLists ();
 
@@ -71 +72 @@
 void G4OpenGLImmediateQtViewer::DrawView () {
 
+  printf("G4OpenGLImmediateQtViewer::DrawView %d %d\n",WinSize_x, WinSize_y);
   // If a double buffer context has been forced upon us, ignore the
   // back buffer for this OpenGLImmediate view.
@@ -100 +102 @@
 }
 
+
 //////////////////////////////////////////////////////////////////////////////
 void G4OpenGLImmediateQtViewer::FinishView (
@@ -106 +109 @@
 //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!//
 {
+  printf("G4OpenGLImmediateQtViewer::FinishView \n");
   //    if(!fHDC) return;
 
@@ -118 +122 @@
 }
 
+
+void G4OpenGLImmediateQtViewer::resizeGL(
+ int width
+,int height)
+{
+  printf("G4OpenGLImmediateQtViewer::resizeGL \n");
+  int side = qMin(width, height);
+  glViewport((width - side) / 2, (height - side) / 2, side, side);
+  glMatrixMode(GL_PROJECTION);
+  glLoadIdentity();
+  glOrtho(-0.5, +0.5, +0.5, -0.5, 4.0, 15.0);
+  glMatrixMode(GL_MODELVIEW);
+}
+
+void G4OpenGLImmediateQtViewer::paintGL()
+ {
+  printf("G4OpenGLImmediateQtViewer::paintGL \n");
+  // FIXME
+  //  DrawView();
+  //  glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+  //  glLoadIdentity();
+  //  glTranslated(0.0, 0.0, -10.0);
+ }
 #endif

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)