Changeset 519 for trunk/geant4/interfaces

Timestamp:

Jun 20, 2007, 6:41:53 PM (17 years ago)

Author:

garnier

Message:

r642@mac-90108: laurentgarnier | 2007-06-20 18:45:19 +0200
debut avant les fleches

Location:

trunk/geant4/interfaces/basic

Files:

• include/G4UIQt.hh (modified) (4 diffs)
• src/G4UIQt.cc (modified) (7 diffs)
• src/G4UIQt_moc.cc (modified) (5 diffs)

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

@@ -40 +40 @@
 #include <QtGui/qmainwindow.h>
 #include <QtGui/qlineedit.h>
+#include <QtGui/qlistwidget.h>
 #include <QtGui/qtextedit.h>
 #include <QtGui/qlabel.h>
@@ -97 +98 @@
   //   G4String GetCommand(Widget);
 
-  // Some useful getters
-  inline const QTextEdit * GetCommandHistoryArea() const
-  { return fCommandHistoryArea; };
-
 private:
   void SecondaryLoop(G4String); // a VIRER
@@ -123 +120 @@
   QTextEdit *fTextArea;
   QTextEdit *fHelpArea;
-  QTextEdit *fCommandHistoryArea;
+  QListWidget *fCommandHistoryArea;
   QSignalMapper *signalMapper ;
   QTreeWidget *fHelpTreeWidget;
@@ -137 +134 @@
   void helpTreeCallback();
   void showHelpCallback();
+  void commandHistoryCallback();
 };
 

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

@@ -109 +109 @@
   connect(clearButton, SIGNAL(clicked()), SLOT(clearButtonCallback()));
 
-  fCommandHistoryArea = new QTextEdit();
+  fCommandHistoryArea = new QListWidget();
+  fCommandHistoryArea->setSelectionMode(QAbstractItemView::SingleSelection);
+  connect(fCommandHistoryArea, SIGNAL(itemSelectionChanged()), SLOT(commandHistoryCallback()));
   fCommandLabel = new QLabel();
 
-  //  fCommandArea = new G4UIQtLineEdit(this); // must surcharge the keyPressEvent function
   fCommandArea = new QLineEdit();
   fCommandArea->installEventFilter(this);
@@ -120 +121 @@
   fCommandArea->setFocus(Qt::TabFocusReason);
   fTextArea->setReadOnly(true);
-  fCommandHistoryArea->setReadOnly(true);
-
-  //  virtual void keyPressEvent(QKeyEvent *e) {
-  //    if (e->key == Qt::Key_F9) {
-  // Do something
-  //}
-  //}
+
 
   // Set layouts
@@ -375 +370 @@
     G4UIcommandTree * treeTop = UI->GetTree();
 
-
-  // en test : creation de doc html
-
-
-    treeTop->CreateHTML();
-    printf("************ create file : -%s-**********\n",((char*)treeTop->GetPathName().data()));
-
-
-
-
-
-
-
-  //
     // build widget
     fHelpTreeWidget = new QTreeWidget();
@@ -592 +573 @@
 {
   printf("G4UIQt::GetHelpChoice SHOULD NEVER GO HERE");
-}
+  return true;
+}
+
 /***************************************************************************/
 void G4UIQt::ExitHelp(
@@ -622 +605 @@
     if (event->type() == QEvent::KeyPress) {
       QKeyEvent *e = static_cast<QKeyEvent*>(event);
-      if (e->key() == (Qt::Key_Down)) {
-        printf("****************KEY PRESSED DOWN*****\n");
-      } else if (e->key() == (Qt::Key_PageDown)) {
-        printf("****************KEY PRESSED PAGE DOWN*****\n");
-      } else if (e->key() == (Qt::Key_Up)) {
-        printf("****************KEY PRESSED UP*****\n");
-      } else if (e->key() == (Qt::Key_PageUp)) {
-        printf("****************KEY PRESSED PAGE UP*****\n");
-        //      } else {
-        //        return QObject::eventFilter(obj, event);
+      if ((e->key() == (Qt::Key_Down)) ||
+          (e->key() == (Qt::Key_PageDown)) ||
+          (e->key() == (Qt::Key_Up)) ||
+          (e->key() == (Qt::Key_PageUp))) {
+        int selection = fCommandHistoryArea->currentRow();
+        printf("-selection : %d\n",selection);
+        if (fCommandHistoryArea->count()) {
+          if (selection == -1) {
+            selection = fCommandHistoryArea->count()-1;
+          }
+          printf("selection : %d\n",selection);
+          if (e->key() == (Qt::Key_Down)) {
+            printf("****************KEY PRESSED DOWN*****%d <= %d\n",selection,fCommandHistoryArea->count());
+            if (selection <(fCommandHistoryArea->count()-1))
+              selection++;
+          } else if (e->key() == (Qt::Key_PageDown)) {
+            selection = fCommandHistoryArea->count()-1;
+            printf("****************KEY PRESSED PAGE DOWN*****\n");
+          } else if (e->key() == (Qt::Key_Up)) {
+            if (selection >0)
+              selection --;
+            printf("****************KEY PRESSED UP*****\n");
+          } else if (e->key() == (Qt::Key_PageUp)) {
+            selection = 0;
+            printf("****************KEY PRESSED PAGE UP*****\n");
+          }
+          fCommandHistoryArea->clearSelection();
+          fCommandHistoryArea->item(selection)->setSelected(true);
+        }
       }
-      //    } else {
-      //      return QObject::eventFilter(obj, event);
     }
-    //  } else {
-  }
+  }
+  
   // pass the event on to the parent class
   return QObject::eventFilter(obj, event);
-  //  return true;
 }
 
@@ -683 +682 @@
   G4String command (fCommandArea->text().toStdString().c_str());
   if (fCommandArea->text().toStdString().c_str() != "") {
-    fCommandHistoryArea->append(fCommandArea->text());
+    fCommandHistoryArea->addItem(fCommandArea->text());
 
     if (command(0,4) != "help") {
@@ -750 +749 @@
 
 
+
+void G4UIQt::commandHistoryCallback(
+)
+/***************************************************************************/
+/*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
+{
+  //  G4bool GetHelpChoice(G4int&);
+  QListWidgetItem* item =  NULL;
+  if (!fCommandHistoryArea)
+    return ;
+
+  
+  QList<QListWidgetItem *> list =fCommandHistoryArea->selectedItems();
+  if (list.isEmpty())
+    return;
+  item = list.first();
+  if (!item)
+    return;
+  fCommandArea->setText(item->text());
+
+}
+
 #endif

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

@@ -2 +2 @@
 ** Meta object code from reading C++ file 'G4UIQt.hh'
 **
-** Created: Tue Jun 19 15:07:52 2007
+** Created: Wed Jun 20 18:07:19 2007
 **      by: The Qt Meta Object Compiler version 59 (Qt 4.2.2)
 **
@@ -23 +23 @@
        0,       // classname
        0,    0, // classinfo
-       6,   10, // methods
+       7,   10, // methods
        0,    0, // properties
        0,    0, // enums/sets
@@ -36 +36 @@
      103,   31,   31,   31, 0x08,
      122,   31,   31,   31, 0x08,
+     141,   31,   31,   31, 0x08,
 
        0        // eod
@@ -44 +45 @@
     "clearButtonCallback()\0commandEnteredCallback()\0"
     "buttonCallback(QString)\0helpTreeCallback()\0"
-    "showHelpCallback()\0"
+    "showHelpCallback()\0commandHistoryCallback()\0"
 };
 
@@ -82 +83 @@
         case 4: helpTreeCallback(); break;
         case 5: showHelpCallback(); break;
+        case 6: commandHistoryCallback(); break;
         }
-        _id -= 6;
+        _id -= 7;
     }
     return _id;