Changeset 518

Timestamp:

Jun 20, 2007, 12:24:52 PM (17 years ago)

Author:

garnier

Message:

r637@mac-90108: laurentgarnier | 2007-06-20 12:28:10 +0200
deplacement et suppression de la classe G4UIQtLineEdit et mise en place de son equivalent dans la classe G4UIQt

Location:

trunk/geant4/interfaces/basic

Files:

• include/G4UIQt.hh (modified) (1 diff)
• include/G4UIQtLineEdit.hh (deleted)
• src/G4UIQt.cc (modified) (4 diffs)
• src/G4UIQtLineEdit.cc (deleted)

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

@@ -110 +110 @@
   G4bool GetHelpChoice(G4int&) ;// have to be implemeted because we heritate from G4VBasicShell
   void ExitHelp();// have to be implemeted because we heritate from G4VBasicShell
+  bool eventFilter(QObject*,QEvent*);
 
 private:

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

@@ -46 +46 @@
 #include "G4UIcommandStatus.hh"
 
-#include "G4UIQtLineEdit.hh"
-
 #include "G4Qt.hh"
 
@@ -60 +58 @@
 #include <QtGui/qscrollbar.h>
 #include <QtGui/qdialog.h>
+#include <QtGui/qevent.h>
 
 #include <stdlib.h>
@@ -113 +112 @@
   fCommandLabel = new QLabel();
 
-  fCommandArea = new G4UIQtLineEdit(this); // must surcharge the keyPressEvent function
+  //  fCommandArea = new G4UIQtLineEdit(this); // must surcharge the keyPressEvent function
+  fCommandArea = new QLineEdit();
+  fCommandArea->installEventFilter(this);
   fCommandArea->activateWindow();
   connect(fCommandArea, SIGNAL(returnPressed()), SLOT(commandEnteredCallback()));
@@ -602 +603 @@
 
 
+/**
+ Event filter method. Every event from QtApplication goes here.
+ We apply a filter only for the Up and Down Arrow press when the QLineEdit
+ is active. If this filter match, Up arrow we give the previous command
+ and Down arrow will give the next if exist.
+ @param obj Emitter of the event
+ @param event Kind of event
+*/
+/***************************************************************************/
+bool G4UIQt::eventFilter(
+ QObject *obj
+,QEvent *event
+)
+/***************************************************************************/
+/*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
+{
+  if (obj == fCommandArea) {
+    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);
+      }
+      //    } else {
+      //      return QObject::eventFilter(obj, event);
+    }
+    //  } else {
+  }
+  // pass the event on to the parent class
+  return QObject::eventFilter(obj, event);
+  //  return true;
+}
+
+
+
+
 /***************************************************************************/
 //