X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FSketchPlugin%2FTest%2FTestMultiTranslation.py;h=2c0a2b9373ed2c93a83e469f8345a0d7302517da;hb=deae3a86465eb3f9ff111324037faa3e22146ea6;hp=47f8fe30b871d6523bde7bb8ba2a1d5ff421fac1;hpb=868158fe6d39b25e60ac528295b1c908821e4af5;p=modules%2Fshaper.git

diff --git a/src/SketchPlugin/Test/TestMultiTranslation.py b/src/SketchPlugin/Test/TestMultiTranslation.py
index 47f8fe30b..2c0a2b937 100644
--- a/src/SketchPlugin/Test/TestMultiTranslation.py
+++ b/src/SketchPlugin/Test/TestMultiTranslation.py
@@ -5,10 +5,8 @@
     SketchPlugin_MultiTranslation
         static const std::string MY_CONSTRAINT_TRANSLATION_ID("SketchMultiTranslation");
         data()->addAttribute(VALUE_TYPE(), ModelAPI_AttributeString::typeId());
-        data()->addAttribute(START_POINT_ID(), GeomDataAPI_Point2D::typeId());
-        data()->addAttribute(START_FULL_POINT_ID(), GeomDataAPI_Point2D::typeId());
-        data()->addAttribute(END_POINT_ID(), GeomDataAPI_Point2D::typeId());
-        data()->addAttribute(END_FULL_POINT_ID(), GeomDataAPI_Point2D::typeId());
+        data()->addAttribute(START_POINT_ID(), ModelAPI_AttributeRefAttr::typeId());
+        data()->addAttribute(END_POINT_ID(), ModelAPI_AttributeRefAttr::typeId());
         data()->addAttribute(NUMBER_OF_OBJECTS_ID(), ModelAPI_AttributeInteger::typeId());
         data()->addAttribute(SketchPlugin_Constraint::ENTITY_A(), ModelAPI_AttributeRefList::typeId());
         data()->addAttribute(SketchPlugin_Constraint::ENTITY_B(), ModelAPI_AttributeRefList::typeId());
@@ -36,6 +34,15 @@ def createSketch(theSketch):
     theSketch.execute()
     return allFeatures
     
+def createLine(theSketch):
+    aSketchLine = theSketch.addFeature("SketchLine")
+    aStartPoint = geomDataAPI_Point2D(aSketchLine.attribute("StartPoint"))
+    aEndPoint   = geomDataAPI_Point2D(aSketchLine.attribute("EndPoint"))
+    aStartPoint.setValue(7., 5.)
+    aEndPoint.setValue(1., 3.)
+    theSketch.execute()
+    return aSketchLine
+    
 def checkTranslation(theObjects, theNbObjects, theDeltaX, theDeltaY):
     # Verify distances of the objects and the number of copies
     aFeatures = []
@@ -48,7 +55,7 @@ def checkTranslation(theObjects, theNbObjects, theDeltaX, theDeltaY):
     anInd = 0 
     for feat, next in zip(aFeatures[:-1], aFeatures[1:]):
         anInd = anInd + 1
-        if (anInd > theNbObjects):
+        if (anInd > theNbObjects-1):
             anInd = 0
             continue
         assert(feat.getKind() == next.getKind())
@@ -63,11 +70,11 @@ def checkTranslation(theObjects, theNbObjects, theDeltaX, theDeltaY):
             anAttributes.append('ArcEndPoint')
             
         for attr in anAttributes:
-            aPoint1 = geomDataAPI_Point2D(feat.attribute(attr))
-            aPoint2 = geomDataAPI_Point2D(next.attribute(attr))
-            aDiffX = aPoint2.x() - aPoint1.x() - theDeltaX
-            aDiffY = aPoint2.y() - aPoint1.y() - theDeltaY
-            assert(aDiffX**2 + aDiffY**2 < 1.e-15)
+             aPoint1 = geomDataAPI_Point2D(feat.attribute(attr))
+             aPoint2 = geomDataAPI_Point2D(next.attribute(attr))
+             aDiffX = aPoint2.x() - aPoint1.x() - theDeltaX
+             aDiffY = aPoint2.y() - aPoint1.y() - theDeltaY
+             assert(aDiffX**2 + aDiffY**2 < 1.e-15)
     # Check the number of copies is as planed
     assert(anInd == theNbObjects-1)
 
@@ -109,6 +116,16 @@ DIR_Y = 10.
 DELTA_X = -5.
 DELTA_Y = 3.
 #=========================================================================
+# Create translation line
+#=========================================================================
+aSession.startOperation()
+aTransLine = aSketchFeature.addFeature("SketchLine")
+aTransLineStartPoint = geomDataAPI_Point2D(aTransLine.attribute("StartPoint"))
+aTransLineEndPoint = geomDataAPI_Point2D(aTransLine.attribute("EndPoint"))
+aTransLineStartPoint.setValue(START_X, START_Y)
+aTransLineEndPoint.setValue(START_X + DELTA_X, START_Y + DELTA_Y)
+aSession.finishOperation()
+#=========================================================================
 # Create the Translation constraint
 #=========================================================================
 aSession.startOperation()
@@ -121,10 +138,10 @@ for aFeature in aFeaturesList:
 
 aValueType = aMultiTranslation.string("ValueType")
 aValueType.setValue("SingleValue")
-aStartPoint = geomDataAPI_Point2D(aMultiTranslation.attribute("MultiTranslationStartPoint"))
-aEndPoint = geomDataAPI_Point2D(aMultiTranslation.attribute("MultiTranslationEndPoint"))
-aStartPoint.setValue(START_X, START_Y)
-aEndPoint.setValue(START_X + DIR_X, START_Y + DIR_Y)
+aStartPoint = aMultiTranslation.refattr("MultiTranslationStartPoint")
+aEndPoint = aMultiTranslation.refattr("MultiTranslationEndPoint")
+aStartPoint.setAttr(aTransLineStartPoint)
+aEndPoint.setAttr(aTransLineEndPoint)
 aNbCopies = aMultiTranslation.integer("MultiTranslationObjects")
 aNbCopies.setValue(2)
 aMultiTranslation.execute()
@@ -133,7 +150,7 @@ aSession.finishOperation()
 # Verify the objects are moved for the specified distance
 #=========================================================================
 aTranslated = aMultiTranslation.reflist("ConstraintEntityB")
-checkTranslation(aTranslated, aNbCopies.value(), DIR_X, DIR_Y)
+checkTranslation(aTranslated, aNbCopies.value(), DELTA_X, DELTA_Y)
 #=========================================================================
 # Change number of copies and verify translation
 #=========================================================================
@@ -141,12 +158,55 @@ aSession.startOperation()
 aNbCopies.setValue(3)
 aSession.finishOperation()
 aTranslated = aMultiTranslation.reflist("ConstraintEntityB")
-checkTranslation(aTranslated, aNbCopies.value(), DIR_X, DIR_Y)
+checkTranslation(aTranslated, aNbCopies.value(), DELTA_X, DELTA_Y)
+
+#=========================================================================
+# Create new feature and add it into the Rotation
+#=========================================================================
+aSession.startOperation()
+aLine = createLine(aSketchFeature)
+aSession.finishOperation()
+aSession.startOperation()
+aResult = modelAPI_ResultConstruction(aLine.lastResult())
+assert(aResult is not None)
+aTransList.append(aResult)
+aSession.finishOperation()
+checkTranslation(aTranslated, aNbCopies.value(), DELTA_X, DELTA_Y)
+#=========================================================================
+# Move line and check the copies are moved too
+#=========================================================================
+aSession.startOperation()
+aStartPoint = geomDataAPI_Point2D(aLine.attribute("StartPoint"))
+aStartPoint.setValue(12., 5.)
+aSession.finishOperation()
+checkTranslation(aTranslated, aNbCopies.value(), DELTA_X, DELTA_Y)
+#=========================================================================
+# Change number of copies and verify Rotation
+#=========================================================================
+aSession.startOperation()
+aNbCopies.setValue(2)
+aSession.finishOperation()
+checkTranslation(aTranslated, aNbCopies.value(), DELTA_X, DELTA_Y)
+
 #=========================================================================
-# TODO: improve test
-# 1. Add more features into translation
-# 2. Move one of initial features and check the translated is moved too
+# Remove a feature from the Rotation
 #=========================================================================
+aSession.startOperation()
+aRemoveIt = aTransList.object(0)
+aTransList.remove(aRemoveIt)
+aSession.finishOperation()
+checkTranslation(aTranslated, aNbCopies.value(), DELTA_X, DELTA_Y)
+
+#=========================================================================
+# Clear the list of rotated features
+#=========================================================================
+aSession.startOperation()
+aTransList.clear()
+checkTranslation(aTranslated, 1, DELTA_X, DELTA_Y)
+# Add line once again
+aTransList.append(aResult)
+aSession.finishOperation()
+checkTranslation(aTranslated, aNbCopies.value(), DELTA_X, DELTA_Y)
 #=========================================================================
 # End of test
 #=========================================================================