Image data storing corrected (Bug #177).

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

diff --git a/src/HYDROData/HYDROData_Image.cxx b/src/HYDROData/HYDROData_Image.cxx
index 3ca786fcff119444b3c9b670332916c862dee999..e589ae9cbec11205a3d233c17013a183b29f6820 100644 (file)
--- a/src/HYDROData/HYDROData_Image.cxx
+++ b/src/HYDROData/HYDROData_Image.cxx
@@ -11,7 +11,6 @@
 #include <TDataStd_Integer.hxx>
 #include <TDataStd_IntegerArray.hxx>
 #include <TDataStd_ReferenceList.hxx>
-#include <TDataStd_Name.hxx>
 #include <TDataStd_UAttribute.hxx>
 #include <TDataStd_AsciiString.hxx>
 
@@ -20,7 +19,6 @@
 
 #include <QStringList>
 
-static const Standard_GUID GUID_MUST_BE_UPDATED("80f2bb81-3873-4631-8ddd-940d2119f000");
 static const Standard_GUID GUID_SELF_SPLITTED("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");
@@ -189,6 +187,7 @@ void HYDROData_Image::Update()
 
     ImageComposer_Image aResImg = anOp->process( anObj1, anObj2 );
     SetImage( aResImg );
+    SetTrsf( aResImg.transform() );
   }
   else // Update image if it positioned relatively to other image
   {
@@ -199,9 +198,9 @@ void HYDROData_Image::Update()
   if ( !aDocument.IsNull() )
   {
     // Change the states of this and all depended images
-    MustBeUpdated( true );
+    SetToUpdate( true );
     HYDROData_Tool::SetMustBeUpdatedImages( aDocument );
-    MustBeUpdated( false );
+    SetToUpdate( false );
   }
 }
 
@@ -218,6 +217,20 @@ QVariant HYDROData_Image::GetDataVariant()
   return aVarData;
 }
 
+HYDROData_SequenceOfObjects HYDROData_Image::GetAllReferenceObjects() const
+{
+  HYDROData_SequenceOfObjects aResSeq = HYDROData_Entity::GetAllReferenceObjects();
+
+  Handle(HYDROData_Image) aRefImage = GetTrsfReferenceImage();
+  if ( !aRefImage.IsNull() )
+    aResSeq.Append( aRefImage );
+
+  HYDROData_SequenceOfObjects aSeqRefObjects = GetReferenceObjects( 0 );
+  aResSeq.Append( aSeqRefObjects );
+
+  return aResSeq;
+}
+
 void HYDROData_Image::SetImage(const QImage& theImage)
 {
   if (theImage.isNull()) {
@@ -271,9 +284,13 @@ QString HYDROData_Image::GetFilePath() const
 {
   QString aRes;
 
-  Handle(TDataStd_AsciiString) anAsciiStr;
-  if ( myLab.FindChild( DataTag_FilePath ).FindAttribute( TDataStd_AsciiString::GetID(), anAsciiStr ) )
-    aRes = QString( anAsciiStr->Get().ToCString() );
+  TDF_Label aLabel = myLab.FindChild( DataTag_FilePath, false );
+  if ( !aLabel.IsNull() )
+  {
+    Handle(TDataStd_AsciiString) anAsciiStr;
+    if ( aLabel.FindAttribute( TDataStd_AsciiString::GetID(), anAsciiStr ) )
+      aRes = QString( anAsciiStr->Get().ToCString() );
+  }
 
   return aRes;
 }
@@ -336,19 +353,19 @@ void HYDROData_Image::UpdateTrsf()
   bool anIsByTwoPoints = IsByTwoPoints();
 
   // Convert lambert coordinates to cartesian
-  if ( aTrsfMode == ManualLambert )
+  if ( aTrsfMode == ManualGeodesic )
   {
     double aXCart = 0, aYCart = 0;
 
-    HYDROData_Lambert93::toXY( aTrsfPointA.x(), aTrsfPointA.y(), aXCart, aYCart );
+    HYDROData_Lambert93::toXY( aTrsfPointA.y(), aTrsfPointA.x(), aXCart, aYCart );
     aTrsfPointA = QPointF( aXCart, aYCart );
 
-    HYDROData_Lambert93::toXY( aTrsfPointB.x(), aTrsfPointB.y(), aXCart, aYCart );
+    HYDROData_Lambert93::toXY( aTrsfPointB.y(), aTrsfPointB.x(), aXCart, aYCart );
     aTrsfPointB = QPointF( aXCart, aYCart );
 
     if ( !anIsByTwoPoints )
     {
-      HYDROData_Lambert93::toXY( aTrsfPointC.x(), aTrsfPointC.y(), aXCart, aYCart );
+      HYDROData_Lambert93::toXY( aTrsfPointC.y(), aTrsfPointC.x(), aXCart, aYCart );
       aTrsfPointC = QPointF( aXCart, aYCart );
     }
   }
@@ -434,7 +451,7 @@ void HYDROData_Image::RemoveAllReferences()
     SetIsSelfSplitted( false );
   }
 
-  MustBeUpdated( false );
+  SetToUpdate( false );
 
   bool anIsByTwoPoints = IsByTwoPoints();
 
@@ -640,7 +657,7 @@ void HYDROData_Image::SetTrsfMode( const TransformationMode& theMode )
 
 HYDROData_Image::TransformationMode HYDROData_Image::GetTrsfMode() const
 {
-  TransformationMode aResMode = ManualLambert;
+  TransformationMode aResMode = ManualGeodesic;
 
   TDF_Label aLabel = myLab.FindChild( DataTag_TrsfPoints, false );
   if ( !aLabel.IsNull() )
@@ -699,21 +716,25 @@ void HYDROData_Image::ClearReferences()
   ClearReferenceObjects( 0 );
 }
 
-void HYDROData_Image::SetOperatorName(const QString theOpName)
+void HYDROData_Image::SetOperatorName( const QString theOpName )
 {
-  TDataStd_Name::Set(myLab.FindChild(DataTag_Operator),
-    TCollection_ExtendedString(theOpName.toLatin1().constData()));
+  TCollection_AsciiString anAsciiStr( theOpName.toStdString().c_str() );
+  TDataStd_AsciiString::Set( myLab.FindChild( DataTag_Operator ), anAsciiStr );
 }
 
 QString HYDROData_Image::OperatorName() const
 {
-  Handle(TDataStd_Name) aName;
-  if (myLab.FindChild(DataTag_Operator).
-        FindAttribute(TDataStd_Name::GetID(), aName)) {
-    TCollection_AsciiString aStr(aName->Get());
-    return QString(aStr.ToCString());
+  QString aRes;
+
+  TDF_Label aLabel = myLab.FindChild( DataTag_Operator, false );
+  if ( !aLabel.IsNull() )
+  {
+    Handle(TDataStd_AsciiString) anAsciiStr;
+    if ( aLabel.FindAttribute( TDataStd_AsciiString::GetID(), anAsciiStr ) )
+      aRes = QString( anAsciiStr->Get().ToCString() );
   }
-  return QString();
+
+  return aRes;
 }
 
 void HYDROData_Image::SetArgs(const QByteArray& theArgs)
@@ -730,20 +751,6 @@ QByteArray HYDROData_Image::Args() const
   return QByteArray(aData, aLen);
 }
 
-void HYDROData_Image::MustBeUpdated(bool theFlag)
-{
-  if (theFlag) {
-    TDataStd_UAttribute::Set(myLab, GUID_MUST_BE_UPDATED);
-  } else {
-    myLab.ForgetAttribute(GUID_MUST_BE_UPDATED);
-  }
-}
-
-bool HYDROData_Image::MustBeUpdated() const
-{
-  return myLab.IsAttribute(GUID_MUST_BE_UPDATED);
-}
-
 void HYDROData_Image::SetIsSelfSplitted(bool theFlag)
 {
   if (theFlag) {