Issue #1660: Ability to change the deflection coefficient

[modules/shaper.git] / src / XGUI / XGUI_CustomPrs.cpp

diff --git a/src/XGUI/XGUI_CustomPrs.cpp b/src/XGUI/XGUI_CustomPrs.cpp
index 7948325d795e1442ceeff7b5521220b8d90e4605..373eb2fe6e4569b712544d41efa8ddd7cdff16bc 100644 (file)
--- a/src/XGUI/XGUI_CustomPrs.cpp
+++ b/src/XGUI/XGUI_CustomPrs.cpp
@@ -11,16 +11,29 @@
 #include <ModuleBase_IModule.h>
 
 #include <ModelAPI_AttributeIntArray.h>
+#include <ModelAPI_AttributeDouble.h>
 #include <ModelAPI_Session.h>
 #include <Config_PropManager.h>
 
-#include <Events_Error.h>
+#include <Events_InfoMessage.h>
 
 #include <vector>
 #include <QColor>
 
+double getDeflection(const ResultPtr& theResult)
+{
+  double aDeflection = -1;
+  // get color from the attribute of the result
+  if (theResult.get() != NULL &&
+      theResult->data()->attribute(ModelAPI_Result::DEFLECTION_ID()).get() != NULL) {
+    AttributeDoublePtr aDoubleAttr = theResult->data()->real(ModelAPI_Result::DEFLECTION_ID());
+    if (aDoubleAttr.get() && aDoubleAttr->isInitialized())
+      aDeflection = aDoubleAttr->value();
+  }
+  return aDeflection;
+}
 
-void getColor(ResultPtr theResult, std::vector<int>& theColor)
+void getColor(const ResultPtr& theResult, std::vector<int>& theColor)
 {
   theColor.clear();
   // get color from the attribute of the result
@@ -50,22 +63,36 @@ void XGUI_CustomPrs::getDefaultColor(ObjectPtr theObject, const bool isEmptyColo
     // all AIS objects, where the color is not set, are in black.
     // The color should be defined in XML or set in the attribute
     theColor = Config_PropManager::color("Visualization", "object_default_color", "#000000");
-    Events_Error::send("A default color is not defined in the preferences for this kind of result");
+    Events_InfoMessage("XGUI_CustomPrs", 
+      "A default color is not defined in the preferences for this kind of result").send();
   }
 }
 
+double XGUI_CustomPrs::getDefaultDeflection(const ObjectPtr& theObject)
+{
+  return Config_PropManager::real("Visualization", "result_deflection", "0.001");
+}
+
 XGUI_CustomPrs::XGUI_CustomPrs(XGUI_Workshop* theWorkshop)
 : myWorkshop(theWorkshop)
 {
 }
 
-void XGUI_CustomPrs::getResultColor(ResultPtr theResult, std::vector<int>& theColor)
+void XGUI_CustomPrs::getResultColor(const ResultPtr& theResult, std::vector<int>& theColor)
 {
   getColor(theResult, theColor);
   if (theColor.empty())
     getDefaultColor(theResult, false, theColor);
 }
 
+double XGUI_CustomPrs::getResultDeflection(const ResultPtr& theResult)
+{
+  double aDeflection = getDeflection(theResult);
+  if (aDeflection < 0)
+    aDeflection = getDefaultDeflection(theResult);
+  return aDeflection;
+}
+
 bool XGUI_CustomPrs::customisePresentation(ResultPtr theResult, AISObjectPtr thePrs,
                                            std::shared_ptr<GeomAPI_ICustomPrs> theCustomPrs)
 {
@@ -83,12 +110,10 @@ bool XGUI_CustomPrs::customisePresentation(ResultPtr theResult, AISObjectPtr the
       aColor[2] = aNewColor.blue();
     }
     aCustomized = !aColor.empty() && thePrs->setColor(aColor[0], aColor[1], aColor[2]);
+
+    aCustomized = thePrs->setDeflection(getResultDeflection(theResult)) | aCustomized;
   }
-  else {
-   if (!aCustomized) {
-      ModuleBase_IModule* aModule = myWorkshop->module();
-      aCustomized = aModule->customisePresentation(theResult, thePrs, theCustomPrs);
-    }
-  }
+  ModuleBase_IModule* aModule = myWorkshop->module();
+  aCustomized = aModule->customisePresentation(theResult, thePrs, theCustomPrs) || aCustomized;
   return aCustomized;
 }