Changeset 1340 for trunk/source/interfaces

Timestamp:

Nov 5, 2010, 3:45:55 PM (14 years ago)

Author:

garnier

Message:

update ti head

Location:

trunk/source/interfaces

Files:

• CVS/Entries (modified) (1 diff)
• History (modified) (2 diffs)
• basic/GNUmakefile (modified) (1 diff)
• basic/src/CVS/Entries (modified) (1 diff)
• basic/src/G4UIQt.cc (modified) (15 diffs)

trunk/source/interfaces/CVS/Entries

@@ -4 +4 @@
 /CMakeLists.txt/1.1/Wed Sep 29 18:45:30 2010//
 /GNUmakefile/1.7/Thu Sep 30 06:11:40 2010//
-/History/1.153/Thu Sep 30 11:54:02 2010//
+/History/1.156/Fri Oct  8 10:14:53 2010//

trunk/source/interfaces/History

@@ -1 @@
-$Id: History,v 1.153 2010/06/23 13:06:16 lgarnier Exp $
+$Id: History,v 1.156 2010/10/08 10:14:53 lgarnier Exp $
 -------------------------------------------------------------------
 
@@ -18 +18 @@
      ----------------------------------------------------------
 
+8, October L. Garnier
+- G4UIQt : Fiw problem with redraw of help tree
+
+6, October J. Allison  (interfaces-V09-03-12)
+- G4UIQt : Remove message about empty viewer (comment out
+           fEmptyViewerTabLabel - suggested by Laurent).
+
+5, June L. Garnier
+- G4UIQt : Fix some bug on helpTree view
+
 23, June L. Garnier
 - G4UIQt : Fix compilation warnings on Qt3 and Qt4

trunk/source/interfaces/basic/GNUmakefile

@@ -13 +13 @@
 
 # For debug mode
-# CPPFLAGS += -DG4DEBUG_INTERFACES_BASIC
+CPPFLAGS += -DG4DEBUG_INTERFACES_BASIC
 
 include $(G4INSTALL)/config/architecture.gmk

trunk/source/interfaces/basic/src/CVS/Entries

@@ -7 +7 @@
 /G4UIterminal.cc/1.28/Thu Sep 30 06:11:43 2010//
 /G4VUIshell.cc/1.10/Thu Sep 30 06:11:43 2010//
-/G4UIQt.cc/1.49/Thu Sep 30 11:54:07 2010//
+/G4UIQt.cc/1.53/Tue Nov  2 15:38:51 2010//
 D

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

@@ -25 +25 @@
 //
 //
-// $Id: G4UIQt.cc,v 1.49 2010/06/23 13:06:16 lgarnier Exp $
+// $Id: G4UIQt.cc,v 1.53 2010/11/02 15:38:51 lgarnier Exp $
 // GEANT4 tag $Name:  $
 //
@@ -31 +31 @@
 
 #ifdef G4UI_BUILD_QT_SESSION
-
-//#define QT_CONNECT_TEST 1
 
 #include "G4Types.hh"
@@ -109 +107 @@
 ,char** argv
 )
-:fG4cout("")
+:fHelpArea(NULL)
+,fG4cout("")
 ,fHelpTreeWidget(NULL)
 ,fHelpTBWidget(NULL)
@@ -116 +115 @@
 ,fVisParametersTBWidget(NULL)
 ,fViewComponentsTBWidget(NULL)
+,fHelpLine(NULL)
 ,fTabWidget(NULL)
 ,fCoutText("Output")
@@ -508 +508 @@
 )
 {
-#ifdef QT_CONNECT_TEST
-  bool shouldConnect = false;
-#endif
-
 #ifdef G4DEBUG_INTERFACES_BASIC
   printf("G4UIQt::AddTabWidget %d %d\n",sizeX, sizeY);
@@ -541 +537 @@
     fTabWidget->setSizePolicy(policy);
     
-#ifdef QT_CONNECT_TEST
-    shouldConnect = true;
-#else
 #if QT_VERSION >= 0x040500
     connect(fTabWidget,   SIGNAL(tabCloseRequested(int)), this, SLOT(TabCloseCallback(int)));
 #endif
     connect(fTabWidget, SIGNAL(currentChanged ( int ) ), SLOT(UpdateTabWidget(int))); 
-#endif
-
   }
 
@@ -602 +593 @@
     int tabBarY = 0;
     if (fTabWidget->count() >0) {
-#ifdef G4DEBUG_INTERFACES_BASIC
-  printf("G4UIQt::AddTabWidget -1-1-1\n");
-#endif
-
 #if QT_VERSION < 0x040000
       tabBarX = fTabWidget->width()-fTabWidget->page(0)->width();
@@ -615 +602 @@
     }
 
-#ifdef G4DEBUG_INTERFACES_BASIC
-  printf("G4UIQt::AddTabWidget 00000\n");
-#endif
-
     fMainWindow->resize(tabBarX+fMainWindow->width()+sizeX-fTabWidget->width(),tabBarY+fMainWindow->height()+sizeY-fTabWidget->height());
   }
 
-#ifdef G4DEBUG_INTERFACES_BASIC
-  printf("G4UIQt::AddTabWidget 1111111\n");
-#endif
   // Problems with resize. The widgets are not realy drawn at this step,
   // then we have to force them on order to check the size
@@ -634 +614 @@
 #endif
   
-#ifdef G4DEBUG_INTERFACES_BASIC
-  printf("G4UIQt::AddTabWidget 222222\n");
-#endif
 #if QT_VERSION < 0x040000
   fTabWidget->setCurrentPage(fTabWidget->count()-1);
@@ -643 +620 @@
 #endif
 
-#ifdef G4DEBUG_INTERFACES_BASIC
-  printf("G4UIQt::AddTabWidget 333333\n");
-#endif
   // Set visible
 #if QT_VERSION >= 0x040000
@@ -657 +631 @@
 #endif
   
-#ifdef G4DEBUG_INTERFACES_BASIC
-  printf("G4UIQt::AddTabWidget -------\n");
-#endif
-#ifdef QT_CONNECT_TEST
-  if (shouldConnect) {
-#if QT_VERSION >= 0x040500
-    connect(fTabWidget,   SIGNAL(tabCloseRequested(int)), this, SLOT(TabCloseCallback(int)));
-#endif
-    connect(fTabWidget, SIGNAL(currentChanged ( int ) ), SLOT(UpdateTabWidget(int))); 
-  }
-#endif
   return true;
 }
@@ -755 +718 @@
         visible = true;
       }
-    }
-    if (visible) {
-#if QT_VERSION >= 0x040000
-  #if QT_VERSION >= 0x040200
-      fEmptyViewerTabLabel->setVisible(false);
-  #else
-      fEmptyViewerTabLabel->hide();
-  #endif
-#else
-      fEmptyViewerTabLabel->hide();
-#endif
-    } else {
-#if QT_VERSION >= 0x040000
-  #if QT_VERSION >= 0x040200
-      fEmptyViewerTabLabel->setVisible(true);
-  #else
-      fEmptyViewerTabLabel->show();
-  #endif
-#else
-      fEmptyViewerTabLabel->show();
-#endif
     }
   }
@@ -1150 +1092 @@
   if (! fHelpTreeWidget ) {
     InitHelpTree();
+  }
+
+  QString searchText = fHelpLine->text();
+
+  if (searchText =="") {
+    // clear old help tree
+    //    fHelpTreeWidget->clear();
+#if QT_VERSION < 0x040000
+    fHelpTreeWidget->removeColumn(1);
+    fHelpTreeWidget->removeColumn(0);
+#endif
+  } else {
+    return; 
+  }
+
+  if (fHelpArea) {
+#if QT_VERSION < 0x040200
+    fHelpArea->clear();
+#else
+    fHelpArea->setText("");
+#endif
+  }
+
+  if (fHelpLine) {
+#if QT_VERSION < 0x040200
+    fHelpLine->clear();
+#else
+    fHelpLine->setText("");
+#endif
   }
 
@@ -1864 +1835 @@
 )
 {
-
   // the help tree
   G4UImanager* UI = G4UImanager::GetUIpointer();
@@ -1986 +1956 @@
 #if QT_VERSION < 0x040000
     newItem = new QListViewItem(fHelpTreeWidget);
-    newItem->setText(0,i.data().simplifyWhiteSpace());
+    QString commandStr = i.data().simplifyWhiteSpace();
 #else
     newItem = new QTreeWidgetItem(fHelpTreeWidget);
-    newItem->setText(0,i.value().trimmed());
-#endif
+    QString commandStr = i.value().trimmed();
+#endif
+
+#if QT_VERSION < 0x040000
+    if (commandPath.find("/") == 0) {
+      commandStr = commandStr.right(commandStr.length()-1);
+#else
+    if (commandStr.indexOf("/") == 0) {
+      commandStr = commandStr.right(commandStr.size()-1);
+#endif
+    }
+      
+    newItem->setText(0,commandStr);
     newItem->setText(1,progressStr);