X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModuleBase%2FModuleBase_Tools.cpp;h=bd3c855cc0b8628317c957ba05a751613bc25d9b;hb=26a7489eb80cc314d2719eb88c243affff2d7428;hp=8f184df155f3ba01f7675709bc66f802ddfae800;hpb=5905e018e30ae6867720c08ed2ba7745a0f94585;p=modules%2Fshaper.git diff --git a/src/ModuleBase/ModuleBase_Tools.cpp b/src/ModuleBase/ModuleBase_Tools.cpp index 8f184df15..bd3c855cc 100755 --- a/src/ModuleBase/ModuleBase_Tools.cpp +++ b/src/ModuleBase/ModuleBase_Tools.cpp @@ -1,8 +1,22 @@ -// Copyright (C) 2014-20xx CEA/DEN, EDF R&D - -// File: ModuleBase_Tools.cpp -// Created: 11 July 2014 -// Author: Vitaly Smetannikov +// Copyright (C) 2014-2017 CEA/DEN, EDF R&D +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// See http://www.salome-platform.org/ or +// email : webmaster.salome@opencascade.com +// #include "ModuleBase_Tools.h" @@ -13,6 +27,7 @@ #include #include #include +#include #include #include @@ -32,7 +47,11 @@ #include #include #include +#include +#include + +#include #include #include @@ -62,28 +81,15 @@ #include #include +#ifdef WIN32 +#pragma warning(disable : 4996) // for getenv +#endif + const double tolerance = 1e-7; const double DEFAULT_DEVIATION_COEFFICIENT = 1.e-4; //#define DEBUG_ACTIVATE_WINDOW //#define DEBUG_SET_FOCUS -//#define DEBUG_SELECTION_INFO - -#ifdef DEBUG_SELECTION_INFO -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#endif #ifdef WIN32 # define FSEP "\\" @@ -129,7 +135,10 @@ void zeroMargins(QLayout* theLayout) void activateWindow(QWidget* theWidget, const QString& theInfo) { - theWidget->activateWindow(); + if (theWidget) { + theWidget->activateWindow(); + theWidget->raise(); + } #ifdef DEBUG_ACTIVATE_WINDOW qDebug(QString("activateWindow: %1").arg(theInfo).toStdString().c_str()); @@ -138,8 +147,10 @@ void activateWindow(QWidget* theWidget, const QString& theInfo) void setFocus(QWidget* theWidget, const QString& theInfo) { + activateWindow(theWidget); theWidget->setFocus(); - + // rectangle of focus is not visible on tool button widgets + theWidget->repaint(); #ifdef DEBUG_SET_FOCUS qDebug(QString("setFocus: %1").arg(theInfo).toStdString().c_str()); #endif @@ -215,7 +226,7 @@ QPixmap lighter(const QString& theIcon, const int theLighterValue) void setSpinText(ModuleBase_ParamSpinBox* theSpin, const QString& theText) { - if (theSpin->text() == theText) + if (theSpin->text() == theText) return; // In order to avoid extra text setting because it will // reset cursor position in control @@ -277,6 +288,15 @@ QAction* createAction(const QIcon& theIcon, const QString& theText, return anAction; } +#ifdef _DEBUG +QString objectName(const ObjectPtr& theObj) +{ + if (!theObj.get()) + return ""; + + return theObj->data()->name().c_str(); +} + QString objectInfo(const ObjectPtr& theObj, const bool isUseAttributesInfo) { QString aFeatureStr = "feature"; @@ -309,221 +329,19 @@ QString objectInfo(const ObjectPtr& theObj, const bool isUseAttributesInfo) .c_str()); } if (isUseAttributesInfo) { - std::list anAttrs = aFeature->data()->attributes(""); - std::list::const_iterator anIt = anAttrs.begin(), aLast = anAttrs.end(); - QStringList aValues; - for(; anIt != aLast; anIt++) { - AttributePtr anAttr = *anIt; - QString aValue = "not defined"; - std::string aType = anAttr->attributeType(); - if (aType == GeomDataAPI_Point2D::typeId()) { - std::shared_ptr aPoint = std::dynamic_pointer_cast( - anAttr); - if (aPoint.get()) - aValue = QString("(%1, %2)").arg(aPoint->x()).arg(aPoint->y()); - } - else if (aType == ModelAPI_AttributeRefAttr::typeId()) { - } - - aValues.push_back(QString("%1: %2").arg(anAttr->id().c_str()).arg(aValue).toStdString().c_str()); - } - if (!aValues.empty()) - aFeatureStr.append(QString(", attributes: %1").arg(aValues.join(", ").toStdString().c_str())); + std::set > anAttributes; + std::string aPointsInfo = ModelGeomAlgo_Point2D::getPontAttributesInfo(aFeature, + anAttributes).c_str(); + if (!aPointsInfo.empty()) + aFeatureStr.append(QString(", attributes: %1") + .arg(aPointsInfo.c_str()).toStdString().c_str()); } } return aFeatureStr; } - -#ifdef DEBUG_SELECTION_INFO -QString getShapeTypeInfo(const int theType) -{ - QString anInfo = "Undefined"; - switch(theType) { - case TopAbs_COMPOUND: anInfo = "compound"; break; - case TopAbs_COMPSOLID: anInfo = "compsolid"; break; - case TopAbs_SOLID: anInfo = "solid"; break; - case TopAbs_SHELL: anInfo = "shell"; break; - case TopAbs_FACE: anInfo = "face"; break; - case TopAbs_WIRE: anInfo = "wire"; break; - case TopAbs_EDGE: anInfo = "edge"; break; - case TopAbs_VERTEX: anInfo = "vertex"; break; - case TopAbs_SHAPE: anInfo = "shape"; break; - case ModuleBase_ResultPrs::Sel_Result: - anInfo = "result_shape"; break; - default: break; - } - return anInfo; -} - -QString getModeInfo(const int theMode) -{ - QString anInfo = "Undefined"; - switch(theMode) { - case 0: anInfo = "SHAPE(0)"; break; - case 1: anInfo = "VERTEX(1)"; break; - case 2: anInfo = "EDGE(2)"; break; - case 3: anInfo = "WIRE(3)"; break; - case 4: anInfo = "FACE(4)"; break; - case 5: anInfo = "SHELL(5)"; break; - case 6: anInfo = "SOLID(6)"; break; - case 7: anInfo = "COMPSOLID(7)"; break; - case 8: anInfo = "COMPOUND(8)"; break; - case 100: anInfo = "Sel_Mode_First(100)"; break; //SketcherPrs_Tools - case 101: anInfo = "Sel_Constraint(101)"; break; - case 102: anInfo = "Sel_Dimension_All(102)"; break; - case 103: anInfo = "Sel_Dimension_Line(103)"; break; - case 104: anInfo = "Sel_Dimension_Text(104)"; break; - default: break; - } - return anInfo; -} - -QString displayedInteractiveObjects(Handle(AIS_InteractiveContext)& theContext, - const bool theShapeInfoOnly = true) -{ - if (theContext.IsNull()) - return ""; - AIS_ListOfInteractive aListOfIO; - theContext->DisplayedObjects(aListOfIO, false); - QStringList anObjects; - AIS_ListIteratorOfListOfInteractive aIt; - for (aIt.Initialize(aListOfIO); aIt.More(); aIt.Next()) { - Handle(AIS_InteractiveObject) anAISIO = aIt.Value(); - Handle(AIS_Shape) aShapePrs = Handle(AIS_Shape)::DownCast(anAISIO); - if (theShapeInfoOnly && aShapePrs.IsNull()) - continue; - - QString anInfo = "IO"; - std::ostringstream aPtrStr; - aPtrStr << "[" << anAISIO.Access() << "]"; - anInfo += aPtrStr.str().c_str(); - - if (!aShapePrs.IsNull()) { - const TopoDS_Shape& aShape = aShapePrs->Shape(); - if (aShape.IsNull()) { - //Events_Error::throwException("An empty AIS presentation"); - } - else - anInfo += QString(", shape type: %1").arg(getShapeTypeInfo(aShape.ShapeType())); - } - TColStd_ListOfInteger aTColModes; - theContext->ActivatedModes(anAISIO, aTColModes); - TColStd_ListIteratorOfListOfInteger itr( aTColModes ); - QIntList aModesActivatedForIO; - bool isDeactivated = false; - QStringList aModes; - for (; itr.More(); itr.Next() ) { - Standard_Integer aMode = itr.Value(); - aModes.append(getModeInfo(aMode)); - //int aShapeMode = (aMode > 8)? aMode : AIS_Shape::SelectionType(aMode); - } - if (aModes.size() > 0) - anInfo += QString(", activated modes: %1").arg(aModes.join(", ")); - - anObjects += anInfo; - } - QString aValue = QString("displayedIO[%1]").arg(anObjects.size()); - if (anObjects.size() > 0) - aValue += QString(":\n %1").arg(anObjects.join("\n ")); - return aValue; -} - -QString activeOwners(Handle(AIS_InteractiveContext)& theContext, const bool theShapeInfoOnly = true) -{ - if (theContext.IsNull()) - return ""; - Handle(AIS_LocalContext) aLContext = theContext->LocalContext(); - TCollection_AsciiString aSelectionName = aLContext->SelectionName(); - aLContext->UnhilightPicked(Standard_False); - - NCollection_List anActiveOwners; - aLContext->MainSelector()->ActiveOwners(anActiveOwners); - NCollection_List::Iterator anOwnersIt (anActiveOwners); - Handle(SelectMgr_EntityOwner) anOwner; - QStringList anObjects; - for (; anOwnersIt.More(); anOwnersIt.Next()) { - anOwner = Handle(SelectMgr_EntityOwner)::DownCast (anOwnersIt.Value()); - Handle(StdSelect_BRepOwner) BROwnr = Handle(StdSelect_BRepOwner)::DownCast(anOwner); - if (theShapeInfoOnly && BROwnr.IsNull()) - continue; - - QString anInfo = "Owner"; - std::ostringstream aPtrStr; - aPtrStr << "[" << anOwner.Access() << "]"; - anInfo += aPtrStr.str().c_str(); - - Handle(AIS_InteractiveObject) aAISObj = - Handle(AIS_InteractiveObject)::DownCast(anOwner->Selectable()); - if (!aAISObj.IsNull()) { - std::ostringstream aPtrStr; - aPtrStr << "[" << aAISObj.Access() << "]"; - anInfo += QString(", selectable(IO): %1").arg(aPtrStr.str().c_str()); - } - - if (!BROwnr.IsNull() && BROwnr->HasShape()) { - const TopoDS_Shape& aShape = BROwnr->Shape(); - if (aShape.IsNull()) { - //Events_Error::throwException("An empty AIS presentation"); - } - else - anInfo += QString(", shape type: %1").arg(getShapeTypeInfo(aShape.ShapeType())); - } - anObjects += anInfo; - } - QString aValue = QString("activeOwners[%1]").arg(anObjects.size()); - if (anObjects.size() > 0) - aValue += QString(":\n %1").arg(anObjects.join("\n ")); - return aValue; -} - -QString selectedOwners(Handle(AIS_InteractiveContext)& theContext, const bool theShapeInfoOnly = true) -{ - QStringList anObjects; - if (theContext.IsNull()) - return ""; - - QList aSelectedIds; // Remember of selected address in order to avoid duplicates - for (theContext->InitSelected(); theContext->MoreSelected(); theContext->NextSelected()) { - Handle(SelectMgr_EntityOwner) anOwner = theContext->SelectedOwner(); - Handle(StdSelect_BRepOwner) BROwnr = Handle(StdSelect_BRepOwner)::DownCast(anOwner); - if (theShapeInfoOnly && BROwnr.IsNull()) - continue; - - if (aSelectedIds.contains((long)anOwner.Access())) - continue; - aSelectedIds.append((long)anOwner.Access()); - - QString anInfo = "Owner"; - std::ostringstream aPtrStr; - aPtrStr << "[" << anOwner.Access() << "]"; - anInfo += aPtrStr.str().c_str(); - - if (!BROwnr.IsNull() && BROwnr->HasShape()) { - const TopoDS_Shape& aShape = BROwnr->Shape(); - anInfo += QString(", shape type = %1").arg(getShapeTypeInfo(aShape.ShapeType())); - } - anObjects += anInfo; - } - QString aValue = QString("selectedOwners[%1]").arg(anObjects.size()); - if (anObjects.size() > 0) - aValue += QString(":\n %1").arg(anObjects.join("\n ")); - return aValue; -} #endif -void selectionInfo(Handle(AIS_InteractiveContext)& theContext, const std::string& thePrefix) -{ -#ifdef DEBUG_SELECTION_INFO - QString aValue = QString("\n\n\nDEBUG_SELECTION_INFO for '%1'\n%2\n%3\n%4") - .arg(thePrefix.c_str()) - .arg(displayedInteractiveObjects(theContext)) - .arg(activeOwners(theContext)) - .arg(selectedOwners(theContext)); - qDebug(aValue.toStdString().c_str()); -#endif -} - typedef QMap ShapeTypes; static ShapeTypes myShapeTypes; @@ -557,28 +375,39 @@ int shapeType(const QString& theType) } void checkObjects(const QObjectPtrList& theObjects, bool& hasResult, bool& hasFeature, - bool& hasParameter, bool& hasCompositeOwner) + bool& hasParameter, bool& hasCompositeOwner, bool& hasResultInHistory, + bool& hasFolder) { hasResult = false; hasFeature = false; hasParameter = false; hasCompositeOwner = false; + hasResultInHistory = false; + hasFolder = false; foreach(ObjectPtr aObj, theObjects) { FeaturePtr aFeature = std::dynamic_pointer_cast(aObj); ResultPtr aResult = std::dynamic_pointer_cast(aObj); + FolderPtr aFolder = std::dynamic_pointer_cast(aObj); ResultParameterPtr aConstruction = std::dynamic_pointer_cast(aResult); hasResult |= (aResult.get() != NULL); hasFeature |= (aFeature.get() != NULL); + hasFolder |= (aFolder.get() != NULL); hasParameter |= (aConstruction.get() != NULL); - if (hasFeature) + if (hasFeature) hasCompositeOwner |= (ModelAPI_Tools::compositeOwner(aFeature) != NULL); - if (hasFeature && hasResult && hasParameter && hasCompositeOwner) + + if (!hasResultInHistory && aResult.get()) { + FeaturePtr aFeature = ModelAPI_Feature::feature(aResult); + hasResultInHistory = aFeature.get() && aFeature->isInHistory(); + } + + if (hasFeature && hasResult && hasParameter && hasCompositeOwner && hasFeature) break; } } -bool setDefaultDeviationCoefficient(std::shared_ptr theGeomShape) +/*bool setDefaultDeviationCoefficient(std::shared_ptr theGeomShape) { if (!theGeomShape.get()) return false; @@ -587,9 +416,9 @@ bool setDefaultDeviationCoefficient(std::shared_ptr theGeomShape) GeomAPI_ShapeExplorer anExp(theGeomShape, GeomAPI_Shape::FACE); bool anEmpty = anExp.empty(); return !anExp.more(); -} +}*/ -void setDefaultDeviationCoefficient(const std::shared_ptr& theResult, +/*void setDefaultDeviationCoefficient(const std::shared_ptr& theResult, const Handle(Prs3d_Drawer)& theDrawer) { if (!theResult.get()) @@ -607,7 +436,7 @@ void setDefaultDeviationCoefficient(const std::shared_ptr& theR if (aUseDeviation) theDrawer->SetDeviationCoefficient(DEFAULT_DEVIATION_COEFFICIENT); } - +*/ void setDefaultDeviationCoefficient(const TopoDS_Shape& theShape, const Handle(Prs3d_Drawer)& theDrawer) { @@ -616,15 +445,25 @@ void setDefaultDeviationCoefficient(const TopoDS_Shape& theShape, std::shared_ptr aGeomShape(new GeomAPI_Shape()); aGeomShape->setImpl(new TopoDS_Shape(theShape)); - if (setDefaultDeviationCoefficient(aGeomShape)) - theDrawer->SetDeviationCoefficient(DEFAULT_DEVIATION_COEFFICIENT); + + // if the shape could not be exploded on faces, it contains only wires, edges, and vertices + // correction of deviation for them should not influence to the application performance + GeomAPI_ShapeExplorer anExp(aGeomShape, GeomAPI_Shape::FACE); + bool isConstruction = !anExp.more(); + + double aDeflection; + if (isConstruction) + aDeflection = Config_PropManager::real("Visualization", "construction_deflection"); + else + aDeflection = Config_PropManager::real("Visualization", "body_deflection"); + + theDrawer->SetDeviationCoefficient(aDeflection); } Quantity_Color color(const std::string& theSection, - const std::string& theName, - const std::string& theDefault) + const std::string& theName) { - std::vector aColor = Config_PropManager::color(theSection, theName, theDefault); + std::vector aColor = Config_PropManager::color(theSection, theName); return Quantity_Color(aColor[0] / 255., aColor[1] / 255., aColor[2] / 255., Quantity_TOC_RGB); } @@ -633,17 +472,20 @@ ObjectPtr getObject(const AttributePtr& theAttribute) ObjectPtr anObject; std::string anAttrType = theAttribute->attributeType(); if (anAttrType == ModelAPI_AttributeRefAttr::typeId()) { - AttributeRefAttrPtr anAttr = std::dynamic_pointer_cast(theAttribute); + AttributeRefAttrPtr anAttr = + std::dynamic_pointer_cast(theAttribute); if (anAttr != NULL && anAttr->isObject()) anObject = anAttr->object(); } if (anAttrType == ModelAPI_AttributeSelection::typeId()) { - AttributeSelectionPtr anAttr = std::dynamic_pointer_cast(theAttribute); + AttributeSelectionPtr anAttr = + std::dynamic_pointer_cast(theAttribute); if (anAttr != NULL) anObject = anAttr->context(); } if (anAttrType == ModelAPI_AttributeReference::typeId()) { - AttributeReferencePtr anAttr = std::dynamic_pointer_cast(theAttribute); + AttributeReferencePtr anAttr = + std::dynamic_pointer_cast(theAttribute); if (anAttr.get() != NULL) anObject = anAttr->value(); } @@ -676,6 +518,18 @@ TopAbs_ShapeEnum getCompoundSubType(const TopoDS_Shape& theShape) return aShapeType; } +TopoDS_Shape getSelectedShape(const std::shared_ptr& thePrs) +{ + if (thePrs->shape().get()) + return thePrs->shape()->impl(); + + Handle(StdSelect_BRepOwner) anOwner = Handle(StdSelect_BRepOwner)::DownCast(thePrs->owner()); + if (!anOwner.IsNull()) + return anOwner->Shape(); + + return TopoDS_Shape(); +} + void getParameters(QStringList& theParameters) { theParameters.clear(); @@ -700,7 +554,8 @@ void getParameters(QStringList& theParameters) } } -std::string findGreedAttribute(ModuleBase_IWorkshop* theWorkshop, const FeaturePtr& theFeature) +std::string findGreedAttribute(ModuleBase_IWorkshop* theWorkshop, + const FeaturePtr& theFeature) { std::string anAttributeId; @@ -725,14 +580,16 @@ bool hasObject(const AttributePtr& theAttribute, const ObjectPtr& theObject, std::string aType = theAttribute->attributeType(); if (aType == ModelAPI_AttributeReference::typeId()) { - AttributeReferencePtr aRef = std::dynamic_pointer_cast(theAttribute); + AttributeReferencePtr aRef = + std::dynamic_pointer_cast(theAttribute); ObjectPtr aObject = aRef->value(); aHasObject = aObject && aObject->isSame(theObject); //if (!(aObject && aObject->isSame(theObject))) { // aRef->setValue(theObject); //} } else if (aType == ModelAPI_AttributeRefAttr::typeId()) { - AttributeRefAttrPtr aRefAttr = std::dynamic_pointer_cast(theAttribute); + AttributeRefAttrPtr aRefAttr = + std::dynamic_pointer_cast(theAttribute); AttributePtr anAttribute = theWorkshop->module()->findAttribute(theObject, theShape); if (anAttribute.get()) { @@ -758,17 +615,17 @@ bool hasObject(const AttributePtr& theAttribute, const ObjectPtr& theObject, std::dynamic_pointer_cast(theAttribute); ResultPtr aResult = std::dynamic_pointer_cast(theObject); aHasObject = aSelectionListAttr->isInList(aResult, theShape, theTemporarily); - //if (!theCheckIfAttributeHasObject || !aSelectionListAttr->isInList(aResult, theShape, theTemporarily)) - // aSelectionListAttr->append(aResult, theShape, theTemporarily); } else if (aType == ModelAPI_AttributeRefList::typeId()) { - AttributeRefListPtr aRefListAttr = std::dynamic_pointer_cast(theAttribute); + AttributeRefListPtr aRefListAttr = + std::dynamic_pointer_cast(theAttribute); aHasObject = aRefListAttr->isInList(theObject); //if (!theCheckIfAttributeHasObject || !aRefListAttr->isInList(theObject)) // aRefListAttr->append(theObject); } else if (aType == ModelAPI_AttributeRefAttrList::typeId()) { - AttributeRefAttrListPtr aRefAttrListAttr = std::dynamic_pointer_cast(theAttribute); + AttributeRefAttrListPtr aRefAttrListAttr = + std::dynamic_pointer_cast(theAttribute); AttributePtr anAttribute = theWorkshop->module()->findAttribute(theObject, theShape); if (anAttribute.get()) { @@ -795,13 +652,15 @@ bool setObject(const AttributePtr& theAttribute, const ObjectPtr& theObject, bool isDone = true; std::string aType = theAttribute->attributeType(); if (aType == ModelAPI_AttributeReference::typeId()) { - AttributeReferencePtr aRef = std::dynamic_pointer_cast(theAttribute); + AttributeReferencePtr aRef = + std::dynamic_pointer_cast(theAttribute); ObjectPtr aObject = aRef->value(); if (!(aObject && aObject->isSame(theObject))) { aRef->setValue(theObject); } } else if (aType == ModelAPI_AttributeRefAttr::typeId()) { - AttributeRefAttrPtr aRefAttr = std::dynamic_pointer_cast(theAttribute); + AttributeRefAttrPtr aRefAttr = + std::dynamic_pointer_cast(theAttribute); AttributePtr anAttribute = theWorkshop->module()->findAttribute(theObject, theShape); if (anAttribute.get()) @@ -824,11 +683,13 @@ bool setObject(const AttributePtr& theAttribute, const ObjectPtr& theObject, AttributeSelectionListPtr aSelectionListAttr = std::dynamic_pointer_cast(theAttribute); ResultPtr aResult = std::dynamic_pointer_cast(theObject); - if (!theCheckIfAttributeHasObject || !aSelectionListAttr->isInList(aResult, theShape, theTemporarily)) + if (!theCheckIfAttributeHasObject || + !aSelectionListAttr->isInList(aResult, theShape, theTemporarily)) aSelectionListAttr->append(aResult, theShape, theTemporarily); } else if (aType == ModelAPI_AttributeRefList::typeId()) { - AttributeRefListPtr aRefListAttr = std::dynamic_pointer_cast(theAttribute); + AttributeRefListPtr aRefListAttr = + std::dynamic_pointer_cast(theAttribute); if (!theCheckIfAttributeHasObject || !aRefListAttr->isInList(theObject)) { if (theObject.get()) aRefListAttr->append(theObject); @@ -837,7 +698,8 @@ bool setObject(const AttributePtr& theAttribute, const ObjectPtr& theObject, } } else if (aType == ModelAPI_AttributeRefAttrList::typeId()) { - AttributeRefAttrListPtr aRefAttrListAttr = std::dynamic_pointer_cast(theAttribute); + AttributeRefAttrListPtr aRefAttrListAttr = + std::dynamic_pointer_cast(theAttribute); AttributePtr anAttribute = theWorkshop->module()->findAttribute(theObject, theShape); if (anAttribute.get()) { @@ -865,7 +727,8 @@ GeomShapePtr getShape(const AttributePtr& theAttribute, ModuleBase_IWorkshop* th std::string aType = theAttribute->attributeType(); if (aType == ModelAPI_AttributeReference::typeId()) { } else if (aType == ModelAPI_AttributeRefAttr::typeId()) { - AttributeRefAttrPtr aRefAttr = std::dynamic_pointer_cast(theAttribute); + AttributeRefAttrPtr aRefAttr = + std::dynamic_pointer_cast(theAttribute); if (aRefAttr.get() && !aRefAttr->isObject()) { AttributePtr anAttribute = aRefAttr->attr(); aShape = theWorkshop->module()->findShape(anAttribute); @@ -884,7 +747,12 @@ void flushUpdated(ObjectPtr theObject) { blockUpdateViewer(true); + // Fix the problem of not previewed results of constraints applied. Flush Create/Delete + // (for the sketch result) to start processing of the sketch in the solver. + // TODO: these flushes should be moved in a separate method provided by Model + Events_Loop::loop()->flush(Events_Loop::eventByName(EVENT_OBJECT_CREATED)); Events_Loop::loop()->flush(Events_Loop::eventByName(EVENT_OBJECT_UPDATED)); + Events_Loop::loop()->flush(Events_Loop::eventByName(EVENT_OBJECT_DELETED)); blockUpdateViewer(false); } @@ -948,7 +816,20 @@ QString wrapTextByWords(const QString& theValue, QWidget* theWidget, } //************************************************************** -void refsToFeatureInFeatureDocument(const ObjectPtr& theObject, std::set& theRefFeatures) +QLocale doubleLocale() +{ + // VSR 01/07/2010: Disable thousands separator for spin box + // (to avoid inconsistency of double-2-string and string-2-double conversion) + QLocale aLocale; + aLocale.setNumberOptions(aLocale.numberOptions() | + QLocale::OmitGroupSeparator | + QLocale::RejectGroupSeparator); + return aLocale; +} + +//************************************************************** +void refsToFeatureInFeatureDocument(const ObjectPtr& theObject, + std::set& theRefFeatures) { FeaturePtr aFeature = ModelAPI_Feature::feature(theObject); if (aFeature.get()) { @@ -1048,10 +929,11 @@ bool askToDelete(const std::set theFeatures, std::string aNotActivatedNames; if (!ModelAPI_Tools::allDocumentsActivated(aNotActivatedNames)) { if (ModuleBase_Tools::hasModuleDocumentFeature(theFeatures)) - aNotActivatedDocWrn = QObject::tr("Selected objects can be used in Part documents which are not loaded:%1.\n") + aNotActivatedDocWrn = + QObject::tr("Selected objects can be used in Part documents which are not loaded:%1.\n") .arg(aNotActivatedNames.c_str()); } - + std::set aFeaturesRefsTo; std::set aFeaturesRefsToParameter; std::set aParameterFeatures; @@ -1124,17 +1006,25 @@ bool askToDelete(const std::set theFeatures, if (!thePrefixInfo.empty()) aText = thePrefixInfo.c_str(); QString aSep = ", "; - if (!aPartFeatureNames.empty()) - aText += QString(QObject::tr("The following parts will be deleted: %1.\n")).arg(aPartFeatureNames.join(aSep)); + if (!aPartFeatureNames.empty()) { + aText += QString(QObject::tr("The following parts will be deleted: %1.\n")) + .arg(aPartFeatureNames.join(aSep)); + } if (!aNotActivatedDocWrn.isEmpty()) aText += aNotActivatedDocWrn; - if (!anOtherFeatureNames.empty()) - aText += QString(QObject::tr("Features are used in the following features: %1.\nThese features will be deleted.\n")) + if (!anOtherFeatureNames.empty()) { + const char* aMsg = "Features are used in the following features: %1.\nThese " + "features will be deleted.\n"; + aText += QString(QObject::tr(aMsg)) .arg(anOtherFeatureNames.join(aSep)); + } if (!aParamFeatureNames.empty()) { - aText += QString(QObject::tr("Parameters are used in the following features: %1.\nThese features will be deleted.\nOr parameters could be replaced by their values.\n")) + const char* aMsg = "Parameters are used in the following features: %1.\nThese features will " + "be deleted.\nOr parameters could be replaced by their values.\n"; + aText += QString(QObject::tr(aMsg)) .arg(aParamFeatureNames.join(aSep)); - QPushButton *aReplaceButton = aMessageBox.addButton(QObject::tr("Replace"), QMessageBox::ActionRole); + QPushButton *aReplaceButton = + aMessageBox.addButton(QObject::tr("Replace"), QMessageBox::ActionRole); } if (!aText.isEmpty()) { @@ -1151,7 +1041,8 @@ bool askToDelete(const std::set theFeatures, ModelAPI_ReplaceParameterMessage::send(aObj, 0); } else - theReferencesToDelete.insert(aFeaturesRefsToParameterOnly.begin(), aFeaturesRefsToParameterOnly.end()); + theReferencesToDelete.insert(aFeaturesRefsToParameterOnly.begin(), + aFeaturesRefsToParameterOnly.end()); } return true; } @@ -1167,19 +1058,54 @@ void convertToFeatures(const QObjectPtrList& theObjects, std::set& t if (!aFeature.get() && anObject->groupName() == ModelAPI_ResultParameter::group()) { aFeature = ModelAPI_Feature::feature(anObject); } - theFeatures.insert(aFeature); + if (aFeature.get()) + theFeatures.insert(aFeature); } } -void translate(const std::string& theContext, std::string& theMessage) +//************************************************************** +void convertToFolders(const QObjectPtrList& theObjects, + std::set& theFolders) { + QObjectPtrList::const_iterator anIt = theObjects.begin(), aLast = theObjects.end(); + for(; anIt != aLast; anIt++) { + ObjectPtr anObject = *anIt; + FolderPtr aFeature = std::dynamic_pointer_cast(anObject); + if (aFeature.get()) + theFolders.insert(aFeature); + } +} + + +//************************************************************** +QString translate(const Events_InfoMessage& theMessage) +{ + QString aMessage; + + if (!theMessage.empty()) { + std::string aStr = Config_Translator::translate(theMessage); + if (!aStr.empty()) { + std::string aCodec = Config_Translator::codec(theMessage); + aMessage = QTextCodec::codecForName(aCodec.c_str())->toUnicode(aStr.c_str()); + } + } + + return aMessage; +} + +QString translate(const std::string& theContext, const std::string& theMessage) +{ + QString aMessage; + if (!theMessage.empty()) { std::string aStr = Config_Translator::translate(theContext, theMessage); if (!aStr.empty()) { std::string aCodec = Config_Translator::codec(theContext); - theMessage = QTextCodec::codecForName(aCodec.c_str())->toUnicode(aStr.c_str()).toStdString(); + aMessage = QTextCodec::codecForName(aCodec.c_str())->toUnicode(aStr.c_str()); } } + + return aMessage; } void setPointBallHighlighting(AIS_Shape* theAIS) @@ -1204,13 +1130,17 @@ void setPointBallHighlighting(AIS_Shape* theAIS) aPixMap = new Image_AlienPixMap(); if(!aPixMap->Load(aFile.c_str())) { // The icon for constraint is not found - static const std::string aMsg = "Error: Point market not found by path: \"" + aFile + "\". Falling back."; + static const std::string aMsg = + "Error: Point market not found by path: \"" + aFile + "\". Falling back."; //Events_InfoMessage("ModuleBase_Tools::setPointBallHighlighting", aMsg).send(); } } Handle(Graphic3d_AspectMarker3d) anAspect; Handle(Prs3d_Drawer) aDrawer = theAIS->HilightAttributes(); +#ifdef USE_OCCT_720 + // to do: implement ball highlighting, in 7.2.0 this drawer is NULL +#else if(aDrawer->HasOwnPointAspect()) { Handle(Prs3d_PointAspect) aPntAspect = aDrawer->PointAspect(); if(aPixMap->IsEmpty()) { @@ -1228,6 +1158,7 @@ void setPointBallHighlighting(AIS_Shape* theAIS) aDrawer->SetPointAspect(aPntAspect); theAIS->SetHilightAttributes(aDrawer); } +#endif } } // namespace ModuleBase_Tools