Changeset 1139 for trunk/source

Timestamp:

Nov 2, 2009, 4:38:34 PM (15 years ago)

Author:

garnier

Message:

en test

Location:

trunk/source/interfaces

Files:

• basic/include/G4UIQt.hh (modified) (4 diffs)
• basic/src/G4UIQt.cc (modified) (8 diffs)
• common/src/G4Qt.cc (modified) (1 diff)
• common/src/G4VInteractorManager.cc (modified) (1 diff)

trunk/source/interfaces/basic/include/G4UIQt.hh

@@ -31 +31 @@
 #define G4UIQt_h 
 
-#if defined(G4UI_BUILD_QT_SESSION) || defined(G4UI_USE_QT)
+#if defined(G4UI_BUILD_QT_SESSION) || defined(G4UI_USE_QT) || defined(G4INTY_BUILD_QT)
 
 #include <map>
@@ -104 +104 @@
   //   G4String GetCommand(Widget);
   QMainWindow * getMainWindow();
+  QWidget * getViewWidget();
+
 
 private:
@@ -138 +140 @@
   //  static void keyHandler(Widget,XtPointer,XEvent*,Boolean*);
   QMainWindow * fMainWindow;
+  QWidget *fViewWidget;
   QLabel *fCommandLabel;
   QLineEdit * fCommandArea;
@@ -149 +152 @@
   QTreeWidget *fHelpTreeWidget;
 #endif
-  QDialog *fHelpDialog;
+  //  QDialog *fHelpDialog;
+  QWidget *fHelpDialog;
   QLineEdit *helpLine;
  

trunk/source/interfaces/basic/src/G4UIQt.cc

@@ -112 +112 @@
   G4UImanager* UI = G4UImanager::GetUIpointer();
   if(UI!=NULL) UI->SetSession(this);
+#ifdef G4DEBUG_INTERFACES_BASIC
+  printf("G4UIQt::G4UIQt SetSession UI:%d G4UIQt:%d\n",UI,this);
+#endif
 
   // Check if already define in external app QMainWindow
@@ -156 +159 @@
 
   QWidget *mainWidget = new QWidget(fMainWindow);
-  QSplitter *splitter = new QSplitter(Qt::Vertical,mainWidget);
+  QSplitter *bottomSplitter = new QSplitter(Qt::Vertical,mainWidget);
+  QSplitter *topSplitter = new QSplitter(Qt::Vertical,mainWidget);
+  fViewWidget = new QWidget();
 
   // Set layouts
 
-  QWidget* topWidget = new QWidget(splitter);
-  QWidget* bottomWidget = new QWidget(splitter);
+  QWidget* topWidget = new QWidget(bottomSplitter);
+  QWidget* bottomWidget = new QWidget(bottomSplitter);
+
+
+...finir de mettre de QGL dans le splitter du haut
+
+
 
   QVBoxLayout *layoutTop = new QVBoxLayout(topWidget);
@@ -220 +230 @@
   QVBoxLayout *mainLayout = new QVBoxLayout(mainWidget);
 
-  splitter->addWidget(topWidget);
-  splitter->addWidget(bottomWidget);
-
-  mainLayout->addWidget(splitter);
+  bottomSplitter->addWidget(topWidget);
+  bottomSplitter->addWidget(bottomWidget);
+
+  mainLayout->addWidget(fViewWidget);
+  mainLayout->addWidget(bottomSplitter);
+#ifdef G4DEBUG_INTERFACES_BASIC
+  printf("G4UIQt::Initialise ViewWidget :%d\n",fViewWidget);
+#endif
 
 #endif
 
     fMainWindow->setCentralWidget(mainWidget);
-    //fMainWindow->setCentralWidget(splitter);
+    //fMainWindow->setCentralWidget(bottomSplitter);
 
 #if QT_VERSION < 0x040000
@@ -254 +268 @@
 #endif
 
+#ifdef G4DEBUG_INTERFACES_BASIC
+  printf("G4UIQt::G4UIQt end %d \n",fMainWindow);
+#endif
+
   AddInteractor ("file",(G4Interactor)fileMenu);
   AddInteractor ("help",(G4Interactor)helpMenu);
@@ -259 +277 @@
   // Set the splitter size. The fTextArea sould be 2/3 on the fMainWindow
 #if QT_VERSION < 0x040000
-  QValueList<int> vals = splitter->sizes();
-#else
-  QList<int> vals = splitter->sizes();
+  QValueList<int> vals = bottomSplitter->sizes();
+#else
+  QList<int> vals = bottomSplitter->sizes();
 #endif
 //    if(vals.size()==2) {
-//      vals[0] = (splitter->orientation()==Qt::Vertical ? splitter->height() : splitter->width())*3/4;
-//      vals[1] = (splitter->orientation()==Qt::Vertical ? splitter->height() : splitter->width())*1/4;
-//      splitter->setSizes(vals);
+//      vals[0] = (bottomSplitter->orientation()==Qt::Vertical ? bottomSplitter->height() : bottomSplitter->width())*3/4;
+//      vals[1] = (bottomSplitter->orientation()==Qt::Vertical ? bottomSplitter->height() : bottomSplitter->width())*1/4;
+//      bottomSplitter->setSizes(vals);
 //    }
 
   if(UI!=NULL) UI->SetCoutDestination(this);  // TO KEEP
-}
+#ifdef G4DEBUG_INTERFACES_BASIC
+  printf("G4UIQt::Initialise end of interface creation \n");
+#endif
+
+
+
+//   /////////////////
+//   QLabel *test = new QLabel("test",fViewWidget);
+//   QHBoxLayout *mainLayout2 = new QHBoxLayout;
+//   mainLayout2->setMargin(0);
+//   mainLayout2->setSpacing(0);
+//   mainLayout2->addWidget(test);
+
+//   fViewWidget->setLayout(mainLayout2);
+
+
+}
+
 
 
@@ -283 +318 @@
   }
   
+#ifdef G4DEBUG_INTERFACES_BASIC
+  printf("G4UIQt::DELETE ALL\n");
+#endif
   if (fMainWindow!=NULL)
     delete fMainWindow;
@@ -339 +377 @@
 )
 {
+#ifdef G4DEBUG_INTERFACES_BASIC
+  G4UImanager* UI = G4UImanager::GetUIpointer();
+  printf("G4UIQt::getMainWindow UI:%d fMa:%d this:%d\n",UI,fMainWindow,this);
+#endif
   return fMainWindow;
+}
+
+QWidget * G4UIQt::getViewWidget (
+)
+{
+#ifdef G4DEBUG_INTERFACES_BASIC
+  G4UImanager* UI = G4UImanager::GetUIpointer();
+  printf("G4UIQt::getViewWidget %d\n",fViewWidget);
+#endif
+  return fViewWidget;
 }
 
@@ -547 +599 @@
     fHelpDialog = new QDialog(0,0,FALSE,Qt::WStyle_Title | Qt::WStyle_SysMenu | Qt::WStyle_MinMax );
 #else
-    fHelpDialog = new QDialog(0,Qt::WindowTitleHint | Qt::WindowSystemMenuHint | Qt::WindowMinMaxButtonsHint);
+    //    fHelpDialog = new QDialog(fMainWindow,Qt::WindowTitleHint | Qt::WindowSystemMenuHint | Qt::WindowMinMaxButtonsHint);
+    fHelpDialog = new QWidget(0,Qt::Window | Qt::Popup);
 #endif
     QVBoxLayout *vLayout = new QVBoxLayout(fHelpDialog);

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

@@ -133 +133 @@
         if (a_argn != 0) {
           SetMainInteractor (qApp);
+#ifdef G4DEBUG_INTERFACES_COMMON
+          printf("G4Qt::G4Qt SetMainInteractor %d .....................................\n",qApp);
+#endif
         }
         SetArguments      (a_argn,a_args);

trunk/source/interfaces/common/src/G4VInteractorManager.cc

@@ -123 +123 @@
 /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 {
+#ifdef G4DEBUG_INTERFACES_COMMON
+  printf("G4VInteractorManager::SetMainInteractor new ! %d\n",a_main);
+#endif
   mainInteractor = a_main;
 }