#include <ModelAPI_Session.h>
#include <ModelAPI_Validator.h>
+#include <ModuleBase_Definitions.h>
+#include <Config_WidgetAPI.h>
+
#include <PartSet_Tools.h>
#include <SketchPlugin_Feature.h>
-#include <ModuleBase_IWorkshop.h>
-#include <XGUI_ModuleConnector.h>
+#include <SketchPlugin_ConstraintRigid.h>
+
#include <XGUI_Workshop.h>
-#include <XGUI_Displayer.h>
+
+PartSet_WidgetShapeSelector::PartSet_WidgetShapeSelector(QWidget* theParent,
+ ModuleBase_IWorkshop* theWorkshop,
+ const Config_WidgetAPI* theData,
+ const std::string& theParentId)
+: ModuleBase_WidgetShapeSelector(theParent, theWorkshop, theData, theParentId), myUseExternal(true)
+{
+ QString aIsExternal(theData->getProperty("use_external").c_str());
+ if (!aIsExternal.isEmpty()) {
+ QString aStr = aIsExternal.toUpper();
+ myUseExternal = (aStr == "TRUE") || (aStr == "YES");
+ }
+}
bool PartSet_WidgetShapeSelector::setObject(ObjectPtr theSelectedObject, GeomShapePtr theShape)
{
FeaturePtr aSelectedFeature = ModelAPI_Feature::feature(aSelectedObject);
if (aSelectedFeature == myFeature) // In order to avoid selection of the same object
return false;
+ // Do check using of external feature
std::shared_ptr<SketchPlugin_Feature> aSPFeature =
std::dynamic_pointer_cast<SketchPlugin_Feature>(aSelectedFeature);
- if (aSPFeature.get() == NULL && aShape.get() != NULL && !aShape->isNull()) {
- // Processing of external (non-sketch) object
- createExternal(theSelectedObject, theShape);
- if (myExternalObject)
- aSelectedObject = myExternalObject;
- else
- return false;
+
+ // Do check that we can use external feature
+ if ((aSPFeature.get() != NULL) && aSPFeature->isExternal() && (!myUseExternal))
+ return false;
+
+ if (aSPFeature.get() == NULL && aShape.get() != NULL && !aShape->isNull() && myUseExternal) {
+ aSelectedObject = PartSet_Tools::findFixedObjectByExternal(theShape->impl<TopoDS_Shape>(),
+ theSelectedObject, mySketch);
+ if (!aSelectedObject.get()) {
+ // Processing of external (non-sketch) object
+ aSelectedObject = PartSet_Tools::createFixedObjectByExternal(theShape->impl<TopoDS_Shape>(),
+ theSelectedObject, mySketch);
+ if (aSelectedObject.get())
+ myExternalObject = aSelectedObject;
+ }
} else {
// Processing of sketch object
DataPtr aData = myFeature->data();
return ModuleBase_WidgetShapeSelector::setObject(aSelectedObject, aShape);
}
-//********************************************************************
-void PartSet_WidgetShapeSelector::storeAttributeValue()
-{
- /// this is a temporary code, will be removed when master is merged to this branch
- /*XGUI_ModuleConnector* aConnector = dynamic_cast<XGUI_ModuleConnector*>(myWorkshop);
- XGUI_Workshop* aWorkshop = aConnector->workshop();
- aWorkshop->displayer()->enableUpdateViewer(false);
- */
- ModuleBase_WidgetShapeSelector::storeAttributeValue();
-}
-
//********************************************************************
void PartSet_WidgetShapeSelector::restoreAttributeValue(const bool theValid)
{
ModuleBase_WidgetShapeSelector::restoreAttributeValue(theValid);
- /// this is a temporary code, will be removed when master is merged to this branch
- /// after merge, the external edge should be removed always, without flag checking
- if (!theValid)
- removeExternal();
- /*
- XGUI_ModuleConnector* aConnector = dynamic_cast<XGUI_ModuleConnector*>(myWorkshop);
- XGUI_Workshop* aWorkshop = aConnector->workshop();
- aWorkshop->displayer()->enableUpdateViewer(false);//->erase(myExternalObject);
- aWorkshop->displayer()->enableUpdateViewer(true);*/
-}
-
-//********************************************************************
-void PartSet_WidgetShapeSelector::createExternal(ObjectPtr theSelectedObject,
- GeomShapePtr theShape)
-{
- ObjectPtr aObj = PartSet_Tools::createFixedObjectByExternal(theShape->impl<TopoDS_Shape>(),
- theSelectedObject, mySketch);
- if (aObj != myExternalObject) {
- removeExternal();
- myExternalObject = aObj;
-// TODO(nds) v1.0.2 master
-// // Check the acceptability of the object and shape as validator attribute
-// AttributePtr aPntAttr;
-// DataPtr aData = myFeature->data();
-// if (theShape.get() != NULL) {
-// AttributePtr aAttr = aData->attribute(attributeID());
-// AttributeRefAttrPtr aRefAttr =
-// std::dynamic_pointer_cast<ModelAPI_AttributeRefAttr>(aAttr);
-// if (aRefAttr) {
-// TopoDS_Shape aShape = theShape->impl<TopoDS_Shape>();
-// aPntAttr = PartSet_Tools::findAttributeBy2dPoint(theObj, aShape, mySketch);
-// }
-// }
-// // Check the acceptability of the object as attribute
-// aValidator = aValidators.begin();
-// std::list<std::list<std::string> >::iterator aArgs = anArguments.begin();
-// for (; aValidator != aValidators.end(); aValidator++, aArgs++) {
-// const ModelAPI_RefAttrValidator* aAttrValidator =
-// dynamic_cast<const ModelAPI_RefAttrValidator*>(*aValidator);
-// if (aAttrValidator) {
-// if (aPntAttr.get() != NULL)
-// {
-// if (!aAttrValidator->isValid(myFeature, *aArgs, aPntAttr)) {
-// return false;
-// }
-// }
-// else
-// {
-// if (!aAttrValidator->isValid(myFeature, *aArgs, theObj, theShape)) {
-// return false;
-// }
-// }
-// }
-// ======= end of todo
- }
+ removeExternal();
}
//********************************************************************
DocumentPtr aDoc = myExternalObject->document();
FeaturePtr aFeature = ModelAPI_Feature::feature(myExternalObject);
if (aFeature.get() != NULL) {
- aDoc->removeFeature(aFeature);
+ QObjectPtrList anObjects;
+ anObjects.append(aFeature);
+ // the external feature should be removed with all references, sketch feature should be ignored
+ std::set<FeaturePtr> anIgnoredFeatures;
+ anIgnoredFeatures.insert(sketch());
+ XGUI_Workshop::deleteFeatures(anObjects, anIgnoredFeatures);
}
- myExternalObject = NULL;
+ myExternalObject = ObjectPtr();
}
}
