#include <XGUI_ModuleConnector.h>
#include <XGUI_SelectionMgr.h>
#include <XGUI_Selection.h>
-#include <XGUI_PropertyPanel.h>
#include <XGUI_OperationMgr.h>
#include <ModuleBase_DoubleSpinBox.h>
#include <GeomDataAPI_Point2D.h>
#include <GeomAPI_Pnt2d.h>
+#include <SketchPlugin_Feature.h>
+
#include <QGroupBox>
#include <QGridLayout>
#include <QLabel>
#include <cfloat>
#include <climits>
+const double MaxCoordinate = 1e12;
+
+
PartSet_WidgetPoint2D::PartSet_WidgetPoint2D(QWidget* theParent,
const Config_WidgetAPI* theData,
const std::string& theParentId)
}
}
+void PartSet_WidgetPoint2D::reset()
+{
+ bool isOk;
+ double aDefValue = QString::fromStdString(myDefaultValue).toDouble(&isOk);
+
+ myXSpin->setValue(isOk ? aDefValue : 0.0);
+ myYSpin->setValue(isOk ? aDefValue : 0.0);
+}
+
PartSet_WidgetPoint2D::~PartSet_WidgetPoint2D()
{
}
TopoDS_Shape aShape = theValue.shape();
double aX, aY;
if (getPoint2d(aView, aShape, aX, aY)) {
- setPoint(aX, aY);
- isDone = true;
+ isDone = setPoint(aX, aY);
}
return isDone;
}
-void PartSet_WidgetPoint2D::setPoint(double theX, double theY)
+bool PartSet_WidgetPoint2D::setPoint(double theX, double theY)
{
-
+ if (fabs(theX) >= MaxCoordinate)
+ return false;
+ if (fabs(theY) >= MaxCoordinate)
+ return false;
bool isBlocked = this->blockSignals(true);
myXSpin->blockSignals(true);
myXSpin->setValue(theX);
myYSpin->blockSignals(false);
this->blockSignals(isBlocked);
- emit valuesChanged();
+ storeValue();
+ return true;
}
bool PartSet_WidgetPoint2D::storeValue() const
}
-void PartSet_WidgetPoint2D::activate()
+void PartSet_WidgetPoint2D::activateCustom()
{
XGUI_ViewerProxy* aViewer = myWorkshop->viewer();
connect(aViewer, SIGNAL(mouseMove(ModuleBase_IViewWindow*, QMouseEvent*)),
QIntList aModes;
aModes << TopAbs_VERTEX;
myWorkshop->moduleConnector()->activateSubShapesSelection(aModes);
- // the control value is stored to the mode by the focus in on the widget
- // we need the value is initialized in order to enable the apply button in the property panel
- storeValue();
}
void PartSet_WidgetPoint2D::deactivate()
void PartSet_WidgetPoint2D::onMouseRelease(ModuleBase_IViewWindow* theWnd, QMouseEvent* theEvent)
{
XGUI_Selection* aSelection = myWorkshop->selector()->selection();
+ Handle(V3d_View) aView = theWnd->v3dView();
// 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;
- // }
- //}
+ NCollection_List<TopoDS_Shape> aShapes;
+ std::list<ObjectPtr> aObjects;
+ aSelection->selectedShapes(aShapes, aObjects);
+ // if we have selection
+ if (aShapes.Extent() > 0) {
+ TopoDS_Shape aShape = aShapes.First();
+ ObjectPtr aObject = aObjects.front();
+ FeaturePtr aSelectedFeature = ModelAPI_Feature::feature(aObject);
+ if (aSelectedFeature.get() != NULL) {
+ std::shared_ptr<SketchPlugin_Feature> aSPFeature =
+ std::dynamic_pointer_cast<SketchPlugin_Feature>(aSelectedFeature);
+ if ((!aSPFeature) && (!aShape.IsNull()))
+ PartSet_Tools::createFixedObjectByExternal(aShape, aObject, mySketch);
+ }
+ double aX, aY;
+ if (getPoint2d(aView, aShape, aX, aY)) {
+ setPoint(aX, aY);
+
+ PartSet_Tools::setConstraints(mySketch, feature(), attributeID(),aX, aY);
+ emit vertexSelected();
+ 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;
- 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(7);
- std::shared_ptr<GeomDataAPI_Point2D> aAttrPnt =
- PartSet_Tools::findAttributePoint(mySketch, aX, anY, aTolerance, aIgnore);
- if (aAttrPnt.get() != NULL) {
- aFeaturePoint->setValue(aAttrPnt->pnt());
- PartSet_Tools::createConstraint(mySketch, aAttrPnt, aFeaturePoint);
- emit vertexSelected();
- }
+ if (!setPoint(aX, anY))
+ return;
+
+ /// Start alternative code
+ //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(7);
+ //std::shared_ptr<GeomDataAPI_Point2D> aAttrPnt =
+ // PartSet_Tools::findAttributePoint(mySketch, aX, anY, aTolerance, aIgnore);
+ //if (aAttrPnt.get() != NULL) {
+ // aFeaturePoint->setValue(aAttrPnt->pnt());
+ // PartSet_Tools::createConstraint(mySketch, aAttrPnt, aFeaturePoint);
+ // emit vertexSelected();
+ //}
+ /// End alternative code
emit focusOutWidget(this);
}
// the Ok button should be disabled in the property panel by moving the mouse point in the viewer
// this leads that the user does not try to click Ok and it avoids an incorrect situation that the
// line is moved to the cursor to the Ok button
- myWorkshop->propertyPanel()->setOkEnabled(false);
+ myWorkshop->operationMgr()->setApplyEnabled(false);
gp_Pnt aPoint = PartSet_Tools::convertClickToPoint(theEvent->pos(), theWnd->v3dView());