Changeset 1255 for trunk

Timestamp:

May 20, 2010, 11:47:43 AM (14 years ago)

Author:

garnier

Message:

remove cycle dependency

Location:

trunk/source/interfaces

Files:

• History (modified) (2 diffs)
• basic/src/G4UIQt.cc (modified) (7 diffs)
• common/include/G4Qt.hh (modified) (4 diffs)
• common/src/G4Qt.cc (modified) (4 diffs)

trunk/source/interfaces/History

@@ -1 @@
-$Id: History,v 1.132 2010/05/19 07:18:50 lgarnier Exp $
+$Id: History,v 1.133 2010/05/20 07:01:03 lgarnier Exp $
 -------------------------------------------------------------------
 
@@ -18 +18 @@
      ----------------------------------------------------------
 
+20 May, L. Garnier
+ Co-working tag : intercoms-V09-03-01
+ - G4UIQt: Add some changes in order to register UI in order to access
+   it after
+ - G4Qt: Remove a cycle dependency
+
 19 May, L. Garnier
  - G4UIQt: Fix a warning in Cout during viewer creation

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

@@ -25 +25 @@
 //
 //
-// $Id: G4UIQt.cc,v 1.36 2010/05/19 07:18:50 lgarnier Exp $
+// $Id: G4UIQt.cc,v 1.37 2010/05/20 07:01:03 lgarnier Exp $
 // GEANT4 tag $Name:  $
 //
@@ -125 +125 @@
   
   G4UImanager* UI = G4UImanager::GetUIpointer();
-
-  // L.Garnier : This statement does not give the good pointer I think
   if(UI!=NULL) UI->SetSession(this);
   if(UI!=NULL) UI->SetG4UIWindow(this);
-
-  //  if(UI!=NULL) UI->SetG4UIWindow(this);
-
-#ifdef G4DEBUG_INTERFACES_BASIC
-  printf("G4UIQt:: recheck Session : this %d UImanager:%d\n",this,UI);
-  G4UIQt * uiQt2 =  static_cast<G4UIQt*> (UI->GetG4UIWindow());
-  printf("G4UIQt:: recheck Session : %d UImanager:%d\n",uiQt2,UI);
-#endif
 
   // Check if already define in external app QMainWindow
@@ -168 +158 @@
 
 #ifdef G4DEBUG_INTERFACES_BASIC
-  printf("G4UIQt::Initialise after main window creation +++++++++++ \n");
+  printf("G4UIQt::Initialise after main window creation +++++++++++\n");
 #endif
 
@@ -321 +311 @@
   if(UI!=NULL) UI->SetCoutDestination(this);  // TO KEEP
 
-//   interactorManager->SetG4UI(this);
-
 #if QT_VERSION < 0x040000
   fMainWindow->setCaption( tr( "G4UI Session" ));
@@ -347 +335 @@
   printf("G4UIQt::G4UIQt END\n");
 #endif
-#ifdef G4DEBUG_INTERFACES_BASIC
-  printf("G4UIQt:: this : %d UImanager:%d\n",this,UI);
-#endif
 }
 
@@ -363 +348 @@
   if(UI!=NULL) {  // TO KEEP
     UI->SetSession(NULL);  // TO KEEP
-    UI->SetG4UIWindow(NULL);  // TO KEEP
+    UI->SetG4UIWindow(NULL);
     UI->SetCoutDestination(NULL);  // TO KEEP
   }
@@ -535 +520 @@
 {
 #ifdef G4DEBUG_INTERFACES_BASIC
-  printf("G4UIQt::AddTabWidget %d %d G4UIQt:%d fMyVSplitter:%d\n",sizeX, sizeY, this,fMyVSplitter);
+  printf("G4UIQt::AddTabWidget %d %d\n",sizeX, sizeY);
 #endif
   if (!aWidget) {

trunk/source/interfaces/common/include/G4Qt.hh

@@ -25 +25 @@
 //
 //
-// $Id: G4Qt.hh,v 1.5 2010/01/06 14:07:34 lgarnier Exp $
-// GEANT4 tag $Name: laurent-QtUI_with_tabs_v1 $
+// $Id: G4Qt.hh,v 1.6 2010/05/20 07:01:03 lgarnier Exp $
+// GEANT4 tag $Name:  $
 //
 //  To unify Qt event treatment between 
@@ -39 +39 @@
 #include "G4VInteractorManager.hh"
 
-// class G4UIQt;
 class QWidget;
 class QString;
@@ -60 +59 @@
   void FlushAndWaitExecution();
   virtual ~G4Qt();                     
-//   bool AddTabWidget(QWidget*,QString,int,int);
-//   void SetG4UI(G4UIQt*);
 
 private:
@@ -68 +65 @@
   int    argn;
   char** args;
-//   G4UIQt* fG4UI;
 };
 

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

@@ -25 +25 @@
 //
 //
-// $Id: G4Qt.cc,v 1.16 2010/04/26 15:46:00 lgarnier Exp $
+// $Id: G4Qt.cc,v 1.17 2010/05/20 07:01:03 lgarnier Exp $
 // GEANT4 tag $Name:  $
 //
@@ -38 +38 @@
 
 #include "G4Qt.hh"
-// #include "G4UIQt.hh"
 #include <qwidget.h>
 
@@ -76 +75 @@
  ,char*  /*a_class */
  )
-// :fG4UI(NULL)
 /***************************************************************************/
 /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
@@ -207 +205 @@
 }
 
-// /***************************************************************************/
-// void G4Qt::SetG4UI (
-//  G4UIQt* ui
-// )
-// /***************************************************************************/
-// /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
-// {
-// #ifdef G4DEBUG_INTERFACES_COMMON
-//     printf("G4Qt::SetG4UI \n");
-// #endif
-//   fG4UI = ui;
-// }
-
-// /***************************************************************************/
-// bool G4Qt::AddTabWidget (
-//  QWidget * vis
-// ,QString name
-// ,int sizeX
-// ,int sizeY
-// )
-// /***************************************************************************/
-// /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
-// {
-//   if (fG4UI != NULL) {
-//     //    return fG4UI->AddTabWidget(vis,name,sizeX,sizeY);
-//   }
-//   return false;
-// }
-#endif
-
-
+#endif
+
+