#include "PartSet_WidgetPoint2d.h"
#include <PartSet_Tools.h>
#include <PartSet_Module.h>
+#include <PartSet_SketcherReetntrantMgr.h>
#include <XGUI_Tools.h>
#include <XGUI_Workshop.h>
#include <ModuleBase_IViewer.h>
#include <ModuleBase_IViewWindow.h>
#include <ModuleBase_ISelection.h>
+#include <ModuleBase_ViewerPrs.h>
+#include <ModuleBase_WidgetValidator.h>
#include <Config_Keywords.h>
#include <Config_WidgetAPI.h>
#include <GeomDataAPI_Point2D.h>
#include <GeomAPI_Pnt2d.h>
+#include <GeomAPI_ShapeExplorer.h>
+#include <GeomAPI_Vertex.h>
+
#include <SketchPlugin_Feature.h>
#include <SketchPlugin_ConstraintCoincidence.h>
#include <SketchPlugin_Line.h>
PartSet_WidgetPoint2D::PartSet_WidgetPoint2D(QWidget* theParent,
ModuleBase_IWorkshop* theWorkshop,
- const Config_WidgetAPI* theData,
- const std::string& theParentId)
-: ModuleBase_ModelWidget(theParent, theData, theParentId), myWorkshop(theWorkshop),
+ const Config_WidgetAPI* theData)
+: ModuleBase_ModelWidget(theParent, theData), myWorkshop(theWorkshop),
myValueIsCashed(false), myIsFeatureVisibleInCash(true),
myXValueInCash(0), myYValueInCash(0)
{
// the control should accept the focus, so the boolean 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);
myGroupBox->setFlat(false);
ModuleBase_Tools::zeroMargins(aLayout);
aLayout->addWidget(myGroupBox);
setLayout(aLayout);
+
+ myWidgetValidator = new ModuleBase_WidgetValidator(this, myWorkshop);
+}
+
+bool PartSet_WidgetPoint2D::isValidSelectionCustom(const ModuleBase_ViewerPrsPtr& theValue)
+{
+ bool aValid = true;
+
+ PartSet_Module* aModule = dynamic_cast<PartSet_Module*>(myWorkshop->module());
+ if (aModule->sketchReentranceMgr()->isInternalEditActive())
+ return true; /// when internal edit is started a new feature is created. I has not results, AIS
+
+ // workaround for feature, where there is no results
+ //if (myFeature->getKind() == "SketchRectangle")
+ // return true;
+
+ /// the selection is not possible if the current feature has no presentation for the current
+ /// attribute not in AIS not in results. If so, no object in current feature where make
+ /// coincidence, so selection is not necessary
+ std::shared_ptr<ModelAPI_Data> aData = myFeature->data();
+ std::shared_ptr<GeomDataAPI_Point2D> aPointAttr = std::dynamic_pointer_cast<GeomDataAPI_Point2D>(
+ aData->attribute(attributeID()));
+ std::shared_ptr<GeomAPI_Pnt2d> aPoint = aPointAttr->pnt();
+
+ bool aFoundPoint = false;
+ GeomShapePtr anAISShape;
+ GeomPresentablePtr aPrs = std::dynamic_pointer_cast<GeomAPI_IPresentable>(myFeature);
+ if (aPrs.get()) {
+ AISObjectPtr anAIS;
+ anAIS = aPrs->getAISObject(anAIS);
+ if (anAIS.get()) {
+ anAISShape = anAIS->getShape();
+ }
+ }
+ const std::list<std::shared_ptr<ModelAPI_Result> >& aResults = myFeature->results();
+ if (!anAISShape.get() && aResults.empty())
+ return true;
+
+ /// analysis of AIS
+ if (anAISShape.get())
+ aFoundPoint = shapeContainsPoint(anAISShape, aPoint, mySketch);
+
+ /// analysis of results
+ std::list<std::shared_ptr<ModelAPI_Result> >::const_iterator aRIter = aResults.cbegin();
+ for (; aRIter != aResults.cend() && !aFoundPoint; aRIter++) {
+ ResultPtr aResult = *aRIter;
+ if (aResult.get() && aResult->shape().get()) {
+ GeomShapePtr aShape = aResult->shape();
+ aFoundPoint = shapeContainsPoint(aShape, aPoint, mySketch);
+ }
+ }
+ return aFoundPoint;
}
bool PartSet_WidgetPoint2D::resetCustom()
// if the restored value should be hidden, aDone = true to set
// reset state for the widget in the parent
aDone = restoreCurentValue();
+ emit objectUpdated();
}
else {
bool isOk;
{
}
-bool PartSet_WidgetPoint2D::setSelection(QList<ModuleBase_ViewerPrs>& theValues,
+bool PartSet_WidgetPoint2D::setSelection(QList<ModuleBase_ViewerPrsPtr>& theValues,
const bool theToValidate)
{
bool isDone = false;
if (theValues.empty())
return isDone;
- ModuleBase_ViewerPrs aValue = theValues.takeFirst();
- TopoDS_Shape aShape = aValue.shape();
- if (!aShape.IsNull()) {
+ ModuleBase_ViewerPrsPtr aValue = theValues.takeFirst();
+ GeomShapePtr aShape = aValue->shape();
+ if (aShape.get() && !aShape->isNull()) {
Handle(V3d_View) aView = myWorkshop->viewer()->activeView();
double aX, aY;
- if (getPoint2d(aView, aShape, aX, aY)) {
+ const TopoDS_Shape& aTDShape = aShape->impl<TopoDS_Shape>();
+ if (getPoint2d(aView, aTDShape, aX, aY)) {
isDone = setPoint(aX, aY);
PartSet_Tools::setConstraints(mySketch, feature(), attributeID(), aX, aY);
}
}
else if (canBeActivatedByMove()) {
if (feature()->getKind() == SketchPlugin_Line::ID()) {
- FeaturePtr aFeature = std::dynamic_pointer_cast<ModelAPI_Feature>(aValue.object());
+ FeaturePtr aFeature = std::dynamic_pointer_cast<ModelAPI_Feature>(aValue->object());
// Initialize new line with first point equal to end of previous
if (aFeature.get()) {
std::shared_ptr<ModelAPI_Data> aData = aFeature->data();
return true;
}
-bool PartSet_WidgetPoint2D::storeValueCustom() const
+bool PartSet_WidgetPoint2D::storeValueCustom()
{
std::shared_ptr<ModelAPI_Data> aData = myFeature->data();
if (!aData) // can be on abort of sketcher element
return false;
}
-void PartSet_WidgetPoint2D::setConstraintWith(const ObjectPtr& theObject)
+bool PartSet_WidgetPoint2D::setConstraintWith(const ObjectPtr& theObject)
{
std::shared_ptr<GeomDataAPI_Point2D> aFeaturePoint;
if (feature()->isMacro()) {
aFeaturePoint = std::dynamic_pointer_cast<GeomDataAPI_Point2D>(aThisAttr);
}
if (!aFeaturePoint.get())
- return;
+ return false;
// Create point-edge coincedence
FeaturePtr aFeature = mySketch->addFeature(SketchPlugin_ConstraintCoincidence::ID());
ModelAPI_AttributeRefAttr>(aData->attribute(SketchPlugin_Constraint::ENTITY_B()));
aRef2->setObject(theObject);
+ // we need to flush created signal in order to coincidence is processed by solver
Events_Loop::loop()->flush(Events_Loop::eventByName(EVENT_OBJECT_CREATED));
+
+ return true;
}
void PartSet_WidgetPoint2D::onMouseRelease(ModuleBase_IViewWindow* theWnd, QMouseEvent* theEvent)
ModuleBase_ISelection* aSelection = myWorkshop->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);
+
+ QList<ModuleBase_ViewerPrsPtr> aList = aSelection->getSelected(ModuleBase_ISelection::Viewer);
+ ModuleBase_ViewerPrsPtr aFirstValue = aList.size() > 0 ? aList.first() : ModuleBase_ViewerPrsPtr();
// if we have selection and use it
- if (aShapes.Extent() > 0 && useSelectedShapes()) {
- TopoDS_Shape aShape = aShapes.First();
- ObjectPtr aObject = aObjects.front();
+ if (aFirstValue.get() && isValidSelectionCustom(aFirstValue)) {
+ GeomShapePtr aGeomShape = aFirstValue->shape();
+ TopoDS_Shape aShape = aGeomShape->impl<TopoDS_Shape>();
+ ObjectPtr aObject = aFirstValue->object();
+
FeaturePtr aSelectedFeature = ModelAPI_Feature::feature(aObject);
bool anExternal = false;
std::shared_ptr<SketchPlugin_Feature> aSPFeature;
if (aShape.ShapeType() == TopAbs_VERTEX) {
FeaturePtr aFixedFeature = ModelAPI_Feature::feature(aFixedObject);
if (aFixedFeature.get() && aFixedFeature->getKind() == SketchPlugin_Point::ID()) {
- anOrphanPoint = isOrphanPoint(aFixedFeature, mySketch, aX, aY, true);
+ anOrphanPoint = isOrphanPoint(aFixedFeature, mySketch, aX, aY);
}
}
}
PartSet_Tools::setConstraints(mySketch, feature(), attributeID(), aX, aY);
}
else if (aShape.ShapeType() == TopAbs_EDGE) {
- setConstraintWith(aObject);
+ if (!setConstraintWith(aObject)) {
+ gp_Pnt aPoint = PartSet_Tools::convertClickToPoint(theEvent->pos(), theWnd->v3dView());
+ PartSet_Tools::convertTo2D(aPoint, mySketch, aView, aX, aY);
+ setPoint(aX, aY);
+ }
setValueState(Stored); // in case of edge selection, Apply state should also be updated
-
- FeaturePtr anObjectFeature = ModelAPI_Feature::feature(aObject);
- std::string anAuxiliaryAttribute = SketchPlugin_SketchEntity::AUXILIARY_ID();
- AttributeBooleanPtr anAuxiliaryAttr = std::dynamic_pointer_cast<ModelAPI_AttributeBoolean>(
- anObjectFeature->data()->attribute(anAuxiliaryAttribute));
- if (anAuxiliaryAttr.get())
- isAuxiliaryFeature = anAuxiliaryAttr->value();
+ isAuxiliaryFeature = PartSet_Tools::isAuxiliarySketchEntity(aObject);
}
// it is important to perform updateObject() in order to the current value is
// processed by Sketch Solver. Test case: line is created from a previous point
bool PartSet_WidgetPoint2D::isOrphanPoint(const FeaturePtr& theFeature,
const CompositeFeaturePtr& theSketch,
- double theX, double theY, const bool theSearchInResults)
+ double theX, double theY)
{
bool anOrphanPoint = false;
if (theFeature.get()) {
std::shared_ptr<GeomAPI_Pnt2d> aPoint = aPointAttr->pnt();
// we need to find coincidence features in results also, because external object(point)
// uses refs to me in another feature.
- FeaturePtr aCoincidence = PartSet_Tools::findFirstCoincidence(theFeature, aPoint, theSearchInResults);
+ FeaturePtr aCoincidence = PartSet_Tools::findFirstCoincidence(theFeature, aPoint);
anOrphanPoint = true;
// if there is at least one concident line to the point, the point is not an orphant
if (aCoincidence.get()) {
QList<FeaturePtr> aCoinsideLines;
- PartSet_Tools::findCoincidences(aCoincidence, aCoinsideLines,
+ QList<FeaturePtr> aCoins;
+ PartSet_Tools::findCoincidences(aCoincidence, aCoinsideLines, aCoins,
SketchPlugin_ConstraintCoincidence::ENTITY_A());
- PartSet_Tools::findCoincidences(aCoincidence, aCoinsideLines,
+ PartSet_Tools::findCoincidences(aCoincidence, aCoinsideLines, aCoins,
SketchPlugin_ConstraintCoincidence::ENTITY_B());
QList<FeaturePtr>::const_iterator anIt = aCoinsideLines.begin(),
aLast = aCoinsideLines.end();
}
return anOrphanPoint;
}
+
+bool PartSet_WidgetPoint2D::shapeContainsPoint(const GeomShapePtr& theShape,
+ const std::shared_ptr<GeomAPI_Pnt2d>& thePoint,
+ const CompositeFeaturePtr& theSketch)
+{
+ std::shared_ptr<GeomAPI_Pnt> aPoint = PartSet_Tools::point3D(thePoint, theSketch);
+
+ bool aContainPoint = false;
+ GeomAPI_ShapeExplorer anExp(theShape, GeomAPI_Shape::VERTEX);
+ for(; anExp.more() && !aContainPoint; anExp.next()) {
+ std::shared_ptr<GeomAPI_Shape> aVertexInCompSolid = anExp.current();
+ std::shared_ptr<GeomAPI_Vertex> aVertex(new GeomAPI_Vertex(aVertexInCompSolid));
+ if (aVertex.get())
+ aContainPoint = aPoint->isEqual(aVertex->point());
+ }
+ return aContainPoint;
+}