Merge branch 'master' of https://codev-tuleap.cea.fr/plugins/git/salome/shaper

diff --git a/src/ModuleBase/ModuleBase_ResultPrs.cpp b/src/ModuleBase/ModuleBase_ResultPrs.cpp
index 9bf101d3ffffb9612aa9310509d56485afcf38c0..e58f460dae4da316eb218daa967bad8a790ca0fc 100644 (file)
--- a/src/ModuleBase/ModuleBase_ResultPrs.cpp
+++ b/src/ModuleBase/ModuleBase_ResultPrs.cpp
@@ -81,6 +81,9 @@ ModuleBase_ResultPrs::ModuleBase_ResultPrs(ResultPtr theResult)
     new Prs3d_LineAspect(Quantity_NOC_GREEN, Aspect_TOL_SOLID, 1);
   aDrawer->SetFreeBoundaryAspect(aFreeBndAspect);
 
+  aDrawer->VIsoAspect()->SetNumber(0);
+  aDrawer->UIsoAspect()->SetNumber(0);
+
   if (aDrawer->HasOwnPointAspect())
     aDrawer->PointAspect()->SetTypeOfMarker(Aspect_TOM_PLUS);
   else

diff --git a/src/SHAPERGUI/SHAPERGUI_SalomeViewer.cpp b/src/SHAPERGUI/SHAPERGUI_SalomeViewer.cpp
index 2ccfd34227122563d91a9b953f77388193f12547..12776d98c79d7330680358749e708f6daa7be148 100644 (file)
--- a/src/SHAPERGUI/SHAPERGUI_SalomeViewer.cpp
+++ b/src/SHAPERGUI/SHAPERGUI_SalomeViewer.cpp
@@ -407,7 +407,7 @@ void SHAPERGUI_SalomeViewer::setViewProjection(double theX, double theY,
       aView3d->SetProj(theX, theY, theZ);
       aView3d->SetTwist( theTwist );
       aView3d->FitAll(0.01, false);
-      aView3d->SetZSize(0.);
+      //aView3d->SetZSize(0.);
       if (aView3d->Depth() < 0.1)
         aView3d->DepthFitAll();
     }

diff --git a/src/XGUI/XGUI_Displayer.cpp b/src/XGUI/XGUI_Displayer.cpp
index ae806ab7a6f6345706081ce742a799204cd3dd2c..f1c43984fdb46e52d8f34c72d300629ca68a02ae 100644 (file)
--- a/src/XGUI/XGUI_Displayer.cpp
+++ b/src/XGUI/XGUI_Displayer.cpp
@@ -625,8 +625,9 @@ Handle(AIS_InteractiveContext) XGUI_Displayer::AISContext() const
     myContextId = aContext.get();
     if (!myWorkshop->selectionActivate()->isTrihedronActive())
       selectionActivate()->deactivateTrihedron(true);
-    aContext->DefaultDrawer()->VIsoAspect()->SetNumber(0);
-    aContext->DefaultDrawer()->UIsoAspect()->SetNumber(0);
+    // Do not modify default drawer. The same is done in ModuleBase_ResultPrs
+    //aContext->DefaultDrawer()->VIsoAspect()->SetNumber(0);
+    //aContext->DefaultDrawer()->UIsoAspect()->SetNumber(0);
 
     //Handle(AIS_Trihedron) aTrihedron = myWorkshop->viewer()->trihedron();
     //aTrihedron->getHighlightPointAspect()->SetScale(2.0);

diff --git a/src/XGUI/XGUI_ViewerProxy.cpp b/src/XGUI/XGUI_ViewerProxy.cpp
index fbff53c41f2180237f277379746c294925d51237..82154a769367c2167bca85c0aa9ede133f73834a 100644 (file)
--- a/src/XGUI/XGUI_ViewerProxy.cpp
+++ b/src/XGUI/XGUI_ViewerProxy.cpp
@@ -122,7 +122,7 @@ void XGUI_ViewerProxy::setViewProjection(double theX, double theY, double theZ,
     aView3d->SetProj(theX, theY, theZ);
     aView3d->SetTwist( theTwist );
     aView3d->FitAll(0.01, false);
-    aView3d->SetZSize(0.);
+    //aView3d->SetZSize(0.);
     if (aView3d->Depth() < 0.1)
       aView3d->DepthFitAll();
   }