Changeset 484 for trunk/geant4/interfaces/common/src/G4Qt.cc

Timestamp:

Jun 5, 2007, 4:09:01 PM (17 years ago)

Author:

garnier

Message:

r573@mac-90108: laurentgarnier | 2007-06-05 16:12:24 +0200
remise a jour

File:

• trunk/geant4/interfaces/common/src/G4Qt.cc (modified) (5 diffs)

trunk/geant4/interfaces/common/src/G4Qt.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4Xt.cc,v 1.11 2006/06/29 19:10:28 gunter Exp $
+// $Id: G4Qt.cc,v 1.11 2007/05/29 11:10:28 $
 // GEANT4 tag $Name: geant4-08-01 $
 //
-// G.Barrand
+// L. Garnier
 
-#if defined(G4INTY_BUILD_XT) || defined(G4INTY_USE_XT)
+#if defined(G4INTY_BUILD_QT) || defined(G4INTY_USE_QT)
 
 #include <stdlib.h>
 #include <string.h>
 
-#include <X11/Intrinsic.h>
-#include <X11/Shell.h>
-
 #include "G4ios.hh"
 
-#include "G4Xt.hh"
+#include "G4Qt.hh"
 
 #define NewString(str)  \
@@ -49 +46 @@
 //static void XDisplaySetWindowToNormalState (Display*,Window);
 
-G4Xt* G4Xt::instance    = NULL;
+G4Qt* G4Qt::instance    = NULL;
 
-static G4bool XtInited  = FALSE;
-static int    argn      = 0;
-static char** args      = NULL;
-static XtAppContext appContext = NULL;
-static Widget topWidget = NULL;
+static G4bool QtInited  = FALSE;
+//static int    argn      = 0;
+//static char** args      = NULL;
+// static QtAppContext appContext = NULL;
+static QMainWindow *mainWidget = NULL;
+
 /***************************************************************************/
-G4Xt* G4Xt::getInstance (
+G4Qt* G4Qt::getInstance (
 ) 
 /***************************************************************************/
 /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 {
-  return G4Xt::getInstance (0,NULL,(char*)"Geant4");
+  return G4Qt::getInstance (0,NULL,(char*)"Geant4");
 }
 /***************************************************************************/
-G4Xt* G4Xt::getInstance (
+G4Qt* G4Qt::getInstance (
  int    a_argn
 ,char** a_args
@@ -74 +72 @@
 {
   if (instance==NULL) {
-    instance = new G4Xt(a_argn,a_args,a_class);
+    instance = new G4Qt(a_argn,a_args,a_class);
   }
   return instance;
 }
 /***************************************************************************/
-G4Xt::G4Xt (
+G4Qt::G4Qt (
  int    a_argn
 ,char** a_args
@@ -87 +85 @@
 /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 {
-  if(XtInited==FALSE) {  //Xt should be Inited once !
-    if(a_argn!=0) {  //Save args.
-      args = (char**)malloc(a_argn * sizeof(char*));
-      if(args!=NULL) {
-        argn = a_argn;
-        for(int argi=0;argi<a_argn;argi++) {
-          args[argi] = (char*)NewString (a_args[argi]);
-        }
-      }
+  if(QtInited==FALSE) {  //Qt should be Inited once !
+
+    new QApplication (a_argn, a_args);
+    mainWidget = new QMainWindow();
+
+    if(mainWidget==NULL) {
+      G4cout        << "G4Qt : Unable to init Qt." << G4endl;
     }
-#if XtSpecificationRelease == 4
-    Cardinal     narg;
-    narg         = (Cardinal)a_argn;
-#else
-    int          narg;
-    narg         = a_argn;
-#endif
-    Arg          xargs[1];
-    XtSetArg     (xargs[0],XtNgeometry,"100x100"); 
-    topWidget    = XtAppInitialize (&appContext,a_class,
-                                    NULL,(Cardinal)0,
-                                    &narg,a_args,NULL,
-                                    xargs,1);
-    if(topWidget==NULL) {
-      G4cout        << "G4Xt : Unable to init Xt." << G4endl;
-    }
-    // Restore a_args. XtAppInitialize corrupts the given ones !!!
-    if( (a_argn!=0) && (args!=NULL)) {
-      for(int argi=0;argi<a_argn;argi++) {
-        if(args[argi]!=NULL)
-          strcpy(a_args[argi],args[argi]);
-        else
-          a_args[argi] = NULL;
-      }
-    }
-    // If topWidget not realized, pbs with Inventor shells.
-    XtSetMappedWhenManaged (topWidget,False);
-    XtRealizeWidget (topWidget);
-    XtInited = TRUE;
+    QtInited  = TRUE;
+    mainWidget->show();
+    qApp->exec();
   }
-  SetArguments      (argn,args);
-  SetMainInteractor (topWidget);
-  AddDispatcher     ((G4DispatchFunction)XtDispatchEvent);
+//  AddDispatcher     ((G4DispatchFunction)QtDispatchEvent); // FIXME
 }
 /***************************************************************************/
-G4Xt::~G4Xt (
+G4Qt::~G4Qt (
 ) 
 /***************************************************************************/
@@ -142 +110 @@
 }
 /***************************************************************************/
-G4bool G4Xt::Inited (
+G4bool G4Qt::Inited (
 )
 /***************************************************************************/
 /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 {
-  return XtInited;
+  return QtInited;
 }
 /***************************************************************************/
-void* G4Xt::GetEvent (
+void* G4Qt::GetEvent (
 ) 
 /***************************************************************************/
 /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 {
-  static XEvent  event;
-  if(appContext==NULL) return NULL;
-  if(topWidget==NULL) return NULL;
-  XtAppNextEvent (appContext, &event);
-  return         &event;
+//FIXME
+   G4cout        << "G4Qt : Rien compris a cette fonction G4Qt::GetEvent." << G4endl;
+//  static XEvent  event;
+//  if(appContext==NULL) return NULL;
+//  if(mainApp==NULL) return NULL;
+//  QtAppNextEvent (appContext, &event);
+//  return         &event;
 }
 /***************************************************************************/
-void G4Xt::PutStringInResourceDatabase (
- char* a_string 
+void G4Qt::FlushAndWaitExecution (
 )
 /***************************************************************************/
 /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 {
-  if(topWidget==NULL)  return;
-  if(a_string==NULL)   return;
-  Display*             dpy   = XtDisplay(topWidget);
-  XrmDatabase          dbres = XrmGetStringDatabase (a_string);
-  if(dbres==NULL)      return;
-  XrmDatabase          database = XrmGetDatabase (dpy);
-  if(database!=NULL)  {
-    XrmMergeDatabases  (dbres,&database);
-  } else {
-    XrmSetDatabase     (dpy,dbres);
-  }
-}
-/***************************************************************************/
-void G4Xt::FlushAndWaitExecution (
-)
-/***************************************************************************/
-/*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
-{
-  if(topWidget==NULL) return;
-  XSync(XtDisplay(topWidget),False);
+//FIXME
+   G4cout        << "G4Qt : Rien compris a cette fonction G4Qt::FlushAndWaitExecution." << G4endl;
+//  if(mainApp==NULL) return;
+//  XSync(QtDisplay(mainApp),False);
 }