Changeset 1232

Timestamp:

Jan 28, 2010, 4:53:04 PM (14 years ago)

Author:

garnier

Message:

debug visu

Location:

trunk/source/interfaces

Files:

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

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

@@ -100 +100 @@
   // Ex : AddButton("my_menu","Run","/run/beamOn 1"); 
 
-  void AddTabWidget(QWidget*,QString,int,int);
+  bool AddTabWidget(QWidget*,QString,int,int);
   // To add a tab for vis openGL Qt driver
+  
+  bool IsSplitterReleased();
 
 public:

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

@@ -295 +295 @@
 #endif
 
+  // Set visible
+#if QT_VERSION >= 0x040000
+#if QT_VERSION >= 0x040200
+  fMainWindow->setVisible(true);
+#else
+  fMainWindow->show();
+#endif
+#else
+  fMainWindow->show();
+#endif
+
 #ifdef G4DEBUG_INTERFACES_BASIC
   printf("G4UIQt::G4UIQt END\n");
@@ -478 +489 @@
   Create the tab if it was not done
 */
-void G4UIQt::AddTabWidget(
+bool G4UIQt::AddTabWidget(
  QWidget* aWidget
 ,QString name
@@ -485 +496 @@
 )
 {
+
 #ifdef G4DEBUG_INTERFACES_BASIC
   printf("G4UIQt::AddTabWidget %d %d\n",sizeX, sizeY);
 #endif
-  if (!aWidget) return;
+  if (!aWidget) return false;
   
 #ifdef G4DEBUG_INTERFACES_BASIC
@@ -499 +511 @@
   aWidget->setParent(fTabWidget);
 #endif
-    
+#ifdef G4DEBUG_INTERFACES_BASIC
+  printf("G4UIQt::AddTabWidget resize VVVVVVVVVVVG4UIQt G4UIQt G4UIQt G4UIQt G4UIQt G4UIQt G4UIQt G4UIQt \n");
+  printf("G4UIQt::AddTabWidget resize 22222222222 W---:%d + sx:%d -fwx:%d   H---:%d + sy:%d -fwy:%d    TabW:%d TabH:%d G4UIQt G4UIQt aWX:%d aWY:%d\n",fMainWindow->width(),sizeX,fTabWidget->width(),fMainWindow->height(),sizeY,fTabWidget->height(),fTabWidget->width(),fTabWidget->height(),aWidget->size().height(),aWidget->size().width());
+#endif
+
+  fMainWindow->resize(fMainWindow->width()+sizeX-fTabWidget->width(),fMainWindow->height()+sizeY-fTabWidget->height());
+
+  // Problems with resize. The widgets are not realy drawn at this step,
+  // then we have to force them on order to check the size
+
   fTabWidget->insertTab(fTabWidget->count()-1,aWidget,name);
-  
-  fMainWindow->resize(fMainWindow->width()+sizeX-fTabWidget->width(),
-                      fMainWindow->height()+sizeY-fTabWidget->height());
+ 
+  // Set visible
+#if QT_VERSION >= 0x040000
+#if QT_VERSION >= 0x040200
+  fMainWindow->setVisible(true);
+#else
+  fMainWindow->show();
+#endif
+#else
+  fMainWindow->show();
+ #endif
+  
+  
+
+// //   // Check size
+// //   int offX = (sizeX-aWidget->size().width());
+// //   int offY = (sizeY-aWidget->size().height());
+
+// // #ifdef G4DEBUG_INTERFACES_BASIC
+// //   printf("G4UIQt::AddTabWidget resize AFTER FIRST 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
+
+// //   // and correct if necessairy
+// //   if ((offX != 0) ||(offY != 0)) {
+// //     fMainWindow->resize(fMainWindow->width()+offX,fMainWindow->height()+offY);
+// //     // Re-Set visible
+// // #if QT_VERSION >= 0x040000
+// // #if QT_VERSION >= 0x040200
+// //     fMainWindow->setVisible(true);
+// // #else
+// //     fMainWindow->show();
+// // #endif
+// // #else
+// //     fMainWindow->show();
+// // #endif
+// //   }
+
+// // #ifdef G4DEBUG_INTERFACES_BASIC
+// //   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
+  
+  return true;
 }
 
@@ -555 +617 @@
 )
 {
+#ifdef G4DEBUG_INTERFACES_BASIC
+  printf("G4UIQt::G4UIQt SessionStart\n");
+#endif
 
   G4Qt* interactorManager = G4Qt::getInstance ();
+
+  Prompt("Session :");
+  exitSession = false;
 
 #if QT_VERSION >= 0x040000
@@ -567 +635 @@
   fMainWindow->show();
 #endif
-  Prompt("Session :");
-  exitSession = false;
-
-
+
+#ifdef G4DEBUG_INTERFACES_BASIC
+  printf("G4UIQt::G4UIQt SessionStart2\n");
+#endif
   interactorManager->DisableSecondaryLoop (); // TO KEEP
   if ((QApplication*)interactorManager->GetMainInteractor())
@@ -1764 +1832 @@
   return commandResultMap;
 }
-#endif
+
+#endif

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

@@ -240 +240 @@
 {
   if (fG4UI != NULL) {
-    fG4UI->AddTabWidget(vis,name,sizeX,sizeY);
-    return true;
+    return fG4UI->AddTabWidget(vis,name,sizeX,sizeY);
   }
   return false;