]> SALOME platform Git repositories - modules/shaper.git/commitdiff
Salome HOME
Correction of a distance restart operation.
authornds <nds@opencascade.com>
Wed, 3 Feb 2016 11:11:57 +0000 (14:11 +0300)
committernds <nds@opencascade.com>
Wed, 3 Feb 2016 11:12:58 +0000 (14:12 +0300)
src/ModuleBase/ModuleBase_ModelWidget.h
src/ModuleBase/ModuleBase_WidgetEditor.cpp
src/XGUI/XGUI_PropertyPanel.cpp
src/XGUI/XGUI_PropertyPanel.h
src/XGUI/XGUI_Workshop.cpp

index 35042a6458f6741b988ea49835e2a602c2e4328d..8d6b0be3b3a14d47a54b5ebc4f0d3c0c38aa3c7a 100644 (file)
@@ -218,7 +218,8 @@ signals:
   void keyReleased(QObject* theObject, QKeyEvent* theEvent);
 
   /// The signal is emitted if the enter is clicked in the control of the widget
-  void enterClicked();
+  /// \param theObject a sender of the event
+  void enterClicked(QObject* theObject);
 
   /// The signal about the widget is get focus
   /// \param theWidget the model base widget
index aa4cd79b70bdaa0d9af645402e6779dd43788e61..08086481bd525018bd6447b3b3559bfef6cbca19 100644 (file)
@@ -128,7 +128,7 @@ void ModuleBase_WidgetEditor::showPopupEditor(const bool theSendSignals)
 
     //if (myIsEnterPressedEmitted)
     if (!myIsEditing)
-      emit enterClicked();
+      emit enterClicked(this);
   }
   else
     storeValue();
index 12d5cc63db4f1fbc8a8df344139f0fb904752914..14add657fe2911ac3fa0ae2bf0c861a3d8aba947 100755 (executable)
@@ -123,8 +123,8 @@ void XGUI_PropertyPanel::setModelWidgets(const QList<ModuleBase_ModelWidget*>& t
             this,    SLOT(onActivateNextWidget(ModuleBase_ModelWidget*)));
     connect(aWidget, SIGNAL(keyReleased(QObject*, QKeyEvent*)),
             this,    SIGNAL(keyReleased(QObject*, QKeyEvent*)));
-    connect(aWidget, SIGNAL(enterClicked()),
-            this,    SIGNAL(enterClicked()));
+    connect(aWidget, SIGNAL(enterClicked(QObject*)),
+            this,    SIGNAL(enterClicked(QObject*)));
 
   }
 }
index 4091de92d0fc7bf87122fbea8ee11ab8e474a9d0..958d0ae5908853a81ea15298443b8095c768202f 100644 (file)
@@ -123,7 +123,9 @@ public slots:
   void onActivateNextWidget(ModuleBase_ModelWidget* theWidget);
 
 signals:
-  void enterClicked();
+  /// The signal is emitted if the enter is clicked in the control of the widget
+  /// \param theObject a sender of the event
+  void enterClicked(QObject* theObject);
 
 protected:
   /// Makes the widget active, deactivate the previous, activate and hightlight the given one
index 071d698bbaa16dba787c8d927df7850bd57d7337..9d9b893001d59dae2021650deb8c3b37e7e8ad98 100755 (executable)
@@ -1066,8 +1066,8 @@ void XGUI_Workshop::createDockWidgets()
   connect(myPropertyPanel, SIGNAL(keyReleased(QObject*, QKeyEvent*)),
           myOperationMgr,  SLOT(onKeyReleased(QObject*, QKeyEvent*)));
 
-  connect(myPropertyPanel, SIGNAL(enterClicked()),
-          myOperationMgr,  SLOT(onProcessEnter()));
+  connect(myPropertyPanel, SIGNAL(enterClicked(QObject*)),
+          myOperationMgr,  SLOT(onProcessEnter(QObject*)));
 }
 
 //******************************************************