Changeset 1266

Timestamp:

May 26, 2010, 3:47:09 PM (14 years ago)

Author:

garnier

Message:

test qt3

File:

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

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

@@ -261 +261 @@
   // Only at creation. Will be set visible when sessionStart();
 #if QT_VERSION >= 0x040000
-#if QT_VERSION >= 0x040200
+ #if QT_VERSION >= 0x040200
   fTabWidget->setVisible(false);
   fEmptyViewerTabLabel->setVisible(false);
-#else
+ #else
   fTabWidget->hide();
   fEmptyViewerTabLabel->hide();
-#endif
+ #endif
 #else
   fTabWidget->hide();
@@ -343 +343 @@
   // Set visible
 #if QT_VERSION >= 0x040000
-#if QT_VERSION >= 0x040200
+ #if QT_VERSION >= 0x040200
   fMainWindow->setVisible(true);
-#else
+ #else
   fMainWindow->show();
-#endif
+ #endif
 #else
   fMainWindow->show();
@@ -695 +695 @@
 
 #if QT_VERSION >= 0x040000
-#if QT_VERSION >= 0x040200
+ #if QT_VERSION >= 0x040200
   fTabWidget->setVisible(true);
-#else
+  fEmptyViewerTabLabel->setVisible(true);
+ #else
   fTabWidget->show();
-#endif
+  fEmptyViewerTabLabel->show();
+ #endif
 #else
   fTabWidget->show();
-#endif
-
-  fEmptyViewerTabLabel->setVisible(true);
-
-#if QT_VERSION >= 0x040000
-#if QT_VERSION >= 0x040200
+  fEmptyViewerTabLabel->show();
+#endif
+
+
+#if QT_VERSION >= 0x040000
+ #if QT_VERSION >= 0x040200
   fMainWindow->setVisible(true);
-#else
+ #else
   fMainWindow->show();
-#endif
+ #endif
 #else
   fMainWindow->show();
@@ -842 +844 @@
   QStringList result = newStr.filter(fCoutFilter->text());
 #else
-  QStringList result = fCoutFilter->text();
+  //L. Garnier : in qt3 filter will does nothing
+  QStringList result = "";
 #endif
 
@@ -882 +885 @@
   fG4cout += newStr;
  
- QStringList result = newStr.filter(fCoutFilter->text());
+#if QT_VERSION < 0x040000
+  //L. Garnier : in qt3 filter will does nothing
+  QStringList result = "";
+#else
+  QStringList result = newStr.filter(fCoutFilter->text());
+#endif
 
 #if QT_VERSION < 0x040000
@@ -997 +1005 @@
   }
 
+#if QT_VERSION < 0x040000
+  fToolBox->setCurrentItem(fHelpTBWidget);
+#else
   fToolBox->setCurrentWidget(fHelpTBWidget);
+#endif
 }
 
@@ -1013 +1025 @@
   if (! fHelpTreeWidget ) {
 #if QT_VERSION < 0x040000
-    fHelpTreeWidget = new QListView(splitter);
+    fHelpTreeWidget = new QListView(fHelpVSplitter);
 #else
     fHelpTreeWidget = new QTreeWidget();
@@ -1213 +1225 @@
   QString myCommand = aCommand;
   
+#if QT_VERSION < 0x040000
+  if (myCommand.findRev("/") == (myCommand.length()-1)) {
+    myCommand = myCommand.left(myCommand.length()-1);
+#else
   if (myCommand.lastIndexOf("/") == (myCommand.size()-1)) {
     myCommand = myCommand.left(myCommand.size()-1);
+#endif
   }
 
@@ -1596 +1613 @@
   G4UIcommandTree * treeTop = UI->GetTree();
 
+#if QT_VERSION < 0x040000
+  std::string itemText = GetLongCommandPath(item).ascii();
+#else
   std::string itemText = GetLongCommandPath(item).toStdString();
+#endif
   
   G4UIcommand* command = treeTop->FindPath(itemText.c_str());
@@ -1703 +1724 @@
 const QString & text) {
 
-#ifdef G4DEBUG_INTERFACES_BASIC
-  printf("G4UIQt::CoutFilterCallback : %s\n",text.toStdString().c_str());
-#endif
- 
+#if QT_VERSION < 0x040000
+  QStringList result = "";
+#else
   QStringList result = fG4cout.filter(text);
+#endif
 
   fCoutTBTextArea->setText(result.join("\n"));
@@ -2102 +2123 @@
         G4UImanager* UI = G4UImanager::GetUIpointer();
         if(UI != NULL)  {
+#if QT_VERSION < 0x040000
+          UI->ApplyCommand(paramSelect.ascii().c_str());
+#else
           UI->ApplyCommand(paramSelect.toStdString().c_str());
+#endif
         }
       } else {