Import polyline from shape (Feature #228).

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

diff --git a/src/HYDROData/HYDROData_Profile.cxx b/src/HYDROData/HYDROData_Profile.cxx
index 9832cadb3a4a47fa95a35795a1d2ec5da90c2af5..6ed959ceb097667b46f020169b0c345c70b0be61 100755 (executable)
--- a/src/HYDROData/HYDROData_Profile.cxx
+++ b/src/HYDROData/HYDROData_Profile.cxx
@@ -21,6 +21,7 @@
 #include <OSD_File.hxx>
 #include <OSD_Protection.hxx>
 
+#include <QColor>
 #include <QStringList>
 
 #define PYTHON_PROFILE_ID "KIND_PROFILE"
@@ -37,12 +38,30 @@ HYDROData_Profile::~HYDROData_Profile()
 {
 }
 
+QStringList HYDROData_Profile::DumpToPython( MapOfTreatedObjects& theTreatedObjects ) const
+{
+  QStringList aResList;
+
+  Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( myLab );
+  if ( aDocument.IsNull() )
+    return aResList;
+                             
+  QString aDocName = aDocument->GetDocPyName();
+  QString aProfileName = GetName();
+
+  aResList << QString( "%1 = %2.CreateObject( %3 );" )
+              .arg( aProfileName ).arg( aDocName ).arg( PYTHON_PROFILE_ID );
+  aResList << QString( "%1.SetName( \"%1\" );" ).arg( aProfileName );
+
+  return aResList;
+}
+
 TopoDS_Shape HYDROData_Profile::GetTopShape() const
 {
   TopoDS_Wire aWire;
 
   gp_XY aFirstPoint, aLastPoint;
-  if ( !GetFirstPoint( aFirstPoint ) || !GetLastPoint( aLastPoint ) )
+  if ( !GetLeftPoint( aFirstPoint ) || !GetRightPoint( aLastPoint ) )
     return aWire;
 
   gp_Pnt aPnt1( aFirstPoint.X(), aFirstPoint.Y(), 0 );
@@ -62,8 +81,10 @@ TopoDS_Shape HYDROData_Profile::GetShape3D() const
   return getShape3D();
 }
 
-void HYDROData_Profile::UpdateShape3D()
+void HYDROData_Profile::Update()
 {
+  HYDROData_Object::Update();
+
   BRepBuilderAPI_MakeWire aMakeWire;
 
   ProfilePoints aProfilePoints = GetProfilePoints();
@@ -88,38 +109,37 @@ void HYDROData_Profile::UpdateShape3D()
   SetShape3D( aWire );
 }
 
-/**
- * Dump object to Python script representation.
- */
-QStringList HYDROData_Profile::DumpToPython( MapOfTreatedObjects& theTreatedObjects ) const
+QColor HYDROData_Profile::DefaultFillingColor()
 {
-  QStringList aResList;
+  return QColor( Qt::transparent );
+}
 
-  Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( myLab );
-  if ( aDocument.IsNull() )
-    return aResList;
-                             
-  QString aDocName = aDocument->GetDocPyName();
-  QString aProfileName = GetName();
+QColor HYDROData_Profile::DefaultBorderColor()
+{
+  return QColor( Qt::black );
+}
 
-  aResList << QString( "%1 = %2.CreateObject( %3 );" )
-              .arg( aProfileName ).arg( aDocName ).arg( PYTHON_PROFILE_ID );
-  aResList << QString( "%1.SetName( \"%1\" );" ).arg( aProfileName );
+QColor HYDROData_Profile::getDefaultFillingColor() const
+{
+  return DefaultFillingColor();
+}
 
-  return aResList;
+QColor HYDROData_Profile::getDefaultBorderColor() const
+{
+  return DefaultBorderColor();
 }
 
 bool HYDROData_Profile::IsValid() const
 {
   gp_XY aFirstPoint, aLastPoint;
-  if ( !GetFirstPoint( aFirstPoint ) || !GetLastPoint( aLastPoint ) )
+  if ( !GetLeftPoint( aFirstPoint ) || !GetRightPoint( aLastPoint ) )
     return false;
 
   int aNbPoints = NbPoints();
   return aNbPoints > 1;
 }
 
-void HYDROData_Profile::SetFirstPoint( const gp_XY& thePoint )
+void HYDROData_Profile::SetLeftPoint( const gp_XY& thePoint )
 {
   TDF_Label aLabel = myLab.FindChild( DataTag_FirstPoint );
 
@@ -129,9 +149,11 @@ void HYDROData_Profile::SetFirstPoint( const gp_XY& thePoint )
 
   anArray->SetValue( 0, thePoint.X() );
   anArray->SetValue( 1, thePoint.Y() );
+
+  SetToUpdate( true );
 }
 
-bool HYDROData_Profile::GetFirstPoint( gp_XY& thePoint ) const
+bool HYDROData_Profile::GetLeftPoint( gp_XY& thePoint ) const
 {
   TDF_Label aLabel = myLab.FindChild( DataTag_FirstPoint, false );
   if ( aLabel.IsNull() )
@@ -147,7 +169,7 @@ bool HYDROData_Profile::GetFirstPoint( gp_XY& thePoint ) const
   return true;
 }
 
-void HYDROData_Profile::SetLastPoint( const gp_XY& thePoint )
+void HYDROData_Profile::SetRightPoint( const gp_XY& thePoint )
 {
   TDF_Label aLabel = myLab.FindChild( DataTag_LastPoint );
 
@@ -157,9 +179,11 @@ void HYDROData_Profile::SetLastPoint( const gp_XY& thePoint )
 
   anArray->SetValue( 0, thePoint.X() );
   anArray->SetValue( 1, thePoint.Y() );
+
+  SetToUpdate( true );
 }
 
-bool HYDROData_Profile::GetLastPoint( gp_XY& thePoint ) const
+bool HYDROData_Profile::GetRightPoint( gp_XY& thePoint ) const
 {
   TDF_Label aLabel = myLab.FindChild( DataTag_LastPoint, false );
   if ( aLabel.IsNull() )
@@ -175,6 +199,19 @@ bool HYDROData_Profile::GetLastPoint( gp_XY& thePoint ) const
   return true;
 }
 
+void HYDROData_Profile::Invalidate()
+{
+  TDF_Label aFirstLabel = myLab.FindChild( DataTag_FirstPoint, false );
+  if ( !aFirstLabel.IsNull() )
+    aFirstLabel.ForgetAllAttributes();
+
+  TDF_Label aLastLabel = myLab.FindChild( DataTag_LastPoint, false );
+  if ( !aLastLabel.IsNull() )
+    aLastLabel.ForgetAllAttributes();
+
+  SetToUpdate( true );
+}
+
 Handle(HYDROData_ProfileUZ) HYDROData_Profile::GetProfileUZ( const bool theIsCreate ) const
 {
   Handle(HYDROData_ProfileUZ) aProfileUZ;
@@ -203,7 +240,10 @@ void HYDROData_Profile::RemovePoints()
 {
   Handle(HYDROData_ProfileUZ) aProfileUZ = GetProfileUZ( false );
   if ( !aProfileUZ.IsNull() )
+  {
     aProfileUZ->RemoveSections();
+    SetToUpdate( true );
+  }
 }
 
 void HYDROData_Profile::SetParametricPoints( const HYDROData_ProfileUZ::PointsList& thePoints )
@@ -216,6 +256,8 @@ void HYDROData_Profile::SetParametricPoints( const HYDROData_ProfileUZ::PointsLi
     const HYDROData_ProfileUZ::Point& aPoint = thePoints.Value( i );
     aProfileUZ->AddPoint( 0, aPoint );
   }
+
+  SetToUpdate( true );
 }
 
 HYDROData_ProfileUZ::PointsList HYDROData_Profile::GetParametricPoints() const
@@ -249,8 +291,8 @@ void HYDROData_Profile::SetProfilePoints( const ProfilePoints& thePoints )
     aProfileUZ->AddPoint( 0, aParPoint );
   }
 
-  SetFirstPoint( aFirstPoint );
-  SetLastPoint( aLastPoint );
+  SetLeftPoint( aFirstPoint );
+  SetRightPoint( aLastPoint );
 }
 
 HYDROData_Profile::ProfilePoints HYDROData_Profile::GetProfilePoints() const
@@ -258,7 +300,7 @@ HYDROData_Profile::ProfilePoints HYDROData_Profile::GetProfilePoints() const
   ProfilePoints aResPoints;
 
   gp_XY aFirstPoint, aLastPoint;
-  if ( !GetFirstPoint( aFirstPoint ) || !GetLastPoint( aLastPoint ) )
+  if ( !GetLeftPoint( aFirstPoint ) || !GetRightPoint( aLastPoint ) )
     return aResPoints;
 
   HYDROData_ProfileUZ::PointsList aParametricPoints = GetParametricPoints();
@@ -328,40 +370,40 @@ bool HYDROData_Profile::ImportFromFile( const Handle(HYDROData_Document)& theDoc
   if ( !aFile.IsOpen() )
     return false;
 
-  bool aRes = true;
-
   NCollection_Sequence<Handle(HYDROData_Profile)> aCreatedProfiles;
 
-  while ( aRes && !aFile.IsAtEnd() )
+  Handle(HYDROData_Profile) aNewProfile;
+  while ( !aFile.IsAtEnd() )
   {
-    Handle(HYDROData_Profile) aNewProfile = 
-      Handle(HYDROData_Profile)::DownCast( theDoc->CreateObject( KIND_PROFILE ) );
+    if ( aNewProfile.IsNull() )
+      aNewProfile = Handle(HYDROData_Profile)::DownCast( theDoc->CreateObject( KIND_PROFILE ) );
     
-    aRes = aNewProfile->ImportFromFile( aFile );
-
-    aCreatedProfiles.Append( aNewProfile );
+    if ( aNewProfile->ImportFromFile( aFile ) )
+    {
+      aCreatedProfiles.Append( aNewProfile );
+      aNewProfile.Nullify();
+    }
   }
 
+  if ( !aNewProfile.IsNull() )
+    aNewProfile->Remove();
+
   // Close the file
   aFile.Close();
 
-  for ( int i = 1, n = aCreatedProfiles.Length(); i < n ; ++i )
+  for ( int i = 1, n = aCreatedProfiles.Length(); i <= n ; ++i )
   {
     Handle(HYDROData_Profile) aProfile = aCreatedProfiles.Value( i );
-    if ( aRes )
-    {
-      QString aProfileName = HYDROData_Tool::GenerateObjectName( theDoc, "Profile" );
-      aProfile->SetName( aProfileName );
 
-      aProfile->SetFilePath( theFileName );
-    }
-    else
-    {
-      aProfile->Remove();
-    }
+    QString aProfileName = HYDROData_Tool::GenerateObjectName( theDoc, "Profile" );
+    aProfile->SetName( aProfileName );
+
+    aProfile->SetFilePath( theFileName );
+
+    aProfile->SetBorderColor( HYDROData_Profile::DefaultBorderColor() );
   }
 
-  return aRes;
+  return !aCreatedProfiles.IsEmpty();
 }
 
 bool HYDROData_Profile::ImportFromFile( const TCollection_AsciiString& theFileName )
@@ -411,7 +453,12 @@ bool HYDROData_Profile::ImportFromFile( OSD_File& theFile )
 
     aLine.LeftAdjust(); aLine.RightAdjust();
     if ( aLine.IsEmpty() )
-      continue;
+    {
+      if ( !anIsParametric && !anIsGeoref )
+        continue; // Definition is not started yet
+
+      break; // Next profile started
+    }
 
     TCollection_AsciiString aValX = aLine.Token( " \t", 1 );
     TCollection_AsciiString aValY = aLine.Token( " \t", 2 );
@@ -475,6 +522,8 @@ bool HYDROData_Profile::ImportFromFile( OSD_File& theFile )
     {
       SetProfilePoints( aPointsXYZ );
     }
+
+    Update();
   }
 
   return aRes;