Changeset 495 for trunk/geant4/interfaces

Timestamp:

Jun 8, 2007, 4:43:47 PM (17 years ago)

Author:

garnier

Message:

r588@mac-90108: laurentgarnier | 2007-06-07 18:17:47 +0200
ajout d un splitter, mais comportement etrange

File:

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

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

@@ -55 +55 @@
 #include <QtGui/qpushbutton.h>
 #include <QtGui/qlabel.h>
+#include <QtGui/qsplitter.h>
 
 #include <stdlib.h>
@@ -99 +100 @@
   fMainWindow = new QMainWindow();
   fMainWindow->setWindowTitle( "G4UI Session" ); 
-  fMainWindow->setBaseSize(300,200);
-  QWidget* centralWidget = new QWidget();
-  QVBoxLayout* vBox = new QVBoxLayout();
+  fMainWindow->resize(600,400);
+  QWidget* central = new QWidget();
+  QWidget* topWidget = new QWidget();
+  QWidget* bottomWidget = new QWidget();
+  QVBoxLayout* vBox1 = new QVBoxLayout();
+  QVBoxLayout* vBox2 = new QVBoxLayout();
+
+  QSplitter *splitter = new QSplitter(Qt::Vertical, central);
   fTextArea = new QTextEdit();
   fCommandHistoryArea = new QTextEdit();
@@ -118 +124 @@
   connect(fCommandArea, SIGNAL(returnPressed()), SLOT(commandEnteredCallback()));
 
-  vBox->addWidget(fTextArea);
-  vBox->addWidget(clearButton);
-  vBox->addWidget(fCommandHistoryArea);
-  vBox->addWidget(fCommandLabel);
-  vBox->addWidget(fCommandArea);
-  centralWidget->setLayout(vBox);
-  fMainWindow->setCentralWidget(centralWidget);
+  vBox1->addWidget(fTextArea);
+  vBox1->addWidget(clearButton);
+
+  vBox2->addWidget(fCommandHistoryArea);
+  vBox2->addWidget(fCommandLabel);
+  vBox2->addWidget(fCommandArea);
+
+  topWidget->setLayout(vBox1);
+  bottomWidget->setLayout(vBox2);
+
+  splitter->addWidget(topWidget);
+  splitter->addWidget(bottomWidget);
+
+  fMainWindow->setCentralWidget(central);
 
 //  QMainWindow top = (QMainWindow)interactorManager->GetMainInteractor();
@@ -302 +315 @@
 /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 {
-// TODO !
-//  XmTextAppendString(text,(char*)a_string.data());
-//  return 0;
+  fTextArea->append((char*)a_string.data());
+  return 0;
 }
 /***************************************************************************/
@@ -316 +328 @@
 /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 {
-// TODO !
-//  XmTextAppendString(text,(char*)a_string.data());
-//  return 0;
+  fTextArea->append((char*)a_string.data());
+  return 0;
 }
 /***************************************************************************/
@@ -419 +430 @@
 /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 {
-  
+   fCommandHistoryArea->append(fCommandArea->text());
    G4String command (fCommandArea->text().toStdString().c_str());
    if(fHelp==true) {
@@ -425 +436 @@
      fHelp = ConvertStringToInt(command.data(),fHelpChoice);
    } else {
-printf("*******************3\n");
      ApplyShellCommand (command,exitSession,exitPause);
-printf("*******************4\n");
    }
-
+   fCommandArea->setText("");
 }
 // /***************************************************************************/
@@ -514 +523 @@
 //   return ss;
 //}
-// /***************************************************************************/
-// void XmTextAppendString (
-//  Widget This
-// ,char* a_string
-// )
-// /***************************************************************************/
-// /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
-// {
-//   if(This==NULL) return;
-//   if(!XtIsSubclass(This,xmTextWidgetClass)) return;
-//   if(a_string==NULL) return;
-//   XmTextPosition  lastpos = XmTextGetLastPosition(This);
-//   XmTextReplace(This,lastpos,lastpos,a_string);
-//   XmTextSetInsertionPosition(This,XmTextGetLastPosition(This));
-// }
 //////////////////////////////////////////////////////////////////////////////
 G4bool ConvertStringToInt(