bos #19088: Preselection of the origin point is not very distinguishable

diff --git a/src/ModuleBase/ModuleBase_Tools.cpp b/src/ModuleBase/ModuleBase_Tools.cpp
index 4f0cc357531fe7465dca21eddd565c6fa85724c9..17e6c516e73120e37adf2b7aa062214f407b3c66 100644 (file)
--- a/src/ModuleBase/ModuleBase_Tools.cpp
+++ b/src/ModuleBase/ModuleBase_Tools.cpp
@@ -1126,7 +1126,7 @@ QString translate(const std::string& theContext, const std::string& theMessage)
   return aMessage;
 }
 
   return aMessage;
 }
 

-void setPointBallHighlighting(AIS_Shape* theAIS)
+void setPointBallHighlighting(AIS_InteractiveObject* theAIS)

 {
   static Handle(Image_AlienPixMap) aPixMap;
   if(aPixMap.IsNull()) {
 {
   static Handle(Image_AlienPixMap) aPixMap;
   if(aPixMap.IsNull()) {

diff --git a/src/ModuleBase/ModuleBase_Tools.h b/src/ModuleBase/ModuleBase_Tools.h
index ea4e0a9295fa074600ae40cdfe75846e66a0c2a4..54eb46c9edd61a342045d577398f00bf09973ffc 100644 (file)
--- a/src/ModuleBase/ModuleBase_Tools.h
+++ b/src/ModuleBase/ModuleBase_Tools.h
@@ -370,7 +370,7 @@ QString MODULEBASE_EXPORT translate(const std::string& theContext, const std::st
 
 /// Set Highlighting of points as a Ball shape
 /// \param theAIS - the presentation
 
 /// Set Highlighting of points as a Ball shape
 /// \param theAIS - the presentation

-void MODULEBASE_EXPORT setPointBallHighlighting(AIS_Shape* theAIS);
+void MODULEBASE_EXPORT setPointBallHighlighting(AIS_InteractiveObject* theAIS);

 
 /// Creates a parameter from a given string
 /// \theText a text wit equation
 
 /// Creates a parameter from a given string
 /// \theText a text wit equation

diff --git a/src/XGUI/XGUI_Displayer.cpp b/src/XGUI/XGUI_Displayer.cpp
index 30a297eebe95eb2b7bcc75b302aa3503b2c5136f..9dc673f19d5d2661c8e1e12d4251e5e8ec6fa189 100644 (file)
--- a/src/XGUI/XGUI_Displayer.cpp
+++ b/src/XGUI/XGUI_Displayer.cpp
@@ -636,10 +636,6 @@ Handle(AIS_InteractiveContext) XGUI_Displayer::AISContext() const
     //aContext->DefaultDrawer()->VIsoAspect()->SetNumber(0);
     //aContext->DefaultDrawer()->UIsoAspect()->SetNumber(0);
 
     //aContext->DefaultDrawer()->VIsoAspect()->SetNumber(0);
     //aContext->DefaultDrawer()->UIsoAspect()->SetNumber(0);
 

-    //Handle(AIS_Trihedron) aTrihedron = myWorkshop->viewer()->trihedron();
-    //aTrihedron->getHighlightPointAspect()->SetScale(2.0);
-    //aTrihedron->getHighlightPointAspect()->SetTypeOfMarker(Aspect_TOM_O_STAR);
-

     // Commented out according to discussion in bug #2825
     ModuleBase_IViewer::DefaultHighlightDrawer = aContext->HighlightStyle();
     //Handle(Prs3d_Drawer) aSelStyle = aContext->SelectionStyle();
     // Commented out according to discussion in bug #2825
     ModuleBase_IViewer::DefaultHighlightDrawer = aContext->HighlightStyle();
     //Handle(Prs3d_Drawer) aSelStyle = aContext->SelectionStyle();


@@ -651,6 +647,10 @@ Handle(AIS_InteractiveContext) XGUI_Displayer::AISContext() const
 
     //ModuleBase_IViewer::DefaultHighlightDrawer->SetDeviationCoefficient(aDeflection);
     //aSelStyle->SetDeviationCoefficient(aDeflection);
 
     //ModuleBase_IViewer::DefaultHighlightDrawer->SetDeviationCoefficient(aDeflection);
     //aSelStyle->SetDeviationCoefficient(aDeflection);

+
+    Handle(AIS_Trihedron) aTrihedron = myWorkshop->viewer()->trihedron();
+    if (!aTrihedron.IsNull())
+      ModuleBase_Tools::setPointBallHighlighting(aTrihedron.get());

   }
   return aContext;
 }
   }
   return aContext;
 }