#include <GeomAPI_Face.h>
+#include <Events_InfoMessage.h>
+
#include <ModelAPI_Session.h>
#include <ModelAPI_ResultBody.h>
#include <ModelAPI_AttributeSelection.h>
#include <QLabel>
#include <QLineEdit>
+#include <QDoubleValidator>
//#include <QFormLayout>
#include <QVBoxLayout>
#include <QMessageBox>
#define DEBUG_UNDO_INVALID_SKETCH
-PartSet_WidgetSketchCreator::PartSet_WidgetSketchCreator(QWidget* theParent,
+PartSet_WidgetSketchCreator::PartSet_WidgetSketchCreator(QWidget* theParent,
PartSet_Module* theModule,
const Config_WidgetAPI* theData)
: ModuleBase_WidgetSelector(theParent, theModule->workshop(), theData),
QString aLabelText = QString::fromStdString(theData->widgetLabel());
QString aLabelIcon = QString::fromStdString(theData->widgetIcon());
+ // Size of the View control
+ mySizeOfViewWidget = new QWidget(this);
+ QHBoxLayout* aSizeLayout = new QHBoxLayout(mySizeOfViewWidget);
+ aSizeLayout->addWidget(new QLabel("Size of the view", mySizeOfViewWidget));
+ mySizeOfView = new QLineEdit(mySizeOfViewWidget);
+
+ QDoubleValidator* aValidator = new QDoubleValidator(0, DBL_MAX, 12, mySizeOfView);
+ aValidator->setLocale(ModuleBase_Tools::doubleLocale());
+ aValidator->setNotation(QDoubleValidator::StandardNotation);
+ mySizeOfView->setValidator(aValidator);
+ aSizeLayout->addWidget(mySizeOfView);
+
myLabel = new QLabel(aLabelText, this);
myLabel->setWordWrap(true);
+
+ aLayout->addWidget(mySizeOfViewWidget);
aLayout->addWidget(myLabel);
aLayout->addStretch(1);
return true;
}
-bool PartSet_WidgetSketchCreator::storeValueCustom() const
+bool PartSet_WidgetSketchCreator::storeValueCustom()
{
return true;
}
if (theSelectionControl) {
bool aBodyIsVisualized = myPreviewPlanes->hasVisualizedBodies(myWorkshop);
- if (!aBodyIsVisualized) {
+ bool aSketchIsVisualized = myPreviewPlanes->hasVisualizedSketch(myWorkshop);
+ if (!aBodyIsVisualized && !aSketchIsVisualized) {
// We have to select a plane before any operation
myPreviewPlanes->showPreviewPlanes(myWorkshop);
+ mySizeOfViewWidget->setVisible(true);
+ }
+ else {
+ mySizeOfViewWidget->setVisible(false);
}
+
} else {
bool aHidePreview = myPreviewPlanes->isPreviewDisplayed();
myPreviewPlanes->erasePreviewPlanes(myWorkshop);
}
}
-QIntList PartSet_WidgetSketchCreator::getShapeTypes() const
+QIntList PartSet_WidgetSketchCreator::shapeTypes() const
{
QIntList aShapeTypes;
foreach(QString aType, myShapeTypes) {
bool aDone = false;
if (!startSketchOperation(theValues)) {
myIsCustomAttribute = true;
- QList<ModuleBase_ViewerPrsPtr>::const_iterator anIt = theValues.begin(), aLast = theValues.end();
+ QList<ModuleBase_ViewerPrsPtr>::const_iterator
+ anIt = theValues.begin(), aLast = theValues.end();
bool aProcessed = false;
for (; anIt != aLast; anIt++) {
ModuleBase_ViewerPrsPtr aValue = *anIt;
emit valuesChanged();
updateObject(myFeature);
setVisibleSelectionControl(false);
- // manually deactivation because the widget was not activated as has no focus acceptin controls
+ // manually deactivation because the widget was
+ // not activated as has no focus acceptin controls
deactivate();
emit focusOutWidget(this);
}
{
}
-bool PartSet_WidgetSketchCreator::startSketchOperation(const QList<ModuleBase_ViewerPrsPtr>& theValues)
+bool PartSet_WidgetSketchCreator::startSketchOperation(
+ const QList<ModuleBase_ViewerPrsPtr>& theValues)
{
bool aSketchStarted = false;
ResultPtr aResult = std::dynamic_pointer_cast<ModelAPI_Result>(aValue->object());
/// sketch should not started by object(face) selected as global. If Local face is selected,
/// sketch is started
- if (aResult.get() && aValue->shape().get() && aResult->shape()->isEqual(aValue->shape()))
- return aSketchStarted;
-
+ if (aResult.get() && aValue->shape().get() && aResult->shape()->isEqual(aValue->shape())) {
+ ResultConstructionPtr aConstruction =
+ std::dynamic_pointer_cast<ModelAPI_ResultConstruction>(aResult);
+ if (!aConstruction.get() || !aConstruction->isInfinite())
+ return aSketchStarted;
+ }
aSketchStarted = true;
-
+ // Set View size if a plane is selected
+ if (myPreviewPlanes->isPreviewDisplayed() &&
+ myPreviewPlanes->isPreviewShape(aValue->shape())) {
+ QString aSizeOfViewStr = mySizeOfView->text();
+ if (!aSizeOfViewStr.isEmpty()) {
+ bool isOk;
+ double aSizeOfView = aSizeOfViewStr.toDouble(&isOk);
+ if (isOk && aSizeOfView > 0) {
+ Handle(V3d_View) aView3d = myWorkshop->viewer()->activeView();
+ if (!aView3d.IsNull()) {
+ Bnd_Box aBndBox;
+ double aHalfSize = aSizeOfView/2.0;
+ aBndBox.Update(-aHalfSize, -aHalfSize, -aHalfSize, aHalfSize, aHalfSize, aHalfSize);
+ aView3d->FitAll(aBndBox, 0.01, false);
+ }
+ }
+ }
+ }
// manually deactivation because the widget was not activated as has no focus acceptin controls
deactivate();
bool aHidePreview = myPreviewPlanes->isPreviewDisplayed();
myPreviewPlanes->erasePreviewPlanes(myWorkshop);
// Launch Sketch operation
- CompositeFeaturePtr aCompFeature =
+ CompositeFeaturePtr aCompFeature =
std::dynamic_pointer_cast<ModelAPI_CompositeFeature>(myFeature);
// start edit operation for the sketch
aValues.push_back(aValue);
aFOperation->setPreselection(aValues);
- myModule->sendOperation(aFOperation);
+ myWorkshop->processLaunchOperation(aFOperation);
return aSketchStarted;
}
return true;
}
else
- connect(myModule, SIGNAL(resumed(ModuleBase_Operation*)), SLOT(onResumed(ModuleBase_Operation*)));
+ connect(myModule, SIGNAL(resumed(ModuleBase_Operation*)),
+ SLOT(onResumed(ModuleBase_Operation*)));
return true;
}
// Validate the created sketch. If it is valid, it is set into the composite feature selection
// list, otherwise it is removed
- CompositeFeaturePtr aCompFeature =
+ CompositeFeaturePtr aCompFeature =
std::dynamic_pointer_cast<ModelAPI_CompositeFeature>(myFeature);
AttributeSelectionListPtr anAttrList = myFeature->data()->selectionList(myAttributeListID);
if (aCompFeature->numberOfSubs() > 0) {
aMgr->startOperation("Delete invalid Sketch feature", false);
// delete invalid sketch
- CompositeFeaturePtr aSketchFeature =
+ CompositeFeaturePtr aSketchFeature =
std::dynamic_pointer_cast<ModelAPI_CompositeFeature>(aCompFeature->subFeature(0));
QObjectPtrList anObjects;
anObjects.append(aSketchFeature);
XGUI_Workshop* aWorkshop = XGUI_Tools::workshop(myModule->workshop());
- aWorkshop->deleteFeatures(anObjects, std::set<FeaturePtr>());
+ aWorkshop->deleteFeatures(anObjects);
aMgr->finishOperation();
#endif
// Update value in attribute selection list
XGUI_Workshop* aWorkshop = XGUI_Tools::workshop(myModule->workshop());
- XGUI_PropertyPanel* aPanel = aWorkshop->propertyPanel();
- const QList<ModuleBase_ModelWidget*>& aWidgets = aPanel->modelWidgets();
+ XGUI_PropertyPanel* aPropertyPanel = aWorkshop->propertyPanel();
+ const QList<ModuleBase_ModelWidget*>& aWidgets = aPropertyPanel->modelWidgets();
+ ModuleBase_ModelWidget* aListWidget = 0;
foreach(ModuleBase_ModelWidget* aWidget, aWidgets) {
- if (aWidget->attributeID() == myAttributeListID)
- aWidget->restoreValue();
+ if (aWidget->attributeID() == myAttributeListID) {
+ aListWidget = aWidget;
+ break;
+ }
+ }
+ if (aListWidget) {
+ aListWidget->restoreValue();
+ aPropertyPanel->activateNextWidget(aListWidget);
}
// Hide sketcher result
- CompositeFeaturePtr aSketchFeature =
+ CompositeFeaturePtr aSketchFeature =
std::dynamic_pointer_cast<ModelAPI_CompositeFeature>(aCompFeature->subFeature(0));
std::list<ResultPtr> aResults = aSketchFeature->results();
std::list<ResultPtr>::const_iterator aIt;
SessionPtr aMgr = ModelAPI_Session::get();
ModelAPI_ValidatorsFactory* aFactory = aMgr->validators();
AttributePtr anAttribute = myFeature->attribute(anObjectsAttribute);
- std::string aValidatorID, anError;
+ std::string aValidatorID;
+ Events_InfoMessage anError;
aSelList->append(aRes, GeomShapePtr());
if (aFactory->validate(anAttribute, aValidatorID, anError))
updateObject(aCompFeature);
SessionPtr aMgr = ModelAPI_Session::get();
ModelAPI_ValidatorsFactory* aFactory = aMgr->validators();
- std::string aValidatorID, anError;
+ std::string aValidatorID;
+ Events_InfoMessage anError;
bool isValidPComposite = aFactory->validate(anAttrList, aValidatorID, anError);
if (!isValidPComposite) {
XGUI_Workshop* aWorkshop = XGUI_Tools::workshop(myModule->workshop());
+ // TODO(spo): translate
QMessageBox::question(aWorkshop->desktop(), tr("Apply current feature"),
- tr("Sketch is invalid and will be deleted.\nError: %1").arg(anError.c_str()),
+ tr("Sketch is invalid and will be deleted.\nError: %1")
+ .arg(anError.messageString().c_str()),
QMessageBox::Ok);
}
return isValidPComposite;
}
-void PartSet_WidgetSketchCreator::setSketchObjectToList(const CompositeFeaturePtr& theCompositeFeature,
- const AttributePtr& theAttribute)
+void PartSet_WidgetSketchCreator::setSketchObjectToList(
+ const CompositeFeaturePtr& theCompositeFeature,
+ const AttributePtr& theAttribute)
{
if (!theCompositeFeature.get() || theCompositeFeature->numberOfSubs() != 1)
return;
}
ResultPtr aSketchRes = aSketchFeature->results().front();
- ResultConstructionPtr aConstruction = std::dynamic_pointer_cast<ModelAPI_ResultConstruction>(aSketchRes);
+ ResultConstructionPtr aConstruction =
+ std::dynamic_pointer_cast<ModelAPI_ResultConstruction>(aSketchRes);
if(!aConstruction.get()) {
return;
}
