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

Timestamp:

Mar 3, 2010, 6:02:20 PM (14 years ago)

Author:

garnier

Message:

otpimisations

File:

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

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

@@ -116 +116 @@
 ,fTabWidget(NULL)
 ,fCoutText("Output")
+
 {
 
@@ -161 +162 @@
   QWidget *mainWidget = new QWidget(fMainWindow);
 #if QT_VERSION < 0x040000
-  QSplitter *myVSplitter = new QSplitter(Qt::Horizontal,fMainWindow);
-  fToolBox = new QToolBox(Qt::Horizontal,myVSplitter);
-#else
-  QSplitter *myVSplitter = new QSplitter(Qt::Horizontal,fMainWindow);
+  fMyVSplitter = new QSplitter(Qt::Horizontal,fMainWindow);
+  fToolBox = new QToolBox(Qt::Horizontal,fMyVSplitter);
+#else
+  fMyVSplitter = new QSplitter(Qt::Horizontal,fMainWindow);
   fToolBox = new QToolBox(mainWidget);
 #endif
@@ -171 +172 @@
 
   // Add a empty tabwidget
-  fTabWidget = new G4QTabWidget(myVSplitter);
+  fTabWidget = new G4QTabWidget(fMyVSplitter);
 #if QT_VERSION >= 0x040500
   fTabWidget->setTabsClosable (true); 
@@ -246 +247 @@
   fTabWidget->setSizePolicy(policy);
 
-  myVSplitter->addWidget(fToolBox);
-  myVSplitter->addWidget(fTabWidget);
+  fEmptyViewerTabLabel = new QLabel("         If you want to have a Viewer, please use /vis/open commands. ");
+
+  fMyVSplitter->addWidget(fToolBox);
+  fMyVSplitter->addWidget(fEmptyViewerTabLabel);
+  //  fMyVSplitter->addWidget(fTabWidget);
+
+  // unset parent fot TabWidget
+#if QT_VERSION < 0x040000
+  fTabWidget->reparent(0,0,QPoint(0,0));  
+#else
+  fTabWidget->setParent(0);
+#endif
+
 
 #if QT_VERSION >= 0x040000
@@ -253 +265 @@
 #endif
   commandLineWidget->setSizePolicy (QSizePolicy(QSizePolicy::Minimum,QSizePolicy::Minimum));
-  mainLayout->addWidget(myVSplitter,1);
+  mainLayout->addWidget(fMyVSplitter,1);
   mainLayout->addWidget(commandLineWidget);
 
@@ -287 +299 @@
 
   connect(fCommandArea, SIGNAL(returnPressed()), SLOT(CommandEnteredCallback()));
-
+  connect(fTabWidget,   SIGNAL(tabCloseRequested(int)), this, SLOT(TabCloseCallback(int)));
+  //  connect(fTabWidget,   SIGNAL(currentChanged(int)), this, SLOT(CurrentChangedCallback(int)));
+  connect(fTabWidget, SIGNAL(currentChanged ( int ) ), SLOT(UpdateTabWidget(int)));
   if(UI!=NULL) UI->SetCoutDestination(this);  // TO KEEP
 
@@ -388 +402 @@
   QSplitter *splitter = new QSplitter(Qt::Horizontal);
 #endif
-  helpLine = new QLineEdit(fHelpTBWidget);
+  fHelpLine = new QLineEdit(fHelpTBWidget);
   helpLayout->addWidget(new QLabel("Search :",helpWidget));
-  helpLayout->addWidget(helpLine);
-#if QT_VERSION < 0x040000
-  connect( helpLine, SIGNAL( returnPressed () ), this, SLOT( LookForHelpStringCallback() ) );
-#else
-  connect( helpLine, SIGNAL( editingFinished () ), this, SLOT( LookForHelpStringCallback() ) );
+  helpLayout->addWidget(fHelpLine);
+#if QT_VERSION < 0x040000
+  connect( fHelpLine, SIGNAL( returnPressed () ), this, SLOT( LookForHelpStringCallback() ) );
+#else
+  connect( fHelpLine, SIGNAL( editingFinished () ), this, SLOT( LookForHelpStringCallback() ) );
 #endif
   
@@ -509 +523 @@
   if (!aWidget) return false;
   
+  // Remove QLabel 
+  if ( fMyVSplitter->indexOf(fEmptyViewerTabLabel) != -1) {
+#if QT_VERSION < 0x040000
+    fEmptyViewerTabLabel->reparent(0,0,QPoint(0,0));  
+#else
+    fEmptyViewerTabLabel->setParent(0);
+#endif
+    fMyVSplitter->addWidget(fTabWidget);
+#if QT_VERSION < 0x040000
+    aWidget->reparent(fTabWidget,0,QPoint(0,0));  
+#else
+    aWidget->setParent(fTabWidget);
+#endif
+  }
+
+
+
 #ifdef G4DEBUG_INTERFACES_BASIC
   printf("G4UIQt::AddTabWidget ADD %d %d + %d %d---------------------------------------------------\n",sizeX, sizeY,sizeX-fTabWidget->width(),sizeY-fTabWidget->height());
 #endif
   
-#if QT_VERSION < 0x040000
-  aWidget->reparent(fTabWidget,0,QPoint(0,0));  
-#else
-  aWidget->setParent(fTabWidget);
-#endif
 #ifdef G4DEBUG_INTERFACES_BASIC
   printf("G4UIQt::AddTabWidget resize VVVVVVVVVVVG4UIQt G4UIQt G4UIQt G4UIQt G4UIQt G4UIQt G4UIQt G4UIQt \n");
@@ -529 +555 @@
 
   fTabWidget->insertTab(fTabWidget->count(),aWidget,name);
-
-  if (fTabWidget->count() == 1) {
-    connect(fTabWidget, SIGNAL(currentChanged ( int ) ), SLOT(UpdateTabWidget(int)));
-    //  connect(fTabWidget, SIGNAL(resizeEvent (  QResizeEvent* ) ), SLOT(ResizeTabWidget( QResizeEvent*)));
-  }
+  
+  //   if (fTabWidget->count() == 1) {
+  //    connect(fTabWidget, SIGNAL(currentChanged ( int ) ), SLOT(UpdateTabWidget(int)));
+  //  connect(fTabWidget, SIGNAL(resizeEvent (  QResizeEvent* ) ), SLOT(ResizeTabWidget( QResizeEvent*)));
+  //   }
+
+  fTabWidget->setCurrentIndex(fTabWidget->count()-1);
+  //  UpdateTabWidget(fTabWidget->count()-1);
   // Set visible
 #if QT_VERSION >= 0x040000
@@ -582 +611 @@
 void G4UIQt::UpdateTabWidget(int tabNumber) {
 #ifdef G4DEBUG_INTERFACES_BASIC
-  printf("G4UIQt::UpdateTabWidget\n");
+  printf("G4UIQt::UpdateTabWidget %d\n",tabNumber);
 #endif
   if (  fTabWidget == NULL) {
@@ -588 +617 @@
   }
   
+
 #ifdef G4DEBUG_INTERFACES_BASIC
   printf("G4UIQt::UpdateTabWidget CALL REPAINT tabGL\n");
 #endif
 
+  fTabWidget->setCurrentIndex(tabNumber);
   fTabWidget->setTabSelected();
 
@@ -1575 +1606 @@
 )
 {
-  QString searchText = helpLine->text();
+  QString searchText = fHelpLine->text();
 
 #if QT_VERSION < 0x040200
@@ -1847 +1878 @@
 
 
+  
+void G4UIQt::TabCloseCallback(int a){
+#ifdef G4DEBUG_INTERFACES_BASIC
+  printf("G4UIQt::TabCloseCallback   %d ---------------------------------\n",a);
+#endif
+  QWidget* temp = fTabWidget->widget(a);
+  fTabWidget->removeTab (a);
+  delete temp;
+
+  if (fTabWidget->count() == 0) {
+    fMyVSplitter->addWidget(fEmptyViewerTabLabel);
+#if QT_VERSION < 0x040000
+    fTabWidget->reparent(0,0,QPoint(0,0));  
+#else
+    fTabWidget->setParent(0);
+#endif
+  }
+}
+
+
+void G4UIQt::CurrentChangedCallback(int a){
+#ifdef G4DEBUG_INTERFACES_BASIC
+  printf("G4UIQt::CurrentChangeCallback   %d ---------------------------------\n",a);
+#endif
+
+}
 
 void G4QTabWidget::paintEvent(
@@ -1852 +1909 @@
 )
 {
-  QCoreApplication::sendPostedEvents () ;
 
   if (currentWidget()) {
@@ -1858 +1914 @@
     printf("G4QTabWidget::paintEvent repaint type : %d -- rect %d %d  region:%d %d page : %d %d  ________________________ for = %d i= %d w: %d\n", event->type(),event->rect().height(),event->rect().width(),event->region().boundingRect().width(),event->region().boundingRect().height(),currentWidget()->width(),currentWidget()->height(),this,currentIndex(),currentWidget());
 #endif
-    
     if ( isTabSelected()) {
+
+      QCoreApplication::sendPostedEvents () ;
 #ifdef G4DEBUG_INTERFACES_BASIC
       printf("G4QTabWidget::paintEvent OK\n");
@@ -1865 +1922 @@
       QString text = tabText (currentIndex()); 
       QString paramSelect = QString("/vis/viewer/select ")+text;
-      //  QString paramFlush = QString("/vis/viewer/flush ")+text;
       G4UImanager* UI = G4UImanager::GetUIpointer();
       if(UI!=NULL)  {
         UI->ApplyCommand(paramSelect.toStdString().c_str());
-        //    UI->ApplyCommand(paramFlush.toStdString().c_str());
       }
-
       unselectTab();
       repaint();