X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModuleBase%2FModuleBase_Tools.cpp;h=d8bd656751fceb6eba0465c80f2f5cd67d771b62;hb=419821fe2eec493854537f34a21e290246b63dcf;hp=d9114ea820ed8070291c58f1e927dd174df6cf36;hpb=c73d50cdc61da28c83cc07c5d3c8636aa14bfbb0;p=modules%2Fshaper.git diff --git a/src/ModuleBase/ModuleBase_Tools.cpp b/src/ModuleBase/ModuleBase_Tools.cpp index d9114ea82..d8bd65675 100755 --- a/src/ModuleBase/ModuleBase_Tools.cpp +++ b/src/ModuleBase/ModuleBase_Tools.cpp @@ -12,6 +12,7 @@ #include #include #include +#include #include #include @@ -32,13 +33,21 @@ #include #include +#include + #include #include +#include #include -#include #include +#include + +#include +#include + +#include #include #include @@ -50,10 +59,15 @@ #include #include #include +#include #include #include +#ifdef WIN32 +#pragma warning(disable : 4996) // for getenv +#endif + const double tolerance = 1e-7; const double DEFAULT_DEVIATION_COEFFICIENT = 1.e-4; @@ -77,6 +91,12 @@ const double DEFAULT_DEVIATION_COEFFICIENT = 1.e-4; #include #endif +#ifdef WIN32 +# define FSEP "\\" +#else +# define FSEP "/" +#endif + namespace ModuleBase_Tools { //****************************************************************** @@ -201,7 +221,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 @@ -295,26 +315,12 @@ 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()); } } @@ -335,6 +341,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; @@ -385,8 +393,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())); } @@ -436,7 +445,7 @@ QString activeOwners(Handle(AIS_InteractiveContext)& theContext, const bool theS aPtrStr << "[" << anOwner.Access() << "]"; anInfo += aPtrStr.str().c_str(); - Handle(AIS_InteractiveObject) aAISObj = + Handle(AIS_InteractiveObject) aAISObj = Handle(AIS_InteractiveObject)::DownCast(anOwner->Selectable()); if (!aAISObj.IsNull()) { std::ostringstream aPtrStr; @@ -446,8 +455,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())); } @@ -459,7 +469,8 @@ QString activeOwners(Handle(AIS_InteractiveContext)& theContext, const bool theS return aValue; } -QString selectedOwners(Handle(AIS_InteractiveContext)& theContext, const bool theShapeInfoOnly = true) +QString selectedOwners(Handle(AIS_InteractiveContext)& theContext, + const bool theShapeInfoOnly = true) { QStringList anObjects; if (theContext.IsNull()) @@ -506,10 +517,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; @@ -528,12 +539,13 @@ 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)) return myShapeTypes[aType]; - Events_Error::send("Shape type defined in XML is not implemented!"); + Events_InfoMessage("ModuleBase_Tools", "Shape type defined in XML is not implemented!").send(); return TopAbs_SHAPE; } @@ -552,14 +564,14 @@ void checkObjects(const QObjectPtrList& theObjects, bool& hasResult, bool& hasFe hasResult |= (aResult.get() != NULL); hasFeature |= (aFeature.get() != NULL); hasParameter |= (aConstruction.get() != NULL); - if (hasFeature) + if (hasFeature) hasCompositeOwner |= (ModelAPI_Tools::compositeOwner(aFeature) != NULL); if (hasFeature && hasResult && hasParameter && hasCompositeOwner) break; } } -bool setDefaultDeviationCoefficient(std::shared_ptr theGeomShape) +/*bool setDefaultDeviationCoefficient(std::shared_ptr theGeomShape) { if (!theGeomShape.get()) return false; @@ -568,9 +580,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()) @@ -588,7 +600,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) { @@ -597,8 +609,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, @@ -614,17 +639,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(); } @@ -681,7 +709,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; @@ -706,14 +735,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()) { @@ -739,17 +770,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()) { @@ -766,22 +797,25 @@ 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); + 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()) @@ -804,16 +838,23 @@ void 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); - if (!theCheckIfAttributeHasObject || !aRefListAttr->isInList(theObject)) - aRefListAttr->append(theObject); + AttributeRefListPtr aRefListAttr = + std::dynamic_pointer_cast(theAttribute); + 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); + AttributeRefAttrListPtr aRefAttrListAttr = + std::dynamic_pointer_cast(theAttribute); AttributePtr anAttribute = theWorkshop->module()->findAttribute(theObject, theShape); if (anAttribute.get()) { @@ -821,10 +862,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) @@ -836,7 +882,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); @@ -846,6 +893,8 @@ GeomShapePtr getShape(const AttributePtr& theAttribute, ModuleBase_IWorkshop* th (theAttribute); aShape = aSelectAttr->value(); } + else // Geom2D point processing + aShape = theWorkshop->module()->findShape(theAttribute); return aShape; } @@ -917,7 +966,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()) { @@ -929,7 +991,7 @@ void refsToFeatureInFeatureDocument(const ObjectPtr& theObject, std::set aRefFeatures; @@ -940,10 +1002,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); @@ -959,7 +1021,7 @@ bool isSubOfComposite(const ObjectPtr& theObject, const FeaturePtr& theFeature) } } return isSub; -} +}*/ //************************************************************** ResultPtr firstResult(const ObjectPtr& theObject) @@ -1010,16 +1072,18 @@ 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; 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; @@ -1089,18 +1153,28 @@ 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 (!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")) + 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("Selected 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()) { @@ -1117,7 +1191,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; } @@ -1137,6 +1212,66 @@ void convertToFeatures(const QObjectPtrList& theObjects, std::set& t } } +void translate(const std::string& theContext, std::string& theMessage) +{ + 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(); + } + } +} + +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()) { + Handle(Prs3d_PointAspect) aPntAspect = aDrawer->PointAspect(); + 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); + } +} + } // namespace ModuleBase_Tools