Issue #631 - Uncatched problem in XML file

[modules/shaper.git] / src / ModelAPI / ModelAPI_Tools.cpp

diff --git a/src/ModelAPI/ModelAPI_Tools.cpp b/src/ModelAPI/ModelAPI_Tools.cpp
index 581471df3f353c4ed2b405f5c45a8a0fde62bd1d..cbe1290a852b80cc4192d1d38bf6889517a4a74f 100644 (file)
--- a/src/ModelAPI/ModelAPI_Tools.cpp
+++ b/src/ModelAPI/ModelAPI_Tools.cpp
@@ -10,7 +10,8 @@
 #include <ModelAPI_Object.h>
 #include <ModelAPI_AttributeDouble.h>
 #include <ModelAPI_ResultParameter.h>
-
+#include <ModelAPI_ResultPart.h>
+#include <ModelAPI_AttributeDocRef.h>
 #include <list>
 #include <map>
 
@@ -36,7 +37,7 @@ std::shared_ptr<GeomAPI_Shape> shape(const ResultPtr& theResult)
   return theResult->shape();
 }
 
-bool findVariable(const std::string& theName, double& outValue)
+bool findVariable(const std::string& theName, double& outValue, ResultParameterPtr& theParam)
 {
   SessionPtr aSession = ModelAPI_Session::get();
   std::list<DocumentPtr> aDocList;
@@ -48,10 +49,10 @@ bool findVariable(const std::string& theName, double& outValue)
   }
   for(std::list<DocumentPtr>::const_iterator it = aDocList.begin(); it != aDocList.end(); ++it) {
     ObjectPtr aParamObj = (*it)->objectByName(ModelAPI_ResultParameter::group(), theName);
-    ResultParameterPtr aParam = std::dynamic_pointer_cast<ModelAPI_ResultParameter>(aParamObj);
-    if(!aParam.get())
+    theParam = std::dynamic_pointer_cast<ModelAPI_ResultParameter>(aParamObj);
+    if(!theParam.get())
       continue;
-    AttributeDoublePtr aValueAttribute = aParam->data()->real(ModelAPI_ResultParameter::VALUE());
+    AttributeDoublePtr aValueAttribute = theParam->data()->real(ModelAPI_ResultParameter::VALUE());
     outValue = aValueAttribute->value();
     return true;
   }
@@ -99,18 +100,18 @@ std::vector<int> HSVtoRGB(int theH, int theS, int theV)
   double aVdec = theV - anA;
 
   double aPercentToValue = 255./100;
-  aV    *= aPercentToValue;
-  aVinc *= aPercentToValue;
-  aVmin *= aPercentToValue;
-  aVdec *= aPercentToValue;
+  int aV_int    = (int)(aV*aPercentToValue);
+  int aVinc_int = (int)(aVinc*aPercentToValue);
+  int aVmin_int = (int)(aVmin*aPercentToValue);
+  int aVdec_int = (int)(aVdec*aPercentToValue);
 
   switch(aHi) {
-    case 0: appendValues(aRGB, aV,    aVinc, aVmin); break;
-    case 1: appendValues(aRGB, aVdec, aV,    aVmin); break;
-    case 2: appendValues(aRGB, aVmin, aV,    aVinc); break;
-    case 3: appendValues(aRGB, aVmin, aVdec, aV); break;
-    case 4: appendValues(aRGB, aVinc, aVmin, aV); break;
-    case 5: appendValues(aRGB, aV,    aVmin, aVdec); break;
+    case 0: appendValues(aRGB, aV_int,    aVinc_int, aVmin_int); break;
+    case 1: appendValues(aRGB, aVdec_int, aV_int,    aVmin_int); break;
+    case 2: appendValues(aRGB, aVmin_int, aV_int,    aVinc_int); break;
+    case 3: appendValues(aRGB, aVmin_int, aVdec_int, aV_int); break;
+    case 4: appendValues(aRGB, aVinc_int, aVmin_int, aV_int); break;
+    case 5: appendValues(aRGB, aV_int,    aVmin_int, aVdec_int); break;
     default: break;
   }
   return aRGB;
@@ -153,4 +154,16 @@ void findRandomColor(std::vector<int>& theValues)
   }
 }
 
+ResultPtr findPartResult(const DocumentPtr& theMain, const DocumentPtr& theSub)
+{
+  for (int a = theMain->size(ModelAPI_ResultPart::group()) - 1; a >= 0; a--) {
+    ResultPartPtr aPart = std::dynamic_pointer_cast<ModelAPI_ResultPart>(
+        theMain->object(ModelAPI_ResultPart::group(), a));
+    if (aPart && aPart->data()->document(ModelAPI_ResultPart::DOC_REF())->value() == theSub) {
+      return aPart;
+    }
+  }
+  return ResultPtr();
+}
+
 } // namespace ModelAPI_Tools