#include "PartSet_WidgetPoint2dDistance.h"
#include "PartSet_Tools.h"
-#include "PartSet_LockApplyMgr.h"
#include <ModuleBase_ParamSpinBox.h>
#include <ModuleBase_IWorkshop.h>
#include <QMouseEvent>
-#define APPLY_BY_ENTER_OR_TAB
-
PartSet_WidgetPoint2dDistance::PartSet_WidgetPoint2dDistance(QWidget* theParent,
ModuleBase_IWorkshop* theWorkshop,
const Config_WidgetAPI* theData,
const std::string& theParentId)
: ModuleBase_WidgetDoubleValue(theParent, theData, theParentId), myWorkshop(theWorkshop)
{
- myLockApplyMgr = new PartSet_LockApplyMgr(theParent, myWorkshop);
-
myFirstPntName = theData->getProperty("first_point");
-
- // Reconnect to local slot
-#ifdef APPLY_BY_ENTER_OR_TAB
- // Apply widget value change by enter/tab event.
- //disconnect(mySpinBox, SIGNAL(editingFinished()), this, SIGNAL(valuesChanged()));
- disconnect(mySpinBox, SIGNAL(valueStored()), this, SIGNAL(valuesChanged()));
- connect(mySpinBox, SIGNAL(editingFinished()), this, SLOT(onValuesChanged()));
- connect(mySpinBox, SIGNAL(valueChanged(double)), this, SIGNAL(valuesModified()));
-#else
- disconnect(mySpinBox, SIGNAL(valueChanged(double)), this, SIGNAL(valuesChanged()));
- connect(mySpinBox, SIGNAL(valueChanged(double)), this, SLOT(onValuesChanged()));
-#endif
}
PartSet_WidgetPoint2dDistance::~PartSet_WidgetPoint2dDistance()
this, SLOT(onMouseMove(ModuleBase_IViewWindow*, QMouseEvent*)));
connect(aViewer, SIGNAL(mouseRelease(ModuleBase_IViewWindow*, QMouseEvent*)),
this, SLOT(onMouseRelease(ModuleBase_IViewWindow*, QMouseEvent*)));
-
- myLockApplyMgr->activate();
}
void PartSet_WidgetPoint2dDistance::deactivate()
{
+ ModuleBase_ModelWidget::deactivate();
ModuleBase_IViewer* aViewer = myWorkshop->viewer();
disconnect(aViewer, SIGNAL(mouseMove(ModuleBase_IViewWindow*, QMouseEvent*)),
this, SLOT(onMouseMove(ModuleBase_IViewWindow*, QMouseEvent*)));
disconnect(aViewer, SIGNAL(mouseRelease(ModuleBase_IViewWindow*, QMouseEvent*)),
this, SLOT(onMouseRelease(ModuleBase_IViewWindow*, QMouseEvent*)));
-
- myLockApplyMgr->deactivate();
}
void PartSet_WidgetPoint2dDistance::onMouseRelease(ModuleBase_IViewWindow* theWnd, QMouseEvent* theEvent)
std::shared_ptr<GeomAPI_Pnt2d> aPnt = std::shared_ptr<GeomAPI_Pnt2d>(new GeomAPI_Pnt2d(aX, aY));
setPoint(feature(), aPnt);
- emit focusOutWidget(this);
+
+ // if the validator of the control returns false, focus should not be switched
+ if (getError().isEmpty())
+ emit focusOutWidget(this);
}
void PartSet_WidgetPoint2dDistance::onMouseMove(ModuleBase_IViewWindow* theWnd, QMouseEvent* theEvent)
PartSet_Tools::convertTo2D(aPoint, mySketch, theWnd->v3dView(), aX, aY);
std::shared_ptr<GeomAPI_Pnt2d> aPnt = std::shared_ptr<GeomAPI_Pnt2d>(new GeomAPI_Pnt2d(aX, aY));
+ bool isBlocked = blockValueState(true);
setPoint(feature(), aPnt);
-}
-
-void PartSet_WidgetPoint2dDistance::onValuesChanged()
-{
- myLockApplyMgr->valuesChanged();
- emit valuesChanged();
+ blockValueState(isBlocked);
+ setValueState(ModifiedInViewer);
}
bool PartSet_WidgetPoint2dDistance::processEnter()
{
- bool isModified = mySpinBox->isModified();
+ bool isModified = getValueState() == ModifiedInPP;
if (isModified) {
emit valuesChanged();
- mySpinBox->clearModified();
mySpinBox->selectAll();
}
return isModified;