X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModuleBase%2FModuleBase_Tools.cpp;h=1a436ee441c14f07cba7742da52a8e253dd963a3;hb=8634847ac05ce637193ec2f5234c3c8996762f94;hp=986d22d18a5f707545ee2f583f80e4f58037504c;hpb=72829498140a21dbf2f5634f300afc75a2ab4b00;p=modules%2Fshaper.git diff --git a/src/ModuleBase/ModuleBase_Tools.cpp b/src/ModuleBase/ModuleBase_Tools.cpp index 986d22d18..1a436ee44 100755 --- a/src/ModuleBase/ModuleBase_Tools.cpp +++ b/src/ModuleBase/ModuleBase_Tools.cpp @@ -12,6 +12,7 @@ #include #include #include +#include #include #include @@ -32,6 +33,8 @@ #include #include +#include + #include #include @@ -44,6 +47,8 @@ #include #include +#include + #include #include #include @@ -59,6 +64,10 @@ #include #include +#ifdef WIN32 +#pragma warning(disable : 4996) // for getenv +#endif + const double tolerance = 1e-7; const double DEFAULT_DEVIATION_COEFFICIENT = 1.e-4; @@ -82,6 +91,12 @@ const double DEFAULT_DEVIATION_COEFFICIENT = 1.e-4; #include #endif +#ifdef WIN32 +# define FSEP "\\" +#else +# define FSEP "/" +#endif + namespace ModuleBase_Tools { //****************************************************************** @@ -300,26 +315,11 @@ 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()); } } @@ -340,6 +340,8 @@ QString getShapeTypeInfo(const int theType) 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; @@ -390,8 +392,9 @@ QString displayedInteractiveObjects(Handle(AIS_InteractiveContext)& theContext, if (!aShapePrs.IsNull()) { const TopoDS_Shape& aShape = aShapePrs->Shape(); - if (aShape.IsNull()) - Events_Error::throwException("An empty AIS presentation"); + if (aShape.IsNull()) { + //Events_Error::throwException("An empty AIS presentation"); + } else anInfo += QString(", shape type: %1").arg(getShapeTypeInfo(aShape.ShapeType())); } @@ -451,8 +454,9 @@ QString activeOwners(Handle(AIS_InteractiveContext)& theContext, const bool theS if (!BROwnr.IsNull() && BROwnr->HasShape()) { const TopoDS_Shape& aShape = BROwnr->Shape(); - if (aShape.IsNull()) - Events_Error::throwException("An empty AIS presentation"); + if (aShape.IsNull()) { + //Events_Error::throwException("An empty AIS presentation"); + } else anInfo += QString(", shape type: %1").arg(getShapeTypeInfo(aShape.ShapeType())); } @@ -511,10 +515,10 @@ void selectionInfo(Handle(AIS_InteractiveContext)& theContext, const std::string #endif } -typedef QMap ShapeTypes; +typedef QMap ShapeTypes; static ShapeTypes myShapeTypes; -TopAbs_ShapeEnum shapeType(const QString& theType) +int shapeType(const QString& theType) { if (myShapeTypes.count() == 0) { myShapeTypes["compound"] = TopAbs_COMPOUND; @@ -533,7 +537,8 @@ TopAbs_ShapeEnum shapeType(const QString& theType) myShapeTypes["edges"] = TopAbs_EDGE; myShapeTypes["vertex"] = TopAbs_VERTEX; myShapeTypes["vertices"] = TopAbs_VERTEX; - myShapeTypes["objects"] = TopAbs_SHAPE; + myShapeTypes["object"] = ModuleBase_ResultPrs::Sel_Result; + myShapeTypes["objects"] = ModuleBase_ResultPrs::Sel_Result; } QString aType = theType.toLower(); if(myShapeTypes.contains(aType)) @@ -564,7 +569,7 @@ void checkObjects(const QObjectPtrList& theObjects, bool& hasResult, bool& hasFe } } -bool setDefaultDeviationCoefficient(std::shared_ptr theGeomShape) +/*bool setDefaultDeviationCoefficient(std::shared_ptr theGeomShape) { if (!theGeomShape.get()) return false; @@ -573,9 +578,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()) @@ -593,7 +598,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) { @@ -602,8 +607,21 @@ 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", + ModelAPI_ResultConstruction::DEFAULT_DEFLECTION()); + else + aDeflection = Config_PropManager::real("Visualization", "body_deflection", + ModelAPI_ResultBody::DEFAULT_DEFLECTION()); + + theDrawer->SetDeviationCoefficient(aDeflection); } Quantity_Color color(const std::string& theSection, @@ -771,13 +789,14 @@ bool hasObject(const AttributePtr& theAttribute, const ObjectPtr& theObject, return aHasObject; } -void setObject(const AttributePtr& theAttribute, const ObjectPtr& theObject, +bool setObject(const AttributePtr& theAttribute, const ObjectPtr& theObject, const GeomShapePtr& theShape, ModuleBase_IWorkshop* theWorkshop, const bool theTemporarily, const bool theCheckIfAttributeHasObject) { if (!theAttribute.get()) - return; + return false; + bool isDone = true; std::string aType = theAttribute->attributeType(); if (aType == ModelAPI_AttributeReference::typeId()) { AttributeReferencePtr aRef = std::dynamic_pointer_cast(theAttribute); @@ -814,8 +833,12 @@ void setObject(const AttributePtr& theAttribute, const ObjectPtr& theObject, } else if (aType == ModelAPI_AttributeRefList::typeId()) { AttributeRefListPtr aRefListAttr = std::dynamic_pointer_cast(theAttribute); - if (!theCheckIfAttributeHasObject || !aRefListAttr->isInList(theObject)) - aRefListAttr->append(theObject); + if (!theCheckIfAttributeHasObject || !aRefListAttr->isInList(theObject)) { + if (theObject.get()) + aRefListAttr->append(theObject); + else + isDone = false; + } } else if (aType == ModelAPI_AttributeRefAttrList::typeId()) { AttributeRefAttrListPtr aRefAttrListAttr = std::dynamic_pointer_cast(theAttribute); @@ -826,10 +849,15 @@ void setObject(const AttributePtr& theAttribute, const ObjectPtr& theObject, aRefAttrListAttr->append(anAttribute); } else { - if (!theCheckIfAttributeHasObject || !aRefAttrListAttr->isInList(theObject)) - aRefAttrListAttr->append(theObject); + if (!theCheckIfAttributeHasObject || !aRefAttrListAttr->isInList(theObject)) { + if (theObject.get()) + aRefAttrListAttr->append(theObject); + else + isDone = false; + } } } + return isDone; } GeomShapePtr getShape(const AttributePtr& theAttribute, ModuleBase_IWorkshop* theWorkshop) @@ -851,6 +879,8 @@ GeomShapePtr getShape(const AttributePtr& theAttribute, ModuleBase_IWorkshop* th (theAttribute); aShape = aSelectAttr->value(); } + else // Geom2D point processing + aShape = theWorkshop->module()->findShape(theAttribute); return aShape; } @@ -934,7 +964,7 @@ void refsToFeatureInFeatureDocument(const ObjectPtr& theObject, std::set aRefFeatures; @@ -945,10 +975,10 @@ bool isSubOfComposite(const ObjectPtr& theObject) isSub = isSubOfComposite(theObject, *anIt); } return isSub; -} +}*/ //************************************************************** -bool isSubOfComposite(const ObjectPtr& theObject, const FeaturePtr& theFeature) +/*bool isSubOfComposite(const ObjectPtr& theObject, const FeaturePtr& theFeature) { bool isSub = false; CompositeFeaturePtr aComposite = std::dynamic_pointer_cast(theFeature); @@ -964,7 +994,7 @@ bool isSubOfComposite(const ObjectPtr& theObject, const FeaturePtr& theFeature) } } return isSub; -} +}*/ //************************************************************** ResultPtr firstResult(const ObjectPtr& theObject) @@ -1015,7 +1045,8 @@ bool hasModuleDocumentFeature(const std::set& theFeatures) bool askToDelete(const std::set theFeatures, const std::map >& theReferences, QWidget* theParent, - std::set& theReferencesToDelete) + std::set& theReferencesToDelete, + const std::string& thePrefixInfo) { QString aNotActivatedDocWrn; std::string aNotActivatedNames; @@ -1094,16 +1125,18 @@ bool askToDelete(const std::set theFeatures, aMessageBox.setDefaultButton(QMessageBox::No); QString aText; + 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 (!aNotActivatedDocWrn.isEmpty()) aText += aNotActivatedDocWrn; if (!anOtherFeatureNames.empty()) - aText += QString(QObject::tr("Selected features are used in the following features: %1.\nThese features will be deleted.\n")) + aText += QString(QObject::tr("Features are used in the following features: %1.\nThese features will be deleted.\n")) .arg(anOtherFeatureNames.join(aSep)); if (!aParamFeatureNames.empty()) { - aText += QString(QObject::tr("Selected 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("Parameters are used in the following features: %1.\nThese features will be deleted.\nOr parameters could be replaced by their values.\n")) .arg(aParamFeatureNames.join(aSep)); QPushButton *aReplaceButton = aMessageBox.addButton(QObject::tr("Replace"), QMessageBox::ActionRole); } @@ -1155,10 +1188,47 @@ void translate(const std::string& theContext, std::string& theMessage) void setPointBallHighlighting(AIS_Shape* theAIS) { + static Handle(Image_AlienPixMap) aPixMap; + if(aPixMap.IsNull()) { + // Load icon for the presentation + std::string aFile; + char* anEnv = getenv("SHAPER_ROOT_DIR"); + if(anEnv) { + aFile = std::string(anEnv) + + FSEP + "share" + FSEP + "salome" + FSEP + "resources" + FSEP + "shaper"; + } else { + anEnv = getenv("OPENPARTS_ROOT_DIR"); + if (anEnv) + aFile = std::string(anEnv) + FSEP + "resources"; + } + + aFile += FSEP; + static const std::string aMarkerName = "marker_dot.png"; + aFile += aMarkerName; + 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."; + //Events_InfoMessage("ModuleBase_Tools::setPointBallHighlighting", aMsg).send(); + } + } + + Handle(Graphic3d_AspectMarker3d) anAspect; Handle(Prs3d_Drawer) aDrawer = theAIS->HilightAttributes(); - if (aDrawer->HasOwnPointAspect()) { + if(aDrawer->HasOwnPointAspect()) { Handle(Prs3d_PointAspect) aPntAspect = aDrawer->PointAspect(); - aPntAspect->Aspect()->SetType(Aspect_TOM_BALL); + if(aPixMap->IsEmpty()) { + anAspect = aPntAspect->Aspect(); + anAspect->SetType(Aspect_TOM_BALL); + } else { + if(aPixMap->Format() == Image_PixMap::ImgGray) { + aPixMap->SetFormat (Image_PixMap::ImgAlpha); + } else if(aPixMap->Format() == Image_PixMap::ImgGrayF) { + aPixMap->SetFormat (Image_PixMap::ImgAlphaF); + } + anAspect = new Graphic3d_AspectMarker3d(aPixMap); + aPntAspect->SetAspect(anAspect); + } aDrawer->SetPointAspect(aPntAspect); theAIS->SetHilightAttributes(aDrawer); }