]> SALOME platform Git repositories - modules/shaper.git/commitdiff
Salome HOME
Issue #3207: The feature Copy allows to copy a sketch
authorArtem Zhidkov <Artem.Zhidkov@opencascade.com>
Mon, 13 Apr 2020 07:18:39 +0000 (10:18 +0300)
committerArtem Zhidkov <Artem.Zhidkov@opencascade.com>
Mon, 13 Apr 2020 07:18:39 +0000 (10:18 +0300)
Prohibit to use constructions in the Copy feature.
Move SketchCopy feature to the same panel as the Copy feature.

src/FeaturesPlugin/CMakeLists.txt
src/FeaturesPlugin/Test/TestCopy_ErrorMsg.py [new file with mode: 0644]
src/FeaturesPlugin/copy_widget.xml
src/FeaturesPlugin/plugin-Features.xml
src/SketchPlugin/plugin-SketchCopy.xml

index 51d00ae402269646f30c9751e468aed7b5b731b3..78692f28e2c18e5d8b4403fcf107945c2a92b665 100644 (file)
@@ -552,6 +552,7 @@ ADD_UNIT_TESTS(TestExtrusion.py
                Test3033.py
                Test3076.py
                Test17909.py
+               TestCopy_ErrorMsg.py
                TestCopyFeature.py
                TestCopyFeatureMoveGroupOfFeature.py
                TestCopyMoveResult.py
diff --git a/src/FeaturesPlugin/Test/TestCopy_ErrorMsg.py b/src/FeaturesPlugin/Test/TestCopy_ErrorMsg.py
new file mode 100644 (file)
index 0000000..af41f24
--- /dev/null
@@ -0,0 +1,39 @@
+# Copyright (C) 2014-2019  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
+#
+
+# Checks selection of the whole featurte and move to the end of the group created on results of this feature..
+
+from salome.shaper import model
+
+model.begin()
+partSet = model.moduleDocument()
+Part_1 = model.addPart(partSet)
+Part_1_doc = Part_1.document()
+Sketch_1 = model.addSketch(Part_1_doc, model.defaultPlane("XOY"))
+SketchCircle_1 = Sketch_1.addCircle(11.02869497636673, 9.8764247475525, 3.312248077480665)
+SketchCircle_2 = Sketch_1.addCircle(4.278198729238611, 4.677840612715367, 1.794922837237287)
+model.do()
+Copy_1 = model.addCopy(Part_1_doc, [model.selection("COMPOUND", "all-in-Sketch_1")], 1)
+Copy_2 = model.addCopy(Part_1_doc, [model.selection("COMPOUND", "Sketch_1")], 1)
+model.end()
+
+from ModelAPI import *
+aFactory = ModelAPI_Session.get().validators()
+assert(not aFactory.validate(Copy_1.feature()))
+assert(not aFactory.validate(Copy_2.feature()))
index 6f79ca138c6175f83a7c6fc08140b97f241fe8e3..104a1ed7150975a03581838a2f172cf2988f9fe5 100644 (file)
@@ -5,6 +5,7 @@
                   shape_types="vertices edges wires faces shells compsolids objects"
                   use_choice="false"
                   concealment="false">
+    <validator id="GeomValidators_BodyShapes"/>
   </multi_selector>
   <integervalue id="number"
                 label="Nb copies"
index 5fbe8a1f42adb127c95d4a8831b6b691944d747d..29f4053331058cf788f3f2191912b119eab7db12 100644 (file)
@@ -89,7 +89,7 @@
           <source path="remove_subshapes_widget.xml"/>
       </feature>
     </group>
-    <group id="Collections">
+    <group id="Duplicates">
       <feature id="Recover"
         title="Recover"
         tooltip="Visualize concealed objects"
index 3d896b5c33d1dd11243326d1469efa8d13eebcaf..64e6e1f9e34a7d2dc723a55732b2c8ca669418fc 100644 (file)
@@ -1,6 +1,6 @@
 <plugin>
-  <workbench id="Macros">
-    <group id="Sketch">
+  <workbench id="Features">
+    <group id="Duplicates">
       <feature id="SketchCopy"
                title="Sketch copy"
                tooltip="Copy sketch and all its elements to the same plane"