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

Timestamp:

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

Author:

garnier

Message:

r611@mac-90108: laurentgarnier | 2007-06-13 12:27:43 +0200
resolution du ticket #55

File:

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

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

@@ -94 +94 @@
 {
   G4Qt* interactorManager = G4Qt::getInstance ();
-  G4UImanager* UI = G4UImanager::GetUIpointer(); // TO KEEP
-  if(UI!=NULL) UI->SetSession(this); // TO KEEP
+  G4UImanager* UI = G4UImanager::GetUIpointer();
+  if(UI!=NULL) UI->SetSession(this);
 
   fMainWindow = new QMainWindow();
   fMainWindow->setWindowTitle( "G4UI Session" ); 
   fMainWindow->resize(800,600); 
+  fMainWindow->move(QPoint(300,100));
 
   QSplitter *splitter = new QSplitter(Qt::Vertical);
@@ -118 +119 @@
 
   
+
+  // Set layouts
   QVBoxLayout *layoutSplitter = new QVBoxLayout;
 
@@ -146 +149 @@
   fileMenu->addAction("Quitter", fMainWindow, SLOT(close()));
 
-//  QMainWindow top = (QMainWindow)interactorManager->GetMainInteractor();
-
-//   if(getenv("XENVIRONMENT")==NULL) {
-//     XrmDatabase database = XrmGetDatabase(XtDisplay(top));
-//     if(database!=NULL) {
-//       XrmPutLineResource(&database,"*topShadowColor:white");
-//       XrmPutLineResource(&database,"*bottomShadowColor:black");
-//       XrmPutLineResource(&database,"*foreground:black");
-//       XrmPutLineResource(&database,"*background:lightgrey");
-//       XrmPutLineResource(&database,"*borderColor:lightgrey");
-//       XrmPutLineResource(&database,"*fontList:-*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-1");
-//       XrmPutLineResource(&database,"*text.background:white");
-//       XrmPutLineResource(&database,"*text.fontList:*courier*-r-*--14-*");
-//       XrmPutLineResource(&database,"*text.maxLength:8000");
-//     }
-//   }
-
-//   Arg args[9];
-//   XtSetArg(args[0],XmNkeyboardFocusPolicy,XmPOINTER); // For completion.
-//   shell = XtAppCreateShell ("G4UIXm","G4UIXm",
-//                          topLevelShellWidgetClass,XtDisplay(top),
-//                          args,1); 
-//   form = XmCreateForm (shell,(char*)"form",NULL,0);
-//   XtManageChild (form);
-
-//   XtSetArg(args[0],XmNtopAttachment   ,XmATTACH_FORM);
-//   XtSetArg(args[1],XmNleftAttachment  ,XmATTACH_FORM);
-//   XtSetArg(args[2],XmNrightAttachment ,XmATTACH_FORM);
-//   menuBar = XmCreateMenuBar (form,(char*)"menuBar",args,3);
-
-//   XtSetArg(args[0],XmNtopAttachment      ,XmATTACH_NONE);
-//   XtSetArg(args[1],XmNleftAttachment     ,XmATTACH_FORM);
-//   XtSetArg(args[2],XmNrightAttachment    ,XmATTACH_FORM);
-//   XtSetArg(args[3],XmNbottomAttachment   ,XmATTACH_FORM);
-//   command = XmCreateCommand (form,(char*)"command",args,4);
-//   XtManageChild (command);
-
-//   XtSetArg(args[0],XmNtopAttachment   ,XmATTACH_NONE);
-//   XtSetArg(args[1],XmNleftAttachment  ,XmATTACH_FORM);
-//   XtSetArg(args[2],XmNrightAttachment ,XmATTACH_FORM);
-//   XtSetArg(args[3],XmNbottomAttachment,XmATTACH_WIDGET);
-//   XtSetArg(args[4],XmNbottomWidget    ,command);
-//   XmString cps = XmStringLtoRCreate((char*)"Clear",XmSTRING_DEFAULT_CHARSET);
-//   XtSetArg (args[5],XmNlabelString,cps);
-//   Widget clearButton = XmCreatePushButton(form,(char*)"clearButton",args,6);
-//   XmStringFree (cps);
-//   XtManageChild (clearButton);
-
-//   XtSetArg(args[0],XmNtopAttachment   ,XmATTACH_WIDGET);
-//   XtSetArg(args[1],XmNtopWidget       ,menuBar);
-//   XtSetArg(args[2],XmNleftAttachment  ,XmATTACH_FORM);
-//   XtSetArg(args[3],XmNrightAttachment ,XmATTACH_FORM);
-//   XtSetArg(args[4],XmNbottomAttachment,XmATTACH_WIDGET);
-//   XtSetArg(args[5],XmNbottomWidget    ,clearButton);
-//   XtSetArg(args[6],XmNeditMode        ,XmMULTI_LINE_EDIT);
-//   XtSetArg(args[7],XmNrows            ,12);
-//   XtSetArg(args[8],XmNcolumns         ,80);
-//   text = XmCreateSGcrolledText (form,(char*)"text",args,9);
-//   XtManageChild (text);
-
-//   XtAddCallback(clearButton,XmNactivateCallback,
-//              clearButtonCallback,(XtPointer)text);
-//   XtAddCallback(command,XmNcommandEnteredCallback,
-//              commandEnteredCallback,(XtPointer)this);
-
-//   Widget commandText = XmCommandGetChild(command,XmDIALOG_COMMAND_TEXT);
-//   XtAddEventHandler(commandText,KeyPressMask,False,keyHandler,(XtPointer)this);
-
-//   XtRealizeWidget(shell);
-//   XtMapWidget(shell);
+  // Set the splitter size. The fTextArea sould be 2/3 on the fMainWindow
+  QList<int> vals = splitter->sizes();
+  if(vals.size()==2) {
+    vals[0] = (splitter->orientation()==Qt::Vertical ? splitter->height() : splitter->width())*3/4;
+    vals[1] = (splitter->orientation()==Qt::Vertical ? splitter->height() : splitter->width())*1/4;
+    splitter->setSizes(vals);
+  }
+
 
   if(UI!=NULL) UI->SetCoutDestination(this);  // TO KEEP
@@ -289 +230 @@
 /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 {
+  G4Qt* interactorManager = G4Qt::getInstance ();
+  fMainWindow->close();
+  ((QApplication*)interactorManager->GetMainInteractor())->exit(); 
 }
 /***************************************************************************/
@@ -480 +424 @@
   if(fHelp==true) return; // Disabled when in help.
   G4String ss = G4String(a_command.toStdString().c_str());
-  printf ("debug : execute:\n%s\n",ss.data());
+  printf ("debug : execute:\n-%s- %d %d \n",ss.data(),exitSession,exitPause);
   ApplyShellCommand(ss,exitSession,exitPause);
+  if(exitSession==true) 
+    SessionTerminate();
 }
 
@@ -493 +439 @@
 /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 {
+  printf ("debug : callback\n");
   G4String command (fCommandArea->text().toStdString().c_str());
   if (fCommandArea->text().toStdString().c_str() != "") {
@@ -501 +448 @@
     } else {
       ApplyShellCommand (command,exitSession,exitPause);
+      if(exitSession==true) 
+        SessionTerminate();
     }
   }
-  fCommandArea->setText("");}
+  fCommandArea->setText("");
 }