X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FXGUI%2FXGUI_ViewerProxy.cpp;h=cc73e969d09231ad0ad0395bbafac7ddddb253ee;hb=77ce6d35ac8d2f0fdaecb4f23e0870bf74e36103;hp=16fe9ee86b46e33a2cb58c0e425c9610547d696f;hpb=d03d3b1238549872bbd0c2150cf63fb9f9146e7c;p=modules%2Fshaper.git

diff --git a/src/XGUI/XGUI_ViewerProxy.cpp b/src/XGUI/XGUI_ViewerProxy.cpp
index 16fe9ee86..cc73e969d 100644
--- a/src/XGUI/XGUI_ViewerProxy.cpp
+++ b/src/XGUI/XGUI_ViewerProxy.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2019  CEA/DEN, EDF R&D
+// Copyright (C) 2014-2024  CEA, EDF
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -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();
   }
@@ -296,36 +296,40 @@ void XGUI_ViewerProxy::onMouseDoubleClick(AppElements_ViewWindow* theWnd, QMouse
 
 void XGUI_ViewerProxy::onMouseMove(AppElements_ViewWindow* theWnd, QMouseEvent* theEvent)
 {
-  if (myIs2dMode) {
-    bool aHighlight2d =
-      ModuleBase_Preferences::resourceMgr()->booleanValue("Viewer", "highlighting-2d", true);
-    if (aHighlight2d) {
-      if (myShowHighlight)
-        eraseHighlight();
-      else
-        updateHighlight();
-    }
-    else {
-      if (myShowHighlight)
-        updateHighlight();
-      else
-        eraseHighlight();
-    }
-  }
+  if (theEvent->buttons() != Qt::NoButton)
+    eraseHighlight();
   else {
-    bool aHighlight3d =
-      ModuleBase_Preferences::resourceMgr()->booleanValue("Viewer", "highlighting-3d", false);
-    if (aHighlight3d) {
-      if (myShowHighlight)
-        eraseHighlight();
-      else
-        updateHighlight();
+    if (myIs2dMode) {
+      bool aHighlight2d =
+        ModuleBase_Preferences::resourceMgr()->booleanValue("Viewer", "highlighting-2d", true);
+      if (aHighlight2d) {
+        if (myShowHighlight)
+          eraseHighlight();
+        else
+          updateHighlight();
+      }
+      else {
+        if (myShowHighlight)
+          updateHighlight();
+        else
+          eraseHighlight();
+      }
     }
     else {
-      if (myShowHighlight)
-        updateHighlight();
-      else
-        eraseHighlight();
+      bool aHighlight3d =
+        ModuleBase_Preferences::resourceMgr()->booleanValue("Viewer", "highlighting-3d", false);
+      if (aHighlight3d) {
+        if (myShowHighlight)
+          eraseHighlight();
+        else
+          updateHighlight();
+      }
+      else {
+        if (myShowHighlight)
+          updateHighlight();
+        else
+          eraseHighlight();
+      }
     }
   }
   emit mouseMove(theWnd, theEvent);
@@ -445,57 +449,67 @@ bool XGUI_ViewerProxy::canDragByMouse() const
 }
 
 //***************************************
-void XGUI_ViewerProxy::displayHighlight(FeaturePtr theFeature, const TopoDS_Shape& theIgnoreShape)
+Handle(AIS_Shape) createPresentation(const TopoDS_Shape& theShape, double theDeviation)
 {
-  Handle(AIS_InteractiveContext) aContext = AISContext();
+  Handle(AIS_Shape) aAis = new AIS_Shape(theShape);
+  aAis->SetColor(HIGHLIGHT_COLOR);
+  aAis->SetZLayer(Graphic3d_ZLayerId_Top); //Graphic3d_ZLayerId_Topmost
+  aAis->Attributes()->SetDeviationCoefficient(theDeviation);
+  aAis->Attributes()->SetIsoOnPlane(false);
+  return aAis;
+}
 
-  double aDeflection;
-  if (myResult->groupName() == ModelAPI_ResultConstruction::group()) {
-    //FeaturePtr aFeature = ModelAPI_Feature::feature(myResult);
-    if (theFeature.get()) {
-      std::list<ResultPtr> aResults = theFeature->results();
-      std::list<ResultPtr>::const_iterator aIt;
-      ResultPtr aRes;
-      Handle(AIS_Shape) aAis;
-      for (aIt = aResults.cbegin(); aIt != aResults.cend(); aIt++) {
-        aRes = (*aIt);
-        TopoDS_Shape aTShape = aRes->shape()->impl<TopoDS_Shape>();
-        if (!aTShape.IsSame(theIgnoreShape)) {
-          aAis = new AIS_Shape(aTShape);
-          aAis->SetColor(HIGHLIGHT_COLOR);
-          aAis->SetZLayer(Graphic3d_ZLayerId_Top); //Graphic3d_ZLayerId_Topmost
-          aDeflection = Config_PropManager::real("Visualization", "construction_deflection");
-          aAis->Attributes()->SetDeviationCoefficient(aDeflection);
-          myHighlights.Append(aAis);
-          aContext->Display(aAis, false);
-          aContext->Deactivate(aAis);
-        }
-      }
+//***************************************
+void XGUI_ViewerProxy::createPresentations(const ResultPtr& theRes,
+  const TopoDS_Shape& theIgnoreShape)
+{
+  Handle(AIS_InteractiveContext) aContext = AISContext();
+  XGUI_Displayer* aDisplayer = myWorkshop->displayer();
+  Handle(AIS_Shape) aAis;
+  Handle(AIS_InteractiveObject) anAISIO;
+  double aDeviation = 0.001;
+
+  TopoDS_Shape aTShape = theRes->shape()->impl<TopoDS_Shape>();
+  if (!aTShape.IsSame(theIgnoreShape)) {
+    AISObjectPtr aAISPrs = aDisplayer->getAISObject(theRes);
+    if (aAISPrs.get()) {
+      anAISIO = aAISPrs->impl<Handle(AIS_InteractiveObject)>();
+      aDeviation = anAISIO->Attributes()->DeviationCoefficient();
     }
-  }
-  else {
-    TopoDS_Shape aTShape = myResult->shape()->impl<TopoDS_Shape>();
-    Handle(AIS_Shape) aAis = new AIS_Shape(aTShape);
-    aAis->SetColor(HIGHLIGHT_COLOR);
-    aAis->SetZLayer(Graphic3d_ZLayerId_Top); //Graphic3d_ZLayerId_Topmost
-    aDeflection = Config_PropManager::real("Visualization", "body_deflection");
-    aAis->Attributes()->SetDeviationCoefficient(aDeflection);
+    else {
+      aDeviation = Config_PropManager::real("Visualization", "construction_deflection");
+    }
+    aAis = createPresentation(aTShape, aDeviation);
     myHighlights.Append(aAis);
     aContext->Display(aAis, false);
     aContext->Deactivate(aAis);
   }
 }
 
-void XGUI_ViewerProxy::eraseHighlight()
+
+void XGUI_ViewerProxy::displayHighlight(FeaturePtr theFeature, const TopoDS_Shape& theIgnoreShape)
+{
+  if (theFeature.get()) {
+    std::list<ResultPtr> aResults = theFeature->results();
+    std::list<ResultPtr>::const_iterator aIt;
+    for (aIt = aResults.cbegin(); aIt != aResults.cend(); aIt++) {
+      createPresentations((*aIt), theIgnoreShape);
+    }
+  }
+}
+
+bool XGUI_ViewerProxy::eraseHighlight()
 {
   Handle(AIS_InteractiveContext) aContext = AISContext();
   Handle(AIS_InteractiveObject) anAISIO;
   AIS_ListIteratorOfListOfInteractive aLIt;
+  bool isErased = myHighlights.Extent() > 0;
   for (aLIt.Initialize(myHighlights); aLIt.More(); aLIt.Next()) {
     anAISIO = aLIt.Value();
     aContext->Remove(anAISIO, false);
   }
   myHighlights.Clear();
+  return isErased;
 }
 
 void XGUI_ViewerProxy::updateHighlight()
@@ -525,14 +539,15 @@ void XGUI_ViewerProxy::updateHighlight()
           else {
             myResult = ResultPtr();
           }
-          aContext->UpdateCurrentViewer();
+          update();
         }
         isDisplayed = aRes.get();
       }
     }
     if (!isDisplayed) {
-      eraseHighlight();
-      aContext->UpdateCurrentViewer();
+      if (eraseHighlight()) {
+        update();
+      }
       myResult = ResultPtr();
     }
   }
@@ -541,36 +556,40 @@ void XGUI_ViewerProxy::updateHighlight()
 #ifdef HAVE_SALOME
 void XGUI_ViewerProxy::onMouseMove(ModuleBase_IViewWindow* theWnd, QMouseEvent* theEvent)
 {
-  if (myIs2dMode) {
-    bool aHighlight2d =
-      ModuleBase_Preferences::resourceMgr()->booleanValue("Viewer", "highlighting-2d", true);
-    if (aHighlight2d) {
-      if (myShowHighlight)
-        eraseHighlight();
-      else
-        updateHighlight();
-    }
-    else {
-      if (myShowHighlight)
-        updateHighlight();
-      else
-        eraseHighlight();
-    }
-  }
+  if (theEvent->buttons() != Qt::NoButton)
+    eraseHighlight();
   else {
-    bool aHighlight3d =
-      ModuleBase_Preferences::resourceMgr()->booleanValue("Viewer", "highlighting-3d", false);
-    if (aHighlight3d) {
-      if (myShowHighlight)
-        eraseHighlight();
-      else
-        updateHighlight();
+    if (myIs2dMode) {
+      bool aHighlight2d =
+        ModuleBase_Preferences::resourceMgr()->booleanValue("Viewer", "highlighting-2d", true);
+      if (aHighlight2d) {
+        if (myShowHighlight)
+          eraseHighlight();
+        else
+          updateHighlight();
+      }
+      else {
+        if (myShowHighlight)
+          updateHighlight();
+        else
+          eraseHighlight();
+      }
     }
     else {
-      if (myShowHighlight)
-        updateHighlight();
-      else
-        eraseHighlight();
+      bool aHighlight3d =
+        ModuleBase_Preferences::resourceMgr()->booleanValue("Viewer", "highlighting-3d", false);
+      if (aHighlight3d) {
+        if (myShowHighlight)
+          eraseHighlight();
+        else
+          updateHighlight();
+      }
+      else {
+        if (myShowHighlight)
+          updateHighlight();
+        else
+          eraseHighlight();
+      }
     }
   }
   emit mouseMove(theWnd, theEvent);
@@ -680,7 +699,7 @@ void XGUI_ViewerProxy::setColorScaleTitle(const QString& theText)
   myWorkshop->salomeConnector()->viewer()->setColorScaleTitle(theText);
 #else
   Handle(AIS_ColorScale) aColorScale = myWorkshop->mainWindow()->viewer()->colorScale();
-  aColorScale->SetTitle(theText.toStdString().c_str());
+  aColorScale->SetTitle(theText.toStdWString().c_str());
 #endif
 }
 
@@ -707,24 +726,13 @@ void XGUI_ViewerProxy::setupColorScale()
   setColorScaleIntervals(aN);
 }
 
-
-//***************************************
-//void XGUI_ViewerProxy::Zfitall()
-//{
-//#ifdef HAVE_SALOME
-//  myWorkshop->salomeConnector()->viewer()->Zfitall();
-//#else
-//  AppElements_Viewer* aViewer = myWorkshop->mainWindow()->viewer();
-//  AppElements_ViewWindow* aView = aViewer->activeViewWindow();
-//  if (aView) {
-//    Handle(V3d_View) aView3d = aView->v3dView();
-//    aView3d->ZFitAll();
-//    if (aView3d->Depth() < 0.1)
-//      aView3d->DepthFitAll();
-//  }
-//#endif
-//}
-
+void XGUI_ViewerProxy::setText(
+  const ModuleBase_IViewer::TextColor& theText, const int theSize)
+{
+#ifdef HAVE_SALOME
+  myWorkshop->salomeConnector()->viewer()->setText(theText, theSize);
+#endif
+}
 
 #ifdef HAVE_SALOME
 void XGUI_ViewerProxy::setFitter(OCCViewer_Fitter* theFitter)
@@ -732,9 +740,9 @@ void XGUI_ViewerProxy::setFitter(OCCViewer_Fitter* theFitter)
   myWorkshop->salomeConnector()->viewer()->setFitter(theFitter);
 }
 
-OCCViewer_Fitter* XGUI_ViewerProxy::currentFitter() const
+OCCViewer_Fitter* XGUI_ViewerProxy::fitter() const
 {
-  return myWorkshop->salomeConnector()->viewer()->currentFitter();
+  return myWorkshop->salomeConnector()->viewer()->fitter();
 }
 #else
 void XGUI_ViewerProxy::setFitter(AppElements_Fitter* theFitter)
@@ -742,17 +750,8 @@ void XGUI_ViewerProxy::setFitter(AppElements_Fitter* theFitter)
   myWorkshop->mainWindow()->viewer()->setFitter(theFitter);
 }
 
-AppElements_Fitter* XGUI_ViewerProxy::currentFitter() const
+AppElements_Fitter* XGUI_ViewerProxy::fitter() const
 {
-  return myWorkshop->mainWindow()->viewer()->currentFitter();
+  return myWorkshop->mainWindow()->viewer()->fitter();
 }
 #endif
-
-void XGUI_ViewerProxy::unsetFitter()
-{
-#ifdef HAVE_SALOME
-  myWorkshop->salomeConnector()->viewer()->unsetFitter();
-#else
-  myWorkshop->mainWindow()->viewer()->unsetFitter();
-#endif
-}