refs #734: correct construction of name for the polyline created as a result of split...

[modules/hydro.git] / src / HYDROData / HYDROData_Image.cxx

diff --git a/src/HYDROData/HYDROData_Image.cxx b/src/HYDROData/HYDROData_Image.cxx
index 4e91edafb18e9e543e5069a31cb8f3f5ca54827b..d6d187b601c6a1cdf8f32835c4215f3195f88da0 100644 (file)
--- a/src/HYDROData/HYDROData_Image.cxx
+++ b/src/HYDROData/HYDROData_Image.cxx
@@ -46,7 +46,7 @@
 
 #include <boost/math/special_functions/fpclassify.hpp>
 
-static const Standard_GUID GUID_SELF_SPLITTED("997995aa-5c19-40bf-9a60-ab4b70ad04d8");
+static const Standard_GUID GUID_SELF_SPLIT("997995aa-5c19-40bf-9a60-ab4b70ad04d8");
 static const Standard_GUID GUID_HAS_LOCAL_POINTS("FD8841AA-FC44-42fa-B6A7-0F682CCC6F27");
 static const Standard_GUID GUID_HAS_GLOBAL_POINTS("330D0E81-742D-4ea3-92D4-484877CFA7C1");
 
@@ -62,7 +62,8 @@ HYDROData_Image::~HYDROData_Image()
 {
 }
 
-QStringList HYDROData_Image::DumpToPython( MapOfTreatedObjects& theTreatedObjects ) const
+QStringList HYDROData_Image::DumpToPython( const QString&       thePyScriptPath,
+                                           MapOfTreatedObjects& theTreatedObjects ) const
 {
   QStringList aResList = dumpObjectCreation( theTreatedObjects );
   QString anImageName = GetObjPyName();
@@ -127,7 +128,7 @@ QStringList HYDROData_Image::DumpToPython( MapOfTreatedObjects& theTreatedObject
       if ( aTransformationMode == ReferenceImage )
       {
         Handle(HYDROData_Image) aRefImg = GetTrsfReferenceImage();
-        setPythonReferenceObject( theTreatedObjects, aResList, aRefImg, "SetTrsfReferenceImage" );
+        setPythonReferenceObject( thePyScriptPath, theTreatedObjects, aResList, aRefImg, "SetTrsfReferenceImage" );
       }
     }
   }
@@ -170,7 +171,7 @@ QStringList HYDROData_Image::DumpToPython( MapOfTreatedObjects& theTreatedObject
       for ( int i = 0; i < aNbReferences; ++i )
       {
         Handle(HYDROData_Image) aRefImg = Handle(HYDROData_Image)::DownCast( Reference( i ) );
-        setPythonReferenceObject( theTreatedObjects, aResList, aRefImg, "AppendReference" );
+        setPythonReferenceObject( thePyScriptPath, theTreatedObjects, aResList, aRefImg, "AppendReference" );
       }
     }
   }
@@ -507,7 +508,7 @@ void HYDROData_Image::RemoveAllReferences()
     ClearReferences();
     SetOperatorName( "" );
     SetArgs( "" );
-    SetIsSelfSplitted( false );
+    SetIsSelfSplit( false );
   }
 
   bool anIsByTwoPoints = IsByTwoPoints();
@@ -874,19 +875,19 @@ QByteArray HYDROData_Image::Args() const
   return QByteArray(aData, aLen);
 }
 
-void HYDROData_Image::SetIsSelfSplitted(bool theFlag)
+void HYDROData_Image::SetIsSelfSplit(bool theFlag)
 {
   if (theFlag) {
-    TDataStd_UAttribute::Set(myLab, GUID_SELF_SPLITTED);
+    TDataStd_UAttribute::Set(myLab, GUID_SELF_SPLIT);
   } else {
-    myLab.ForgetAttribute(GUID_SELF_SPLITTED);
+    myLab.ForgetAttribute(GUID_SELF_SPLIT);
   }
   Changed( Geom_2d );
 }
 
-bool HYDROData_Image::IsSelfSplitted() const
+bool HYDROData_Image::IsSelfSplit() const
 {
-  return myLab.IsAttribute(GUID_SELF_SPLITTED);
+  return myLab.IsAttribute(GUID_SELF_SPLIT);
 }
 
 QPointF HYDROData_Image::generateThirdPoint( const QPointF& thePointA,