#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 <ModuleBase_ParamSpinBox.h>
#include <ModuleBase_Tools.h>
#include <ModuleBase_IViewWindow.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)
: ModuleBase_ModelWidget(theParent, theData, theParentId)
{
+ // the control should accept the focus, so the boolen flag is corrected to be true
+ myIsObligatory = true;
//myOptionParam = theData->getProperty(PREVIOUS_FEATURE_PARAM);
QString aPageName = QString::fromStdString(theData->getProperty(CONTAINER_PAGE_NAME));
myGroupBox = new QGroupBox(aPageName, theParent);
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 = new ModuleBase_ParamSpinBox(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, 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 = new ModuleBase_ParamSpinBox(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, SLOT(onValuesChanged()));
}
+ QVBoxLayout* aLayout = new QVBoxLayout(this);
+ ModuleBase_Tools::zeroMargins(aLayout);
+ aLayout->addWidget(myGroupBox);
+ setLayout(aLayout);
+}
+
+void PartSet_WidgetPoint2D::reset()
+{
+ if (isComputedDefault()) {
+ //return;
+ if (myFeature->compute(myAttributeID))
+ restoreValue();
+ }
+ else {
+ bool isOk;
+ double aDefValue = QString::fromStdString(getDefaultValue()).toDouble(&isOk);
+ // it is important to block the spin box control in order to do not through out the
+ // locking of the validating state.
+ ModuleBase_Tools::setSpinValue(myXSpin, isOk ? aDefValue : 0.0);
+ ModuleBase_Tools::setSpinValue(myYSpin, isOk ? aDefValue : 0.0);
+ storeValueCustom();
+ }
}
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);
- myXSpin->blockSignals(false);
-
- myYSpin->blockSignals(true);
- myYSpin->setValue(theY);
- myYSpin->blockSignals(false);
- this->blockSignals(isBlocked);
+ ModuleBase_Tools::setSpinValue(myXSpin, theX);
+ ModuleBase_Tools::setSpinValue(myYSpin, theY);
- emit valuesChanged();
+ storeValue();
+ return true;
}
-bool PartSet_WidgetPoint2D::storeValue() const
+bool PartSet_WidgetPoint2D::storeValueCustom() const
{
std::shared_ptr<ModelAPI_Data> aData = myFeature->data();
if (!aData) // can be on abort of sketcher element
double _X = aPoint->x();
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;
-}
-QWidget* PartSet_WidgetPoint2D::getControl() const
-{
- return myGroupBox;
+ ModuleBase_Tools::setSpinValue(myXSpin, aPoint->x());
+ ModuleBase_Tools::setSpinValue(myYSpin, aPoint->y());
+ return true;
}
QList<QWidget*> PartSet_WidgetPoint2D::getControls() 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;
+ if (isEditingMode())
+ aModes << TopAbs_EDGE;
myWorkshop->moduleConnector()->activateSubShapesSelection(aModes);
}
void PartSet_WidgetPoint2D::onMouseRelease(ModuleBase_IViewWindow* theWnd, QMouseEvent* theEvent)
{
+ // the contex menu release by the right button should not be processed by this widget
+ if (theEvent->button() != Qt::LeftButton)
+ return;
+
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 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())) {
+ ResultPtr aFixedObject = PartSet_Tools::findFixedObjectByExternal(aShape, aObject, mySketch);
+ if (!aFixedObject.get())
+ aFixedObject = PartSet_Tools::createFixedObjectByExternal(aShape, aObject, mySketch);
+ }
+ }
double aX, aY;
- if (getPoint2d(theWnd->v3dView(), aShape, aX, aY)) {
+ if (getPoint2d(aView, aShape, aX, aY)) {
setPoint(aX, aY);
PartSet_Tools::setConstraints(mySketch, feature(), attributeID(),aX, aY);
- emit vertexSelected(aObjects.front(), aShape);
+ 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;
- PartSet_Tools::convertTo2D(aPoint, mySketch, theWnd->v3dView(), aX, anY);
- setPoint(aX, anY);
+ PartSet_Tools::convertTo2D(aPoint, mySketch, aView, aX, anY);
+ 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);
}
if (isEditingMode())
return;
myWorkshop->operationMgr()->setLockValidating(true);
- myWorkshop->propertyPanel()->setOkEnabled(false);
+ // 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->operationMgr()->setApplyEnabled(false);
gp_Pnt aPoint = PartSet_Tools::convertClickToPoint(theEvent->pos(), theWnd->v3dView());
