+// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
+
// File: PartSet_WidgetPoint2D.cpp
// Created: 25 Apr 2014
// Author: Natalia ERMOLAEVA
-#include "PartSet_WidgetPoint2D.h"
-#include "PartSet_Tools.h"
+#include "PartSet_WidgetPoint2d.h"
+#include <PartSet_Tools.h>
#include <XGUI_Workshop.h>
#include <XGUI_ViewerProxy.h>
#include <XGUI_ModuleConnector.h>
#include <XGUI_SelectionMgr.h>
#include <XGUI_Selection.h>
+#include <XGUI_PropertyPanel.h>
+#include <XGUI_OperationMgr.h>
-#include <ModuleBase_WidgetValueFeature.h>
#include <ModuleBase_DoubleSpinBox.h>
#include <ModuleBase_Tools.h>
#include <ModuleBase_IViewWindow.h>
aGroupLay->setColumnStretch(1, 1);
{
QLabel* aLabel = new QLabel(myGroupBox);
- aLabel->setText("X");
+ aLabel->setText(tr("X"));
aLabel->setPixmap(QPixmap(":pictures/x_point.png"));
aGroupLay->addWidget(aLabel, 0, 0);
myXSpin = new ModuleBase_DoubleSpinBox(myGroupBox);
myXSpin->setMinimum(-DBL_MAX);
myXSpin->setMaximum(DBL_MAX);
- myXSpin->setToolTip("X");
+ myXSpin->setToolTip(tr("X"));
aGroupLay->addWidget(myXSpin, 0, 1);
- connect(myXSpin, SIGNAL(valueChanged(double)), this, SIGNAL(valuesChanged()));
+ connect(myXSpin, SIGNAL(valueChanged(double)), this, SLOT(onValuesChanged()));
}
{
QLabel* aLabel = new QLabel(myGroupBox);
- aLabel->setText("Y");
+ aLabel->setText(tr("Y"));
aLabel->setPixmap(QPixmap(":pictures/y_point.png"));
aGroupLay->addWidget(aLabel, 1, 0);
myYSpin = new ModuleBase_DoubleSpinBox(myGroupBox);
myYSpin->setMinimum(-DBL_MAX);
myYSpin->setMaximum(DBL_MAX);
- myYSpin->setToolTip("X");
+ myYSpin->setToolTip(tr("Y"));
aGroupLay->addWidget(myYSpin, 1, 1);
- connect(myYSpin, SIGNAL(valueChanged(double)), this, SIGNAL(valuesChanged()));
+ connect(myYSpin, SIGNAL(valueChanged(double)), this, SLOT(onValuesChanged()));
}
}
{
}
-bool PartSet_WidgetPoint2D::setValue(ModuleBase_WidgetValue* theValue)
+bool PartSet_WidgetPoint2D::setSelection(ModuleBase_ViewerPrs theValue)
{
+ Handle(V3d_View) aView = myWorkshop->viewer()->activeView();
bool isDone = false;
- if (theValue) {
- ModuleBase_WidgetValueFeature* aFeatureValue =
- dynamic_cast<ModuleBase_WidgetValueFeature*>(theValue);
- if (aFeatureValue) {
- std::shared_ptr<GeomAPI_Pnt2d> aPoint = aFeatureValue->point();
- if (aPoint) {
- setPoint(aPoint->x(), aPoint->y());
- isDone = true;
- }
- }
+ TopoDS_Shape aShape = theValue.shape();
+ double aX, aY;
+ if (getPoint2d(aView, aShape, aX, aY)) {
+ setPoint(aX, aY);
+ isDone = true;
}
return isDone;
}
{
bool isBlocked = this->blockSignals(true);
+ myXSpin->blockSignals(true);
myXSpin->setValue(theX);
+ myXSpin->blockSignals(false);
+
+ myYSpin->blockSignals(true);
myYSpin->setValue(theY);
+ myYSpin->blockSignals(false);
this->blockSignals(isBlocked);
emit valuesChanged();
bool PartSet_WidgetPoint2D::storeValue() const
{
std::shared_ptr<ModelAPI_Data> aData = myFeature->data();
+ if (!aData) // can be on abort of sketcher element
+ return false;
std::shared_ptr<GeomDataAPI_Point2D> aPoint = std::dynamic_pointer_cast<GeomDataAPI_Point2D>(
aData->attribute(attributeID()));
double _Y = myYSpin->value();
#endif
aPoint->setValue(myXSpin->value(), myYSpin->value());
- updateObject(myFeature);
+ // after movement the solver will call the update event: optimization
+ moveObject(myFeature);
aPoint->setImmutable(isImmutable);
that->blockSignals(isBlocked);
double _Y = aPoint->y();
#endif
bool isBlocked = this->blockSignals(true);
+ myXSpin->blockSignals(true);
myXSpin->setValue(aPoint->x());
+ myXSpin->blockSignals(false);
+
+ myYSpin->blockSignals(true);
myYSpin->setValue(aPoint->y());
+ myYSpin->blockSignals(false);
this->blockSignals(isBlocked);
return true;
}
return aControls;
}
-//bool PartSet_WidgetPoint2D::initFromPrevious(ObjectPtr theObject)
-//{
-// if (myOptionParam.length() == 0)
-// return false;
-// std::shared_ptr<ModelAPI_Data> aData = theObject->data();
-// std::shared_ptr<GeomDataAPI_Point2D> aPoint = std::dynamic_pointer_cast<GeomDataAPI_Point2D>(
-// aData->attribute(myOptionParam));
-// if (aPoint) {
-// bool isBlocked = this->blockSignals(true);
-// myXSpin->setValue(aPoint->x());
-// myYSpin->setValue(aPoint->y());
-// this->blockSignals(isBlocked);
-//
-// emit valuesChanged();
-// emit storedPoint2D(theObject, myOptionParam);
-// return true;
-// }
-// return false;
-//}
void PartSet_WidgetPoint2D::activate()
{
disconnect(aViewer, SIGNAL(mouseRelease(ModuleBase_IViewWindow*, QMouseEvent*)),
this, SLOT(onMouseRelease(ModuleBase_IViewWindow*, QMouseEvent*)));
myWorkshop->moduleConnector()->deactivateSubShapesSelection();
+ myWorkshop->operationMgr()->setLockValidating(false);
}
-
-void PartSet_WidgetPoint2D::onMouseRelease(ModuleBase_IViewWindow* theWnd, QMouseEvent* theEvent)
+bool PartSet_WidgetPoint2D::getPoint2d(const Handle(V3d_View)& theView,
+ const TopoDS_Shape& theShape,
+ double& theX, double& theY) const
{
- XGUI_Selection* aSelection = myWorkshop->selector()->selection();
- NCollection_List<TopoDS_Shape> aShapes;
- std::list<ObjectPtr> aObjects;
- aSelection->selectedShapes(aShapes, aObjects);
- if (aShapes.Extent() > 0) {
- TopoDS_Shape aShape = aShapes.First();
- if (!aShape.IsNull()) {
- if (aShape.ShapeType() == TopAbs_VERTEX) {
- const TopoDS_Vertex& aVertex = TopoDS::Vertex(aShape);
- if (!aVertex.IsNull()) {
- // A case when point is taken from existing vertex
- gp_Pnt aPoint = BRep_Tool::Pnt(aVertex);
- double aX, aY;
- PartSet_Tools::convertTo2D(aPoint, mySketch, theWnd->v3dView(), aX, aY);
- setPoint(aX, aY);
- emit vertexSelected(aObjects.front(), aShape);
- QApplication::processEvents();
- emit focusOutWidget(this);
- return;
- }
+ if (!theShape.IsNull()) {
+ if (theShape.ShapeType() == TopAbs_VERTEX) {
+ const TopoDS_Vertex& aVertex = TopoDS::Vertex(theShape);
+ if (!aVertex.IsNull()) {
+ // A case when point is taken from existing vertex
+ gp_Pnt aPoint = BRep_Tool::Pnt(aVertex);
+ PartSet_Tools::convertTo2D(aPoint, mySketch, theView, theX, theY);
+ return true;
}
}
}
+ return false;
+}
+
+
+void PartSet_WidgetPoint2D::onMouseRelease(ModuleBase_IViewWindow* theWnd, QMouseEvent* theEvent)
+{
+ XGUI_Selection* aSelection = myWorkshop->selector()->selection();
+ // TODO: This fragment doesn't work because bug in OCC Viewer. It can be used after fixing.
+ //NCollection_List<TopoDS_Shape> aShapes;
+ //std::list<ObjectPtr> aObjects;
+ //aSelection->selectedShapes(aShapes, aObjects);
+ //if (aShapes.Extent() > 0) {
+ // TopoDS_Shape aShape = aShapes.First();
+ // double aX, aY;
+ // if (getPoint2d(theWnd->v3dView(), aShape, aX, aY)) {
+ // setPoint(aX, aY);
+
+ // PartSet_Tools::setConstraints(mySketch, feature(), attributeID(),aX, aY);
+ // emit vertexSelected(aObjects.front(), aShape);
+ // emit focusOutWidget(this);
+ // return;
+ // }
+ //}
+ // End of Bug dependent fragment
+
// A case when point is taken from mouse event
gp_Pnt aPoint = PartSet_Tools::convertClickToPoint(theEvent->pos(), theWnd->v3dView());
double aX, anY;
- PartSet_Tools::convertTo2D(aPoint, mySketch, theWnd->v3dView(), aX, anY);
+ Handle(V3d_View) aView = theWnd->v3dView();
+ PartSet_Tools::convertTo2D(aPoint, mySketch, aView, aX, anY);
setPoint(aX, anY);
+ std::shared_ptr<GeomDataAPI_Point2D> aFeaturePoint = std::dynamic_pointer_cast<
+ GeomDataAPI_Point2D>(feature()->data()->attribute(attributeID()));
+ QList<FeaturePtr> aIgnore;
+ aIgnore.append(feature());
+
+ double aTolerance = aView->Convert(4);
+ std::shared_ptr<GeomDataAPI_Point2D> aAttrPnt =
+ PartSet_Tools::findAttributePoint(mySketch, aX, anY, aTolerance, aIgnore);
+ if (aAttrPnt.get() != NULL) {
+
+ PartSet_Tools::createConstraint(mySketch, aAttrPnt, aFeaturePoint);
+ emit vertexSelected();
+ }
emit focusOutWidget(this);
}
void PartSet_WidgetPoint2D::onMouseMove(ModuleBase_IViewWindow* theWnd, QMouseEvent* theEvent)
{
+ if (isEditingMode())
+ return;
+ myWorkshop->operationMgr()->setLockValidating(true);
+ myWorkshop->propertyPanel()->setOkEnabled(false);
+
gp_Pnt aPoint = PartSet_Tools::convertClickToPoint(theEvent->pos(), theWnd->v3dView());
double aX, anY;
return myYSpin->value();
}
+void PartSet_WidgetPoint2D::onValuesChanged()
+{
+ myWorkshop->operationMgr()->setLockValidating(false);
+ emit valuesChanged();
+}
