Changeset 1252 for trunk/source/interfaces/basic/src/G4UIQt.cc

Timestamp:

May 19, 2010, 5:06:31 PM (14 years ago)

Author:

garnier

Message:

avant commit

File:

• trunk/source/interfaces/basic/src/G4UIQt.cc (modified) (28 diffs)

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

@@ -25 +25 @@
 //
 //
-// $Id: G4UIQt.cc,v 1.33 2010/04/27 13:49:02 lgarnier Exp $
+// $Id: G4UIQt.cc,v 1.36 2010/05/19 07:18:50 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
@@ -157 +168 @@
 
 #ifdef G4DEBUG_INTERFACES_BASIC
-  printf("G4UIQt::Initialise after main window creation +++++++++++\n");
+  printf("G4UIQt::Initialise after main window creation +++++++++++ \n");
 #endif
 
@@ -310 +321 @@
   if(UI!=NULL) UI->SetCoutDestination(this);  // TO KEEP
 
-  interactorManager->SetG4UI(this);
+//   interactorManager->SetG4UI(this);
 
 #if QT_VERSION < 0x040000
@@ -336 +347 @@
   printf("G4UIQt::G4UIQt END\n");
 #endif
+#ifdef G4DEBUG_INTERFACES_BASIC
+  printf("G4UIQt:: this : %d UImanager:%d\n",this,UI);
+#endif
 }
 
@@ -349 +363 @@
   if(UI!=NULL) {  // TO KEEP
     UI->SetSession(NULL);  // TO KEEP
+    UI->SetG4UIWindow(NULL);  // TO KEEP
     UI->SetCoutDestination(NULL);  // TO KEEP
   }
@@ -520 +535 @@
 {
 #ifdef G4DEBUG_INTERFACES_BASIC
-  printf("G4UIQt::AddTabWidget %d %d\n",sizeX, sizeY);
+  printf("G4UIQt::AddTabWidget %d %d G4UIQt:%d fMyVSplitter:%d\n",sizeX, sizeY, this,fMyVSplitter);
 #endif
   if (!aWidget) {
@@ -568 +583 @@
   // Set visible
 #if QT_VERSION >= 0x040000
-#if QT_VERSION >= 0x040200
-  fMainWindow->setVisible(true);
-#else
-  fMainWindow->show();
-#endif
-#else
+ #if QT_VERSION >= 0x040200
+   fTabWidget->setLastTabCreated(fTabWidget->currentIndex());
+   fMainWindow->setVisible(true);
+ #else
+   fTabWidget->setLastTabCreated(fTabWidget->currentIndex());
+   fMainWindow->show();
+ #endif
+#else
+  fTabWidget->setLastTabCreated(fTabWidget->currentPageIndex());
   fMainWindow->show();
  #endif
@@ -605 +623 @@
 // //   printf("G4UIQt::AddTabWidget resize ^^^^^^^^^^^^ W:%d + sx:%d -fwx:%d   H:%d + sy:%d -fwy:%d    TabW:%d TabH:%d G4UIQt G4UIQt offX:%d  offY:%d aWX:%d aWY:%d\n",fMainWindow->width(),sizeX,fTabWidget->width(),fMainWindow->height(),sizeY,fTabWidget->height(),fTabWidget->width(),fTabWidget->height(),offX,offY,aWidget->size().height(),aWidget->size().width());
 // // #endif
-printf("G4UIQt::AddTabWidget  END\n");
 // // #endif
   
@@ -634 +651 @@
   // This will send a paintEvent to OGL Viewers
   fTabWidget->setTabSelected();
+
+  QCoreApplication::sendPostedEvents () ;
 
 #ifdef G4DEBUG_INTERFACES_BASIC
@@ -967 +986 @@
 {
 
-#ifdef G4DEBUG_INTERFACES_BASIC
-  printf("G4UIQt::InitHelpTree\n");
-#endif
-
   if (! fHelpTreeWidget ) {
 #if QT_VERSION < 0x040000
@@ -978 +993 @@
 #endif
   }
+
 
   // build widget
@@ -1010 +1026 @@
 void G4UIQt::FillHelpTree()
 {
-#ifdef G4DEBUG_INTERFACES_BASIC
-  printf("G4UIQt::FillHelpTree\n");
-#endif
-
   if (! fHelpTreeWidget ) {
     InitHelpTree();
@@ -1022 +1034 @@
   G4UIcommandTree * treeTop = UI->GetTree();
 
-
-  // Remove all previous children
-  //  fHelpTreeWidget->clear();
-
   G4int treeSize = treeTop->GetTreeEntry();
 #if QT_VERSION < 0x040000
@@ -1034 +1042 @@
   QString commandText = "";
   for (int a=0;a<treeSize;a++) {
-
     // Creating new item
     newItem = NULL;
@@ -1044 +1051 @@
 #endif
 
-#ifdef G4DEBUG_INTERFACES_BASIC
-    printf("G4UIQt::FillHelpTree for %s\n",commandText.toStdString().c_str());
-#endif
     // if already exist, don't create it !
 #if QT_VERSION < 0x040000
-    QListViewItem* tmpItem = fHelpTreeWidget->firstChild();
-    while (tmpItem != 0) {
+    QListViewItem* tmpAddItem = fHelpTreeWidget->firstChild();
+    while (tmpAddItem != 0) {
       if (!newItem) {
-        newItem = FindTreeItem(tmpItem,commandText);
+        newItem = FindTreeItem(tmpAddItem,commandText);
       }
-      tmpItem = tmpItem->nextSibling();
-    }
-#else
-#ifdef G4DEBUG_INTERFACES_BASIC
-    printf("G4UIQt::FillHelpTree topCount %d\n",fHelpTreeWidget->topLevelItemCount());
-#endif
+      tmpAddItem = tmpAddItem->nextSibling();
+    }
+#else
     for (int b=0;b<fHelpTreeWidget->topLevelItemCount();b++) {
       if (!newItem)
@@ -1067 +1068 @@
 
     if (newItem == NULL) {
-#ifdef G4DEBUG_INTERFACES_BASIC
-  printf("G4UIQt::FillHelpTree NOT present\n");
-#endif
       
 #if QT_VERSION < 0x040000
@@ -1078 +1076 @@
       newItem->setText(0,GetShortCommandPath(commandText));
     }
-#ifdef G4DEBUG_INTERFACES_BASIC
-    else {
-      printf("G4UIQt::FillHelpTree ALREADY present\n");
-    }
-#endif
 
     // look for childs
     CreateChildTree(newItem,treeTop->GetTree(a+1));
-    //      items.append(newItem);
-  }
+  }
+
 }
 
@@ -1128 +1121 @@
 #endif
     
-#ifdef G4DEBUG_INTERFACES_BASIC
-    printf("G4UIQt::CreateChildTree for %s \n",commandText.toStdString().c_str());
-#endif
     // if already exist, don't create it !
     newItem = FindTreeItem(aParent,commandText);
     if (newItem == NULL) {
-#ifdef G4DEBUG_INTERFACES_BASIC
-      printf("G4UIQt::CreateChildTree NOT present\n");
-#endif
 #if QT_VERSION < 0x040000
       newItem = new QListViewItem(aParent);
@@ -1144 +1131 @@
       newItem->setText(0,GetShortCommandPath(commandText));
     }
-#ifdef G4DEBUG_INTERFACES_BASIC
-    else {
-      printf("G4UIQt::CreateChildTree ALREADY present\n");
-    }
-#endif
     CreateChildTree(newItem,aCommandTree->GetTree(a+1));
   }
@@ -1210 +1192 @@
   }
 
-#ifdef G4DEBUG_INTERFACES_BASIC
-  printf("G4UIQt::FindTreeItem check -%s=%s-\n",myCommand.toStdString().c_str(),GetLongCommandPath(aParent).toStdString().c_str());
-#endif
   if (GetLongCommandPath(aParent) == myCommand)
     return aParent;
@@ -1534 +1513 @@
       SessionTerminate();
   }
-
 }
 
@@ -1572 +1550 @@
   QTreeWidgetItem* item =  NULL;
 #endif
-
   if (!fHelpTreeWidget)
     return ;
@@ -2032 +2009 @@
 QSplitter*& split
 ):QTabWidget(split)
+ ,tabSelected(false)
+ ,lastCreated(-1)
 {
 }
@@ -2037 +2016 @@
 G4QTabWidget::G4QTabWidget(
 ):QTabWidget()
+ ,tabSelected(false)
+ ,lastCreated(-1)
 {
 }
@@ -2043 +2024 @@
   
 void G4UIQt::TabCloseCallback(int a){
-#ifdef G4DEBUG_INTERFACES_BASIC
-  printf("G4UIQt::TabCloseCallback   %d ---------------------------------\n",a);
-#endif
   QWidget* temp = fTabWidget->widget(a);
   fTabWidget->removeTab (a);
@@ -2066 +2044 @@
     // Rebuild the help tree
     FillHelpTree();
-
-#ifdef G4DEBUG_INTERFACES_BASIC
-    printf("G4UIQt::CurrentChangeCallback   %d ---------------------------------\n",a);
-#endif
   }
 }
@@ -2088 +2062 @@
       printf("G4QTabWidget::paintEvent OK\n");
 #endif
+#if QT_VERSION < 0x040000
+      QString text = label (currentPageIndex()); 
+#else
       QString text = tabText (currentIndex()); 
-      QString paramSelect = QString("/vis/viewer/select ")+text;
-      G4UImanager* UI = G4UImanager::GetUIpointer();
-      if(UI!=NULL)  {
-        UI->ApplyCommand(paramSelect.toStdString().c_str());
+#endif
+
+      if (lastCreated == -1) {
+        QString paramSelect = QString("/vis/viewer/select ")+text;
+        G4UImanager* UI = G4UImanager::GetUIpointer();
+        if(UI != NULL)  {
+          UI->ApplyCommand(paramSelect.toStdString().c_str());
+        }
+      } else {
+        lastCreated = -1;
       }
       unselectTab();