Issue #2867: Use enumeration values for ZLayer definition

diff --git a/src/FeaturesPlugin/FeaturesPlugin_Measurement.cpp b/src/FeaturesPlugin/FeaturesPlugin_Measurement.cpp
index 7d04b88d6103364ca634c3b9ad0d03ddb67dbbff..0d97dd7dc3375885d09e9312f9b64dc12a71fab9 100644 (file)
--- a/src/FeaturesPlugin/FeaturesPlugin_Measurement.cpp
+++ b/src/FeaturesPlugin/FeaturesPlugin_Measurement.cpp
@@ -615,7 +615,7 @@ void FeaturesPlugin_Measurement::setupDimension(AISObjectPtr theDim)
     anAspect->SetExtensionSize((aTextSize / mySceenScale + aSize) / 2.0);
     aDim->SetDimensionAspect(anAspect);
 
-    aDim->SetZLayer(1);
+    aDim->SetZLayer(Graphic3d_ZLayerId_Top);
     std::vector<int> aColor = Config_PropManager::color("Visualization", "sketch_dimension_color");
     theDim->setColor(aColor[0], aColor[1], aColor[2]);
   }

diff --git a/src/XGUI/XGUI_ViewerProxy.cpp b/src/XGUI/XGUI_ViewerProxy.cpp
index 27277683abd64c271c897e27fda4f293b19cc78c..71c7a9f406abea74ff5947ec0419b9f565f7f041 100644 (file)
--- a/src/XGUI/XGUI_ViewerProxy.cpp
+++ b/src/XGUI/XGUI_ViewerProxy.cpp
@@ -427,7 +427,7 @@ void XGUI_ViewerProxy::displayHighlight(FeaturePtr theFeature, const TopoDS_Shap
         if (!aTShape.IsSame(theIgnoreShape)) {
           aAis = new AIS_Shape(aTShape);
           aAis->SetColor(HIGHLIGHT_COLOR);
-          aAis->SetZLayer(1); //Graphic3d_ZLayerId_Topmost
+          aAis->SetZLayer(Graphic3d_ZLayerId_Top); //Graphic3d_ZLayerId_Topmost
           aDeflection = Config_PropManager::real("Visualization", "construction_deflection");
           aAis->Attributes()->SetDeviationCoefficient(aDeflection);
           myHighlights.Append(aAis);
@@ -441,7 +441,7 @@ void XGUI_ViewerProxy::displayHighlight(FeaturePtr theFeature, const TopoDS_Shap
     TopoDS_Shape aTShape = myResult->shape()->impl<TopoDS_Shape>();
     Handle(AIS_Shape) aAis = new AIS_Shape(aTShape);
     aAis->SetColor(HIGHLIGHT_COLOR);
-    aAis->SetZLayer(1); //Graphic3d_ZLayerId_Topmost
+    aAis->SetZLayer(Graphic3d_ZLayerId_Top); //Graphic3d_ZLayerId_Topmost
     aDeflection = Config_PropManager::real("Visualization", "body_deflection");
     aAis->Attributes()->SetDeviationCoefficient(aDeflection);
     myHighlights.Append(aAis);