bos #26450 Random color (TUI part)

Update "setColor" function to get an opportunity to setting color randomly from python file.

Add test to check setting colors.

diff --git a/src/ModelHighAPI/ModelHighAPI.i b/src/ModelHighAPI/ModelHighAPI.i
index 76f6c9f0aa0446c7b483ef70373f8a529ccda834..82af134c6378ee441b0e43d4b1c47d380dca7d8e 100644 (file)
--- a/src/ModelHighAPI/ModelHighAPI.i
+++ b/src/ModelHighAPI/ModelHighAPI.i
@@ -52,6 +52,9 @@
 // directors
 %feature("director") ModelHighAPI_Dumper;
 
+// functions with named parameters
+%feature("kwargs") setColor;
+
 // renamed methods
 %rename(__print__) ModelHighAPI_Dumper::operator<<;
 

diff --git a/src/ModelHighAPI/ModelHighAPI_Selection.cpp b/src/ModelHighAPI/ModelHighAPI_Selection.cpp
index 67543eedc3c75ee02e6567c5cc6bb92314c418d5..3b45898cdc9cbef594502ea371f7e3193bff3abd 100644 (file)
--- a/src/ModelHighAPI/ModelHighAPI_Selection.cpp
+++ b/src/ModelHighAPI/ModelHighAPI_Selection.cpp
@@ -25,7 +25,7 @@
 #include <ModelAPI_AttributeSelectionList.h>
 #include <ModelAPI_Feature.h>
 #include <ModelAPI_ResultBody.h>
-
+#include <ModelAPI_Tools.h>
 
 #include <GeomAPI_Pnt.h>
 //--------------------------------------------------------------------------------------
@@ -209,7 +209,7 @@ std::wstring ModelHighAPI_Selection::name() const
   return std::wstring();
 }
 
-void ModelHighAPI_Selection::setColor(int theRed, int theGreen, int theBlue)
+void ModelHighAPI_Selection::setColor(int theRed, int theGreen, int theBlue, bool random)
 {
   if (myVariantType != VT_ResultSubShapePair || !myResultSubShapePair.first.get())
     return;
@@ -217,9 +217,20 @@ void ModelHighAPI_Selection::setColor(int theRed, int theGreen, int theBlue)
   AttributeIntArrayPtr aColor =
       myResultSubShapePair.first->data()->intArray(ModelAPI_Result::COLOR_ID());
   aColor->setSize(3);
-  aColor->setValue(0, theRed);
-  aColor->setValue(1, theGreen);
-  aColor->setValue(2, theBlue);
+
+  if (random)
+  {
+    std::vector<int> aValues;
+    ModelAPI_Tools::findRandomColor(aValues);
+    for (int anIndex = 0; anIndex < 3; ++anIndex)
+      aColor->setValue(anIndex, aValues[anIndex]);
+  }
+  else
+  {
+    aColor->setValue(0, theRed);
+    aColor->setValue(1, theGreen);
+    aColor->setValue(2, theBlue);
+  }
 }
 
 void ModelHighAPI_Selection::setDeflection(double theValue)

diff --git a/src/ModelHighAPI/ModelHighAPI_Selection.h b/src/ModelHighAPI/ModelHighAPI_Selection.h
index 93f6690a900a558aedf7db6bd79b66b45d7fa0fe..1b812ad7d97e476e5e8c6704c045a233bf4a8c54 100644 (file)
--- a/src/ModelHighAPI/ModelHighAPI_Selection.h
+++ b/src/ModelHighAPI/ModelHighAPI_Selection.h
@@ -134,7 +134,7 @@ public:
 
   /// Change result's color
   MODELHIGHAPI_EXPORT
-  void setColor(int theRed, int theGreen, int theBlue);
+  void setColor(int theRed = 0, int theGreen = 0, int theBlue = 0, bool random = false);
 
   /// Change result's deflection
   MODELHIGHAPI_EXPORT

diff --git a/src/ModelHighAPI/Test/TestSetColors.py b/src/ModelHighAPI/Test/TestSetColors.py
new file mode 100644 (file)
index 0000000..c2f83bd
--- /dev/null
+++ b/src/ModelHighAPI/Test/TestSetColors.py
@@ -0,0 +1,48 @@
+# Copyright (C) 2014-2021  CEA/DEN, EDF R&D
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+
+from salome.shaper import model
+
+model.begin()
+partSet = model.moduleDocument()
+
+### Create Part
+Part_1 = model.addPart(partSet)
+Part_1_doc = Part_1.document()
+
+### Create Box
+Box_1 = model.addBox(Part_1_doc, 10, 10, 10)
+Box_1.result().setColor(random=True)
+assert(Box_1.result().resultSubShapePair()[0].data().intArray("Color").isInitialized())
+
+### Create next Box
+Box_2 = model.addBox(Part_1_doc, 10, 10, 10)
+aRed = 60
+aGreen = 200
+aBlue = 100
+Box_2.result().setColor(aRed, aGreen, aBlue)
+
+assert(Box_2.result().resultSubShapePair()[0].data().intArray("Color").isInitialized())
+assert(Box_2.result().resultSubShapePair()[0].data().intArray("Color").value(0) == aRed)
+assert(Box_2.result().resultSubShapePair()[0].data().intArray("Color").value(1) == aGreen)
+assert(Box_2.result().resultSubShapePair()[0].data().intArray("Color").value(2) == aBlue)
+
+model.end()
+
+assert(model.checkPythonDump())

diff --git a/src/ModelHighAPI/tests.set b/src/ModelHighAPI/tests.set
index 626f2380798192b596a519e1878db6d7f87dfc83..9a97edbc1ef8f2c0f315d497524619ae31eaec90 100644 (file)
--- a/src/ModelHighAPI/tests.set
+++ b/src/ModelHighAPI/tests.set
@@ -30,4 +30,5 @@ SET(TEST_NAMES
   Test19990_1.py
   Test19990_2.py
   Test20167.py
+  TestSetColors.py
 )