X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModuleBase%2FModuleBase_WidgetEditor.h;h=4c485d19974c8543045c5be5a6c38d22b5fecb19;hb=b3025c793455da0df5d0fe83455a7f45c64e885e;hp=8f494b366decf324104319c0fbc82f85658b219c;hpb=cbde248859fb0072f6012907391ea90cfc254574;p=modules%2Fshaper.git

diff --git a/src/ModuleBase/ModuleBase_WidgetEditor.h b/src/ModuleBase/ModuleBase_WidgetEditor.h
index 8f494b366..4c485d199 100644
--- a/src/ModuleBase/ModuleBase_WidgetEditor.h
+++ b/src/ModuleBase/ModuleBase_WidgetEditor.h
@@ -1,8 +1,22 @@
-// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
-
-// File:        ModuleBase_WidgetEditor.h
-// Created:     25 Apr 2014
-// Author:      Natalia ERMOLAEVA
+// Copyright (C) 2014-2017  CEA/DEN, EDF R&D
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+// See http://www.salome-platform.org/ or
+// email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com>
+//
 
 #ifndef ModuleBase_WidgetEditor_H
 #define ModuleBase_WidgetEditor_H
@@ -14,6 +28,7 @@
 #include <QStringList>
 
 class ModelAPI_Feature;
+class QDialog;
 class QLineEdit;
 
 /**\class ModuleBase_WidgetEditor
@@ -27,9 +42,7 @@ Q_OBJECT
   /// Constructor
   /// \param theParent the parent object
   /// \param theData the widget configuation. The attribute of the model widget is obtained from
-  /// \param theParentId is Id of a parent of the current attribute
-  ModuleBase_WidgetEditor(QWidget* theParent, const Config_WidgetAPI* theData,
-                          const std::string& theParentId);
+  ModuleBase_WidgetEditor(QWidget* theParent, const Config_WidgetAPI* theData);
   /// Constructor
   /// \param theParent the parent object
   /// \param theAttribute The attribute of the model widget
@@ -38,28 +51,50 @@ Q_OBJECT
   /// Destructor
   virtual ~ModuleBase_WidgetEditor();
 
-  /// Set focus to the first control of the current widget. The focus policy of the control is checked.
+  /// Set focus to the first control of the current widget.
+  /// The focus policy of the control is checked.
   /// If the widget has the NonFocus focus policy, it is skipped.
   /// \return the state whether the widget can accept the focus
   virtual bool focusTo();
 
-   /// Shous popup window under cursor for data editing
-   void showPopupEditor();
+  /// Shous popup window under cursor for data editing
+  /// \param theSendSignals a flag whether the signals should be sent or the value
+  /// is to be applyed directly
+  /// \return true if the editor value is accepted
+  bool showPopupEditor(const bool theSendSignals = true);
+
+  /// Set current cursor position
+  /// \param theX the X coordinate
+  /// \param theY the Y coordinate
+  void setCursorPosition(const int theX, const int theY);
 
-protected slots:
-  void onKeyReleased(QKeyEvent* theEvent);
+protected:
+  /// Returns true if the event is processed.
+  virtual bool processEnter();
+
+  /// Reject the current editor dialog if it is shown and returns true.
+  virtual bool processEscape();
 
 private:
-   void editedValue(double& outValue, QString& outText);
+  /// Show editor
+  /// \param theSpinMinValue a minimal value of popup menu spin box
+  /// \param theSpinMaxValue a maximum value of popup menu spin box
+  /// \param theOutValue a result value
+  /// \param theOutText a result text
+  /// \return true if the editor value is accepted
+  bool editedValue(double theSpinMinValue, double theSpinMaxValue,
+                   double& theOutValue, QString& theOutText);
 
  private:
    ///< the current widget feature
-   FeaturePtr myFeature;  
+   FeaturePtr myFeature;
 
    ///< the kinds of possible features
-   QStringList myFeatureKinds;  
+   QStringList myFeatureKinds;
+
+   int myXPosition, myYPosition;
 
-   bool myIsKeyReleasedEmitted;
+   QDialog* myEditorDialog;
 };
 
 #endif