#include <XGUI_Selection.h>
#include <XGUI_ViewerProxy.h>
#include <XGUI_ActionsMgr.h>
+#include <XGUI_ModuleConnector.h>
#include <ModuleBase_Operation.h>
#include <ModuleBase_ViewerPrs.h>
#include <ModelAPI_Tools.h>
#include <GeomAlgoAPI_FaceBuilder.h>
+#include <GeomAlgoAPI_ShapeTools.h>
#include <GeomDataAPI_Point.h>
#include <GeomDataAPI_Dir.h>
#include <GeomAPI_XYZ.h>
#include <Config_PropManager.h>
#include <QLabel>
-//#include <QTimer>
#include <QApplication>
#include <QVBoxLayout>
#include <QCheckBox>
PartSet_WidgetSketchLabel::PartSet_WidgetSketchLabel(QWidget* theParent,
+ ModuleBase_IWorkshop* theWorkshop,
const Config_WidgetAPI* theData,
const std::string& theParentId,
bool toShowConstraints)
- : ModuleBase_WidgetValidated(theParent, theData, theParentId),
- myPreviewDisplayed(false),
- myWorkshop(NULL)
+: ModuleBase_WidgetValidated(theParent, theWorkshop, theData, theParentId),
+ myPreviewDisplayed(false)
{
myText = QString::fromStdString(theData->getProperty("title"));
myLabel = new QLabel("", theParent);
myLabel->setToolTip("");
myLabel->setIndent(5);
- //mySelectionTimer = new QTimer(this);
- //connect(mySelectionTimer, SIGNAL(timeout()), SLOT(setSketchingMode()));
- //mySelectionTimer->setSingleShot(true);
-
QVBoxLayout* aLayout = new QVBoxLayout(this);
ModuleBase_Tools::zeroMargins(aLayout);
aLayout->addWidget(myLabel);
PartSet_WidgetSketchLabel::~PartSet_WidgetSketchLabel()
{
- erasePreviewPlanes();
+}
+
+bool PartSet_WidgetSketchLabel::setSelection(QList<ModuleBase_ViewerPrs>& theValues,
+ const bool theToValidate)
+{
+ // do not use the given selection if the plane of the sketch has been already set.
+ // If this check is absent, a selected plane in the viewer can be set in the sketch
+ // even if the sketch is built on another plane.
+ if (plane().get())
+ return true;
+
+ ModuleBase_ViewerPrs aPrs = theValues.first();
+ bool aDone = ModuleBase_WidgetValidated::setSelection(theValues, theToValidate);
+ if (aDone)
+ updateByPlaneSelected(aPrs);
+
+ return aDone;
}
QList<QWidget*> PartSet_WidgetSketchLabel::getControls() const
void PartSet_WidgetSketchLabel::onSelectionChanged()
{
- ModuleBase_ViewerPrs aPrs;
- // 1. find selected presentation either in the viewer or in OB
- XGUI_Selection* aSelection = myWorkshop->selector()->selection();
- QList<ModuleBase_ViewerPrs> aSelected = aSelection->getSelected();
- // the selection in OCC viewer - the selection of a face in the viewer
- // it can be th main plane's face of a face on a visualized body
- if (!aSelected.empty()) {
- aPrs = aSelected.first();
- }
- else {
- // the selection in Object Browser: the plane object can be used as sketch plane
- QObjectPtrList anObjects = aSelection->selectedObjects();
- if (!anObjects.empty()) {
- aPrs.setObject(anObjects.first());
- }
- }
- if (aPrs.isEmpty())
- return;
+ QList<ModuleBase_ViewerPrs> aSelected = getFilteredSelected();
- if (!isValidSelection(aPrs))
+ if (aSelected.empty())
return;
+ ModuleBase_ViewerPrs aPrs = aSelected.first();
+
+ bool aDone = ModuleBase_WidgetValidated::setSelection(aSelected, false);
+ if (aDone) {
+ updateByPlaneSelected(aPrs);
+ updateObject(myFeature);
+ }
+}
- // 2. set the selection to sketch
- setSelectionCustom(aPrs);
- // 3. hide main planes if they have been displayed
+void PartSet_WidgetSketchLabel::updateByPlaneSelected(const ModuleBase_ViewerPrs& thePrs)
+{
+ // 1. hide main planes if they have been displayed
erasePreviewPlanes();
- // 4. if the planes were displayed, change the view projection
- TopoDS_Shape aShape = aPrs.shape();
+ // 2. if the planes were displayed, change the view projection
+ TopoDS_Shape aShape = thePrs.shape();
std::shared_ptr<GeomAPI_Shape> aGShape;
+ std::shared_ptr<GeomAPI_Shape> aBaseShape;
+
+ DataPtr aData = feature()->data();
+ AttributeSelectionPtr aSelAttr = std::dynamic_pointer_cast<ModelAPI_AttributeSelection>
+ (aData->attribute(SketchPlugin_SketchEntity::EXTERNAL_ID()));
+
// selection happens in OCC viewer
if (!aShape.IsNull()) {
- aGShape = std::shared_ptr<GeomAPI_Shape>(new GeomAPI_Shape);
+ aGShape = std::shared_ptr<GeomAPI_Shape>(new GeomAPI_Shape());
aGShape->setImpl(new TopoDS_Shape(aShape));
+
+ if (aSelAttr && aSelAttr->context()) {
+ aBaseShape = aSelAttr->context()->shape();
+ }
}
else { // selection happens in OCC viewer(on body) of in the OB browser
- DataPtr aData = feature()->data();
- AttributeSelectionPtr aSelAttr = std::dynamic_pointer_cast<ModelAPI_AttributeSelection>
- (aData->attribute(SketchPlugin_SketchEntity::EXTERNAL_ID()));
if (aSelAttr) {
aGShape = aSelAttr->value();
}
// get plane parameters
std::shared_ptr<GeomAPI_Pln> aPlane = GeomAlgoAPI_FaceBuilder::plane(aGShape);
std::shared_ptr<GeomAPI_Dir> aDir = aPlane->direction();
+ gp_XYZ aXYZ = aDir->impl<gp_Dir>().XYZ();
+ double aTwist = 0.0;
- myWorkshop->viewer()->setViewProjection(aDir->x(), aDir->y(), aDir->z());
+ // orienting projection is not needed: it is done in GeomAlgoAPI_FaceBuilder::plane
+ /*if (aGShape->impl<TopoDS_Shape>().Orientation() == TopAbs_REVERSED) {
+ aXYZ.Reverse();
+ }*/
+
+ myWorkshop->viewer()->setViewProjection(aXYZ.X(), aXYZ.Y(), aXYZ.Z(), aTwist);
}
- // 5. Clear text in the label
+ // 3. Clear text in the label
myLabel->setText("");
myLabel->setToolTip("");
- disconnect(myWorkshop->selector(), SIGNAL(selectionChanged()),
+ disconnect(workshop()->selector(), SIGNAL(selectionChanged()),
this, SLOT(onSelectionChanged()));
- // 6. deactivate face selection filter
- activateFilters(myWorkshop->module()->workshop(), false);
+ // 4. deactivate face selection filter
+ activateFilters(false);
- // 7. Clear selection mode and define sketching mode
- //XGUI_Displayer* aDisp = myWorkshop->displayer();
+ // 5. Clear selection mode and define sketching mode
+ //XGUI_Displayer* aDisp = workshop()->displayer();
//aDisp->closeLocalContexts();
emit planeSelected(plane());
- //setSketchingMode();
+ // after the plane is selected in the sketch, the sketch selection should be activated
+ // it can not be performed in the sketch label widget because, we don't need to switch off
+ // the selection by any label deactivation, but need to switch it off by stop the sketch
+ activateSelection(true);
- // 8. Update sketcher actions
- XGUI_ActionsMgr* anActMgr = myWorkshop->actionsMgr();
+ // 6. Update sketcher actions
+ XGUI_ActionsMgr* anActMgr = workshop()->actionsMgr();
anActMgr->update();
myWorkshop->viewer()->update();
}
{
CompositeFeaturePtr aSketch = std::dynamic_pointer_cast<ModelAPI_CompositeFeature>(myFeature);
return PartSet_Tools::sketchPlane(aSketch);
-
}
bool PartSet_WidgetSketchLabel::focusTo()
void PartSet_WidgetSketchLabel::storeAttributeValue()
{
+ ModuleBase_WidgetValidated::storeAttributeValue();
}
void PartSet_WidgetSketchLabel::restoreAttributeValue(const bool theValid)
{
+ ModuleBase_WidgetValidated::restoreAttributeValue(theValid);
+
// it is not necessary to save the previous plane value because the plane is chosen once
DataPtr aData = feature()->data();
AttributeSelectionPtr aSelAttr = std::dynamic_pointer_cast<ModelAPI_AttributeSelection>
}
else if (!aShape.IsNull()) {
aDir = setSketchPlane(aShape);
- isOwnerSet = aDir;
+ isOwnerSet = aDir.get();
}
return isOwnerSet;
}
void PartSet_WidgetSketchLabel::activateCustom()
{
std::shared_ptr<GeomAPI_Pln> aPlane = plane();
- if (aPlane.get())
+ if (aPlane.get()) {
+ activateSelection(true);
return;
+ }
bool aBodyIsVisualized = false;
- XGUI_Displayer* aDisp = myWorkshop->displayer();
+ XGUI_Displayer* aDisp = workshop()->displayer();
QObjectPtrList aDisplayed = aDisp->displayedObjects();
foreach (ObjectPtr anObj, aDisplayed) {
ResultPtr aResult = std::dynamic_pointer_cast<ModelAPI_Result>(anObj);
// We have to select a plane before any operation
showPreviewPlanes();
}
- QIntList aModes;
- aModes << TopAbs_FACE;
- aDisp->activateObjects(aModes);
+ activateSelection(true);
myLabel->setText(myText);
myLabel->setToolTip(myTooltip);
- connect(myWorkshop->selector(), SIGNAL(selectionChanged()), this, SLOT(onSelectionChanged()));
- activateFilters(myWorkshop->module()->workshop(), true);
+ connect(workshop()->selector(), SIGNAL(selectionChanged()), this, SLOT(onSelectionChanged()));
+ activateFilters(true);
aDisp->updateViewer();
}
void PartSet_WidgetSketchLabel::deactivate()
{
- // Do not set selection mode if the widget was activated for a small moment
- //mySelectionTimer->stop();
- //XGUI_Displayer* aDisp = myWorkshop->displayer();
- //aDisp->closeLocalContexts();
erasePreviewPlanes();
- activateFilters(myWorkshop->module()->workshop(), false);
+ activateSelection(false);
+
+ activateFilters(false);
+}
+
+void PartSet_WidgetSketchLabel::activateSelection(bool toActivate)
+{
+ if (toActivate) {
+ QIntList aModes;
+ std::shared_ptr<GeomAPI_Pln> aPlane = plane();
+ if (aPlane.get()) {
+ myWorkshop->module()->activeSelectionModes(aModes);
+ }
+ else {
+ aModes << TopAbs_FACE;
+ }
+ myWorkshop->activateSubShapesSelection(aModes);
+ } else {
+ myWorkshop->deactivateSubShapesSelection();
+ }
}
void PartSet_WidgetSketchLabel::erasePreviewPlanes()
{
if (myPreviewDisplayed) {
- XGUI_Displayer* aDisp = myWorkshop->displayer();
+ XGUI_Displayer* aDisp = workshop()->displayer();
aDisp->eraseAIS(myYZPlane, false);
aDisp->eraseAIS(myXZPlane, false);
aDisp->eraseAIS(myXYPlane, false);
// Create Preview
std::shared_ptr<GeomAPI_Pnt> anOrigin(new GeomAPI_Pnt(0, 0, 0));
std::shared_ptr<GeomAPI_Dir> aYZDir(new GeomAPI_Dir(1, 0, 0));
- std::shared_ptr<GeomAPI_Dir> aXZDir(new GeomAPI_Dir(0, 1, 0));
+ // -1, not 1 for correct internal sketch coords (issue 898)
+ std::shared_ptr<GeomAPI_Dir> aXZDir(new GeomAPI_Dir(0, -1, 0));
std::shared_ptr<GeomAPI_Dir> aXYDir(new GeomAPI_Dir(0, 0, 1));
std::vector<int> aYZRGB, aXZRGB, aXYRGB;
myXZPlane = createPreviewPlane(anOrigin, aXZDir, aG);
myXYPlane = createPreviewPlane(anOrigin, aXYDir, aB);
}
- XGUI_Displayer* aDisp = myWorkshop->displayer();
- aDisp->displayAIS(myYZPlane, false);
- aDisp->displayAIS(myXZPlane, false);
- aDisp->displayAIS(myXYPlane, false);
+ XGUI_Displayer* aDisp = workshop()->displayer();
+ aDisp->displayAIS(myYZPlane, true, false);
+ aDisp->displayAIS(myXZPlane, true, false);
+ aDisp->displayAIS(myXYPlane, true, false);
myPreviewDisplayed = true;
}
std::shared_ptr<GeomAPI_Shape> aGShape(new GeomAPI_Shape);
aGShape->setImpl(new TopoDS_Shape(theShape));
+
+
// get plane parameters
std::shared_ptr<GeomAPI_Pln> aPlane = GeomAlgoAPI_FaceBuilder::plane(aGShape);
return aDir;
}
-
-/*void PartSet_WidgetSketchLabel::setSketchingMode()
-{
- XGUI_Displayer* aDisp = myWorkshop->displayer();
- // Clear standard selection modes if they are defined
- //aDisp->activateObjects(aModes);
- //aDisp->openLocalContext();
-
- // Get default selection modes
-
- QIntList aModes;
- aModes.append(SketcherPrs_Tools::Sel_Dimension_Text);
- aModes.append(SketcherPrs_Tools::Sel_Dimension_Line);
- aModes.append(SketcherPrs_Tools::Sel_Constraint);
- aModes.append(AIS_Shape::SelectionMode((TopAbs_ShapeEnum) TopAbs_VERTEX));
- aModes.append(AIS_Shape::SelectionMode((TopAbs_ShapeEnum) TopAbs_EDGE));
-
- aDisp->activateObjects(aModes);
-}*/
-
void PartSet_WidgetSketchLabel::showConstraints(bool theOn)
{
myShowConstraints->setChecked(theOn);
emit showConstraintToggled(theOn);
}
+
+XGUI_Workshop* PartSet_WidgetSketchLabel::workshop() const
+{
+ XGUI_ModuleConnector* aConnector = dynamic_cast<XGUI_ModuleConnector*>(myWorkshop);
+ return aConnector->workshop();
+}