{
}
-bool PartSet_WidgetSketchLabel::setSelection(QList<ModuleBase_ViewerPrs>& theValues,
+bool PartSet_WidgetSketchLabel::setSelection(QList<ModuleBase_ViewerPrsPtr>& theValues,
const bool theToValidate)
{
// do not use the given selection if the plane of the sketch has been already set.
if (plane().get())
return true;
- ModuleBase_ViewerPrs aPrs = theValues.first();
+ ModuleBase_ViewerPrsPtr aPrs = theValues.first();
bool aDone = setSelectionInternal(theValues, theToValidate);
if (aDone)
updateByPlaneSelected(aPrs);
void PartSet_WidgetSketchLabel::onSelectionChanged()
{
- QList<ModuleBase_ViewerPrs> aSelected = getFilteredSelected();
+ QList<ModuleBase_ViewerPrsPtr> aSelected = getFilteredSelected();
if (aSelected.empty())
return;
- ModuleBase_ViewerPrs aPrs = aSelected.first();
+ ModuleBase_ViewerPrsPtr aPrs = aSelected.first();
bool aDone = setSelectionInternal(aSelected, false);
if (aDone) {
updateByPlaneSelected(aPrs);
emit showConstraintToggled(aState, theOn);
}
-void PartSet_WidgetSketchLabel::blockAttribute(const bool& theToBlock, bool& isFlushesActived,
+void PartSet_WidgetSketchLabel::blockAttribute(const AttributePtr& theAttribute,
+ const bool& theToBlock, bool& isFlushesActived,
bool& isAttributeSetInitializedBlocked)
{
- ModuleBase_WidgetValidated::blockAttribute(theToBlock, isFlushesActived,
+ ModuleBase_WidgetValidated::blockAttribute(theAttribute, theToBlock, isFlushesActived,
isAttributeSetInitializedBlocked);
// We do not restore the previous state of isAttributeSetInitializedBlocked for each of
// attributes. It it is necessary, these states should be append to the method attributes
}
}
-bool PartSet_WidgetSketchLabel::setSelectionInternal(const QList<ModuleBase_ViewerPrs>& theValues,
+bool PartSet_WidgetSketchLabel::setSelectionInternal(const QList<ModuleBase_ViewerPrsPtr>& theValues,
const bool theToValidate)
{
bool aDone = false;
- ModuleBase_ViewerPrs aValue;
if (theValues.empty()) {
// In order to make reselection possible, set empty object and shape should be done
- setSelectionCustom(ModuleBase_ViewerPrs());
+ setSelectionCustom(std::shared_ptr<ModuleBase_ViewerPrs>(
+ new ModuleBase_ViewerPrs(ObjectPtr(), GeomShapePtr(), NULL)));
aDone = false;
}
else {
// it removes the processed value from the parameters list
- aValue = theValues.first();//.takeFirst();
+ ModuleBase_ViewerPrsPtr aValue = theValues.first();//.takeFirst();
if (!theToValidate || isValidInFilters(aValue))
aDone = setSelectionCustom(aValue);
}
return aDone;
}
-void PartSet_WidgetSketchLabel::updateByPlaneSelected(const ModuleBase_ViewerPrs& thePrs)
+void PartSet_WidgetSketchLabel::updateByPlaneSelected(const ModuleBase_ViewerPrsPtr& thePrs)
{
// 1. hide main planes if they have been displayed
myPreviewPlanes->erasePreviewPlanes(myWorkshop);
// 2. if the planes were displayed, change the view projection
- const GeomShapePtr& aShape = thePrs.shape();
+ const GeomShapePtr& aShape = thePrs->shape();
std::shared_ptr<GeomAPI_Shape> aGShape;
std::shared_ptr<GeomAPI_Shape> aBaseShape;
}
if (aGShape.get() != NULL) {
// get plane parameters
- std::shared_ptr<GeomAPI_Pln> aPlane = GeomAlgoAPI_FaceBuilder::plane(aGShape);
+ std::shared_ptr<GeomAPI_Face> aFace(new GeomAPI_Face(aGShape));
+ std::shared_ptr<GeomAPI_Pln> aPlane = GeomAlgoAPI_FaceBuilder::plane(aFace);
std::shared_ptr<GeomAPI_Dir> aDir = aPlane->direction();
gp_XYZ aXYZ = aDir->impl<gp_Dir>().XYZ();
double aTwist = 0.0;
// Rotate view if the sketcher plane is selected only from preview planes
// Preview planes are created only if there is no any shape
- bool aRotate = Config_PropManager::boolean("Sketch planes", "rotate_to_plane", "false");
+ bool aRotate = Config_PropManager::boolean(SKETCH_TAB_NAME, "rotate_to_plane", "false");
if (aRotate) {
myWorkshop->viewer()->setViewProjection(aXYZ.X(), aXYZ.Y(), aXYZ.Z(), aTwist);
PartSet_Module* aModule = dynamic_cast<PartSet_Module*>(myWorkshop->module());
myStackWidget->installEventFilter(this);
}
-void PartSet_WidgetSketchLabel::storeAttributeValue()
+void PartSet_WidgetSketchLabel::storeAttributeValue(const AttributePtr& theAttribute)
{
- ModuleBase_WidgetValidated::storeAttributeValue();
+ ModuleBase_WidgetValidated::storeAttributeValue(theAttribute);
}
-void PartSet_WidgetSketchLabel::restoreAttributeValue(const bool theValid)
+void PartSet_WidgetSketchLabel::restoreAttributeValue(const AttributePtr& theAttribute,
+ const bool theValid)
{
- ModuleBase_WidgetValidated::restoreAttributeValue(theValid);
+ ModuleBase_WidgetValidated::restoreAttributeValue(theAttribute, theValid);
// it is not necessary to save the previous plane value because the plane is chosen once
DataPtr aData = feature()->data();
}
}
-bool PartSet_WidgetSketchLabel::setSelectionCustom(const ModuleBase_ViewerPrs& thePrs)
+bool PartSet_WidgetSketchLabel::setSelectionCustom(const ModuleBase_ViewerPrsPtr& thePrs)
{
return fillSketchPlaneBySelection(feature(), thePrs);
}
-bool PartSet_WidgetSketchLabel::canFillSketch(const ModuleBase_ViewerPrs& thePrs)
+bool PartSet_WidgetSketchLabel::canFillSketch(const ModuleBase_ViewerPrsPtr& thePrs)
{
bool aCanFillSketch = true;
// avoid any selection on sketch object
- ObjectPtr anObject = thePrs.object();
+ ObjectPtr anObject = thePrs->object();
ResultPtr aResult = std::dynamic_pointer_cast<ModelAPI_Result>(anObject);
if (aResult.get()) {
FeaturePtr aFeature = ModelAPI_Feature::feature(aResult);
// check plane or planar face of any non-sketch object
if (aCanFillSketch) {
std::shared_ptr<GeomAPI_Face> aGeomFace;
- const TopoDS_Shape aShape = thePrs.shape();
- if (aShape.IsNull()) {
- if (aResult.get()) {
- GeomShapePtr aGeomShape = aResult->shape();
- std::shared_ptr<GeomAPI_Face> aGeomFace(new GeomAPI_Face(aGeomShape));
- aCanFillSketch = aGeomFace.get() && aGeomFace->isPlanar();
- }
+
+ GeomShapePtr aGeomShape = thePrs->shape();
+ if ((!aGeomShape.get() || aGeomShape->isNull()) && aResult.get()) {
+ aGeomShape = aResult->shape();
}
- else if (aShape.ShapeType() == TopAbs_FACE) {
- std::shared_ptr<GeomAPI_Face> aGeomFace(new GeomAPI_Face());
- aGeomFace->setImpl(new TopoDS_Shape(aShape));
+
+ if (aGeomShape.get() && aGeomShape->shapeType() == GeomAPI_Shape::FACE) {
+ std::shared_ptr<GeomAPI_Face> aGeomFace(new GeomAPI_Face(aGeomShape));
aCanFillSketch = aGeomFace.get() && aGeomFace->isPlanar();
}
else
}
bool PartSet_WidgetSketchLabel::fillSketchPlaneBySelection(const FeaturePtr& theFeature,
- const ModuleBase_ViewerPrs& thePrs)
+ const ModuleBase_ViewerPrsPtr& thePrs)
{
bool isOwnerSet = false;
- const GeomShapePtr& aShape = thePrs.shape();
+ const GeomShapePtr& aShape = thePrs->shape();
std::shared_ptr<GeomAPI_Dir> aDir;
- if (thePrs.object() && (theFeature != thePrs.object())) {
+ if (thePrs->object() && (theFeature != thePrs->object())) {
DataPtr aData = theFeature->data();
AttributeSelectionPtr aSelAttr =
std::dynamic_pointer_cast<ModelAPI_AttributeSelection>
(aData->attribute(SketchPlugin_SketchEntity::EXTERNAL_ID()));
if (aSelAttr) {
- ResultPtr aRes = std::dynamic_pointer_cast<ModelAPI_Result>(thePrs.object());
+ ResultPtr aRes = std::dynamic_pointer_cast<ModelAPI_Result>(thePrs->object());
if (aRes) {
GeomShapePtr aShapePtr(new GeomAPI_Shape());
if (!aShape.get() || aShape->isNull()) { // selection happens in the OCC viewer
}
else if (aShape.get() && !aShape->isNull()) {
const TopoDS_Shape& aTDShape = aShape->impl<TopoDS_Shape>();
- aDir = setSketchPlane(aTDShape);
+ aDir = setSketchPlane(theFeature, aTDShape);
isOwnerSet = aDir.get();
}
return isOwnerSet;
myStackWidget->setCurrentIndex(0);
bool aBodyIsVisualized = myPreviewPlanes->hasVisualizedBodies(myWorkshop);
+
+ // Clear previous selection mode It is necessary for correct activation of preview planes
+ XGUI_Workshop* aWorkshop = XGUI_Tools::workshop(myWorkshop);
+ XGUI_Displayer* aDisp = aWorkshop->displayer();
+ aDisp->activateObjects(QIntList(), aDisp->displayedObjects(), false);
+
if (!aBodyIsVisualized) {
// We have to select a plane before any operation
myPreviewPlanes->showPreviewPlanes(myWorkshop);
// get plane parameters
- std::shared_ptr<GeomAPI_Pln> aPlane = GeomAlgoAPI_FaceBuilder::plane(aGShape);
+ std::shared_ptr<GeomAPI_Face> aFace(new GeomAPI_Face(aGShape));
+ std::shared_ptr<GeomAPI_Pln> aPlane = GeomAlgoAPI_FaceBuilder::plane(aFace);
if (!aPlane.get())
return std::shared_ptr<GeomAPI_Dir>();
