X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSketcherPrs%2FSketcherPrs_SymbolPrs.cpp;h=2d42f57a568f39160cb31d29760ed9d5137c4458;hb=8476d5e088f7b1b5a414fa5e33ce99d6131929eb;hp=a00c59369cd8f51ba649955f3f01afa612f05a1a;hpb=2302f15a8daf85b03bacc97fe20810f4fedec3c5;p=modules%2Fshaper.git

diff --git a/src/SketcherPrs/SketcherPrs_SymbolPrs.cpp b/src/SketcherPrs/SketcherPrs_SymbolPrs.cpp
index a00c59369..2d42f57a5 100644
--- a/src/SketcherPrs/SketcherPrs_SymbolPrs.cpp
+++ b/src/SketcherPrs/SketcherPrs_SymbolPrs.cpp
@@ -46,8 +46,6 @@
 /// Step between icons
 static const double MyDist = 0.02;
 
-//#define ICON_TO_DEBUG
-
 /// Function to convert opengl data type
 GLenum toGlDataType (const Graphic3d_TypeOfData theType, GLint& theNbComp)
 {
@@ -269,35 +267,13 @@ SketcherPrs_SymbolPrs::~SketcherPrs_SymbolPrs()
 
 Handle(Image_AlienPixMap) SketcherPrs_SymbolPrs::icon()
 {
-#ifdef ICON_TO_DEBUG
-  if (myIsConflicting) {
-    if (myErrorIcon.IsNull()) {
-      char* aEnv = getenv("NEWGEOM_ROOT_DIR");
-      if (aEnv != NULL) {
-        TCollection_AsciiString aFile(aEnv);
-        aFile+=FSEP;
-        aFile+="resources";
-        aFile += FSEP;
-        aFile += "conflicting_icon.png";
-        Handle(Image_AlienPixMap) aPixMap = new Image_AlienPixMap();
-        if (aPixMap->Load(aFile)) {
-          myErrorIcon = aPixMap;
-        }
-      }
-    }
-    return myErrorIcon;
-  }
-#endif
-
   if (myIconsMap.count(iconName()) == 1) {
     return myIconsMap[iconName()];
   }
   // Load icon for the presentation
-  char* aEnv = getenv("NEWGEOM_ROOT_DIR");
+  char* aEnv = getenv("SHAPERResources");
   if (aEnv != NULL) {
     TCollection_AsciiString aFile(aEnv);
-    aFile+=FSEP;
-    aFile+="resources";
     aFile += FSEP;
     aFile += iconName();
     Handle(Image_AlienPixMap) aPixMap = new Image_AlienPixMap();
@@ -387,6 +363,7 @@ void SketcherPrs_SymbolPrs::Compute(const Handle(PrsMgr_PresentationManager3d)&
 
   // Update points with default shift value
   if (!updatePoints(20)) {
+    Events_Error::throwException("An empty AIS presentation: SketcherPrs_SymbolPrs");
     return;
   }
 
@@ -437,14 +414,6 @@ void SketcherPrs_SymbolPrs::ComputeSelection(const Handle(SelectMgr_Selection)&
 void SketcherPrs_SymbolPrs::SetConflictingConstraint(const bool& theConflicting,
                                                      const std::vector<int>& theColor)
 {
-#ifdef ICON_TO_DEBUG
-  if (myIsConflicting != theConflicting) {
-    myIsConflicting = theConflicting;
-    Handle(Image_AlienPixMap) anIcon = icon();
-    if (!anIcon.IsNull())
-      myAspect->SetMarkerImage(new Graphic3d_MarkerImage(anIcon));
-  }
-#else
   if (theConflicting)
   {
     if (!myAspect.IsNull())
@@ -458,7 +427,6 @@ void SketcherPrs_SymbolPrs::SetConflictingConstraint(const bool& theConflicting,
       myAspect->SetColor (Quantity_Color (1.0, 1.0, 0.0, Quantity_TOC_RGB));
     myIsConflicting = false;
   }
-#endif
 }
 
 void SketcherPrs_SymbolPrs::Render(const Handle(OpenGl_Workspace)& theWorkspace) const
@@ -502,13 +470,9 @@ void SketcherPrs_SymbolPrs::Render(const Handle(OpenGl_Workspace)& theWorkspace)
   const Handle(OpenGl_PointSprite)& aSpriteNorm = anAspectMarker->SpriteRes(aCtx);
       
   if (!aSpriteNorm.IsNull() && !aSpriteNorm->IsDisplayList()) {
-#ifdef ICON_TO_DEBUG
-    const bool toHilight = (theWorkspace->NamedStatus & OPENGL_NS_HIGHLIGHT) != 0;
-#else
     // ShaperModification:start : filling the presentation with color if there is a conflict
     const bool toHilight = (theWorkspace->NamedStatus & OPENGL_NS_HIGHLIGHT) != 0 || myIsConflicting;
     // ShaperModification:end
-#endif
 
     const Handle(OpenGl_PointSprite)& aSprite = (toHilight && anAspectMarker->SpriteHighlightRes(aCtx)->IsValid())
                                               ? anAspectMarker->SpriteHighlightRes(aCtx)