Changeset 506 for trunk/geant4/interfaces

Timestamp:

Jun 14, 2007, 5:39:43 PM (17 years ago)

Author:

garnier

Message:

r616@mac-90108: laurentgarnier | 2007-06-13 17:38:01 +0200
debut de l aide sur une nouvealle fenetre

Location:

trunk/geant4/interfaces

Files:

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

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

@@ -96 +96 @@
 //   G4String GetCommand(Widget);
 private:
-  void SecondaryLoop(G4String);
+  void SecondaryLoop(G4String); // a VIRER
   G4bool GetHelpChoice(G4int&);
+  void TerminalHelp(G4String);
+
   void ExitHelp();
 private:

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

@@ -57 +57 @@
 #include <QtGui/qsplitter.h>
 #include <QtGui/qscrollbar.h>
+#include <QtGui/qtreewidget.h>
+#include <QtGui/qdialog.h>
 
 #include <stdlib.h>
@@ -196 +198 @@
   ((QApplication*)interactorManager->GetMainInteractor())->exec(); 
   // on ne passe pas le dessous ? FIXME ????
-
-
-
-
-
+  // je ne pense pas 13/06
 
 //   void* event; // TO KEEP
@@ -207 +205 @@
 //     if(exitSession==true) break; // TO KEEP
 //   } // TO KEEP
-   interactorManager->EnableSecondaryLoop (); // TO KEEP
+
+  interactorManager->EnableSecondaryLoop ();
   printf("enable secondary loop\n");
-  return this; // TO KEEP
+  return this;
 }
 /***************************************************************************/
@@ -444 +443 @@
     fCommandHistoryArea->append(fCommandArea->text());
     if(fHelp==true) {
+  printf ("ne doit plus passer ici\n");
       exitHelp = true;
       fHelp = ConvertStringToInt(command.data(),fHelpChoice);
     } else {
-      ApplyShellCommand (command,exitSession,exitPause);
+      if (command(0,4) != "help") {
+        ApplyShellCommand (command,exitSession,exitPause);
+      } else {
+        printf ("terminal help\n");
+        TerminalHelp(command);
+      }
       if(exitSession==true) 
         SessionTerminate();
@@ -483 +488 @@
 
 #endif
+
+void G4UIQt::TerminalHelp(G4String newCommand)
+{
+  QDialog *helpDialog = new QDialog;
+
+  QSplitter *splitter = new QSplitter(Qt::Horizontal);
+  QTextEdit *textArea = new QTextEdit();
+  QPushButton *exitButton = new QPushButton("Exit");
+  QTreeWidget *treeWidget = new QTreeWidget();
+  connect(exitButton, SIGNAL(clicked()), helpDialog,SLOT(close()));
+
+  textArea->setReadOnly(true);
+
+  // Set layouts
+  QHBoxLayout *splitterLayout = new QHBoxLayout;
+
+  QWidget* topWidget = new QWidget();
+  QVBoxLayout *vLayout = new QVBoxLayout;
+
+  splitterLayout->addWidget(treeWidget);
+  splitterLayout->addWidget(textArea);
+  splitter->setLayout(splitterLayout);
+
+  vLayout->addWidget(splitter);
+  vLayout->addWidget(exitButton);
+  helpDialog->setLayout(vLayout);
+
+
+  helpDialog->show();
+  helpDialog->raise();
+  helpDialog->activateWindow();
+  ////////////////
+
+  printf ("G4UIQt::TerminalHelp \n");
+//   G4UImanager* UI = G4UImanager::GetUIpointer();
+//   if(UI==NULL) return;
+//   G4UIcommandTree * treeTop = UI->GetTree();
+//   size_t i = newCommand.index(" ");
+//   if( i != std::string::npos )
+//   {
+//     G4String newValue = newCommand(i+1,newCommand.length()-(i+1));
+//     newValue.strip(G4String::both);
+//     G4String targetCom = ModifyToFullPathCommand( newValue );
+//     G4UIcommand* theCommand = treeTop->FindPath( targetCom );
+//     if( theCommand != NULL ) 
+//     { 
+//       theCommand->List();
+//       return;
+//     }
+//     else
+//     {
+//       G4cout << "Command <" << newValue << " is not found." << G4endl;
+//       return;
+//     }
+//   }
+
+//   G4UIcommandTree * floor[10];
+//   floor[0] = treeTop;
+//   G4int iFloor = 0;
+//   size_t prefixIndex = 1;
+//   G4String prefix = GetCurrentWorkingDirectory();
+//   while( prefixIndex < prefix.length()-1 )
+//   {
+//     size_t ii = prefix.index("/",prefixIndex);
+//     floor[iFloor+1] = 
+//       floor[iFloor]->GetTree(G4String(prefix(0,ii+1)));
+//     prefixIndex = ii+1;
+//     iFloor++;
+//   }
+//   floor[iFloor]->ListCurrentWithNum();
+//   // 1998 Oct 2 non-number input
+//   while(1){
+//    //G4cout << G4endl << "Type the number ( 0:end, -n:n level back ) : "<<std::flush;
+//     G4cout << G4endl << "Type the number ( 0:end, -n:n level back ) : "<<G4endl;
+//     G4int i;
+//     if(!GetHelpChoice(i)){
+//       G4cout << G4endl << "Not a number, once more" << G4endl; 
+//       continue;
+//     } else if( i < 0 ){
+//       iFloor += i;
+//       if( iFloor < 0 ) iFloor = 0;
+//       floor[iFloor]->ListCurrentWithNum(); 
+//       continue;
+//     } else if(i == 0) { 
+//       break;
+//     } else if( i > 0 ) {
+//       G4int n_tree = floor[iFloor]->GetTreeEntry();
+//       if( i > n_tree )
+//       { 
+//         if( i <= n_tree + floor[iFloor]->GetCommandEntry() )
+//         { 
+//           floor[iFloor]->GetCommand(i-n_tree)->List(); 
+//         }
+//       }
+//       else
+//       {
+//         floor[iFloor+1] = floor[iFloor]->GetTree(i);
+//         iFloor++;
+//         floor[iFloor]->ListCurrentWithNum();
+//       }
+//     }
+//   }
+  G4cout << "Exit from HELP." << G4endl << G4endl;
+  //G4cout << G4endl;
+  ExitHelp();
+}
+
+
+
+
+
+
+
+
+
+
+
+

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

@@ -132 +132 @@
 //  QtAppNextEvent (appContext, &event);
 //  return         &event;
-  printf(" Si j'ai bien compris, cette fonction ne sert à rien");
+  printf("*");
 }
 /***************************************************************************/