Set color with low saturation for objects of deactivated document

diff --git a/src/PartSet/PartSet_Module.cpp b/src/PartSet/PartSet_Module.cpp
index d92b6af6f838a09b3f5d4ee84d2dcd8313a2ffd8..0927b50ee2d560bf28cfc81164ad307c744cc9ce 100644 (file)
--- a/src/PartSet/PartSet_Module.cpp
+++ b/src/PartSet/PartSet_Module.cpp
@@ -736,5 +736,12 @@ void PartSet_Module::processEvent(const std::shared_ptr<Events_Message>& theMess
     }
     aLabel->setPalette(aPalet);
     aWorkshop->updateCommandStatus();
+
+    // Update displayed objects in order to update active color
+    XGUI_Displayer* aDisplayer = aWorkshop->displayer();
+    QObjectPtrList aObjects = aDisplayer->displayedObjects();
+    foreach(ObjectPtr aObj, aObjects)
+      aDisplayer->redisplay(aObj, false);
+    aDisplayer->updateViewer();
   }
 }

diff --git a/src/XGUI/XGUI_CustomPrs.cpp b/src/XGUI/XGUI_CustomPrs.cpp
index c074a841e4ab3af76f0b33dee705234510d38f74..171baa8465bb73e8b61291b7743a9eb0a7558db5 100644 (file)
--- a/src/XGUI/XGUI_CustomPrs.cpp
+++ b/src/XGUI/XGUI_CustomPrs.cpp
@@ -7,11 +7,13 @@
 #include <XGUI_CustomPrs.h>
 
 #include <ModelAPI_AttributeIntArray.h>
+#include <ModelAPI_Session.h>
 #include <Config_PropManager.h>
 
 #include <Events_Error.h>
 
 #include <vector>
+#include <QColor>
 
 
 void getColor(ResultPtr theResult, std::vector<int>& theColor)
@@ -56,5 +58,13 @@ bool XGUI_CustomPrs::customisePresentation(ResultPtr theResult, AISObjectPtr the
   if (aColor.empty())
     getDefaultColor(theResult, thePrs, aColor);
 
+  SessionPtr aMgr = ModelAPI_Session::get();
+  if (aMgr->activeDocument() != theResult->document()) {
+    QColor aQColor(aColor[0], aColor[1], aColor[2]);
+    QColor aNewColor = QColor::fromHsvF(aQColor.hueF(), aQColor.saturationF()/3., aQColor.valueF());
+    aColor[0] = aNewColor.red();
+    aColor[1] = aNewColor.green();
+    aColor[2] = aNewColor.blue();
+  }
   return !aColor.empty() && thePrs->setColor(aColor[0], aColor[1], aColor[2]);
 }