Changeset 504 for trunk/geant4/interfaces/basic/src

Timestamp:

Jun 13, 2007, 12:46:15 PM (17 years ago)

Author:

garnier

Message:

r610@mac-90108: laurentgarnier | 2007-06-13 10:50:13 +0200
les menus sont ok, reste le exit qui n agit pas

File:

• trunk/geant4/interfaces/basic/src/G4UIQt.cc (modified) (5 diffs)

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

@@ -143 +143 @@
   fMainWindow->setCentralWidget(splitter);
 
-
-  QMenu *fileMenu = fMainWindow->menuBar()->addMenu(tr("&File"));
-  fileMenu->addAction("repaint", fMainWindow, SLOT(repaint()));
+  QMenu *fileMenu = fMainWindow->menuBar()->addMenu("File");
   fileMenu->addAction("Quitter", fMainWindow, SLOT(close()));
-  fileMenu->addAction("Hide", fMainWindow, SLOT(hide()));
 
 //  QMainWindow top = (QMainWindow)interactorManager->GetMainInteractor();
@@ -403 +400 @@
 {
   printf("G4UIQt::AddMenu %s %s\n",a_name,a_label);
-  QString *name = new QString(a_name);
-  QString *label = new QString(a_label);
-  menuName.push_back(name);
-  menuLabel.push_back(label);
+
+  QMenu *fileMenu = fMainWindow->menuBar()->addMenu(a_label);
+  AddInteractor (a_name,(G4Interactor)fileMenu);
 
   //  QMenu *menu = new QMenu("test");//a_label);
@@ -438 +434 @@
 /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 {
+  if(a_menu==NULL) return; // TO KEEP
+  if(a_label==NULL) return; // TO KEEP
+  if(a_command==NULL) return; // TO KEEP
+  QMenu *parent = (QMenu*)GetInteractor(a_menu);
+  if(parent==NULL) return;
+  
+  signalMapper = new QSignalMapper(this);
+  QAction *action = parent->addAction(a_label, signalMapper, SLOT(map()));
+  signalMapper->setMapping(action, QString(a_command));
+  connect(signalMapper, SIGNAL(mapped(const QString &)),this, SLOT(buttonCallback(const QString&)));
+  
+  //  std::string slot = SLOT(buttonCallback(std::string));    
   printf("G4UIQt::AddButton %s %s %s\n",a_menu,a_label,a_command);
-//   if(a_menu==NULL) return; // TO KEEP
-//   if(a_label==NULL) return; // TO KEEP
-//   if(a_command==NULL) return; // TO KEEP
-//   Widget parent = (Widget)GetInteractor(a_menu);
-//   if(parent==NULL) return;
+
 //   Widget widget = XmCreatePushButton(parent,(char*)a_label,NULL,0);
 //   XtManageChild (widget);
 //   XtAddCallback (widget,XmNactivateCallback,ButtonCallback,(XtPointer)this);
-//   commands[widget] = a_command;
-}
+//   commands[action] = a_command;
+}
+
+
 // /***************************************************************************/
-// G4String G4UIXm::GetCommand (
-//  Widget a_widget
-// )
+//G4String G4UIQt::GetCommand (
+//  QAction *a_widget
+//)
 // /***************************************************************************/
 // /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
@@ -466 +472 @@
   Send the command to geant4
  */
-// TODO !
+void G4UIQt::buttonCallback (
+  const QString& a_command
+)
+/***************************************************************************/
+/*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
+{
+  if(fHelp==true) return; // Disabled when in help.
+  G4String ss = G4String(a_command.toStdString().c_str());
+  printf ("debug : execute:\n%s\n",ss.data());
+  ApplyShellCommand(ss,exitSession,exitPause);
+}
+
+/**
+  Callback call when "click on a menu entry.
+  Send the associated command to geant4
+ */
 void G4UIQt::commandEnteredCallback (
 )
@@ -482 +503 @@
     }
   }
-  fCommandArea->setText("");
-}
-
- /***************************************************************************/
+  fCommandArea->setText("");}
+}
+
+
+/***************************************************************************/
 void G4UIQt::clearButtonCallback (
 )