+// Copyright (C) 2014-2015 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
+//
#include "HYDROData_ShapesGroup.h"
-
#include "HYDROData_ShapesTool.h"
+#include <BRepBuilderAPI_MakeShape.hxx>
#include <TDF_ChildIDIterator.hxx>
+#include <TNaming_Builder.hxx>
+#include <TNaming_NamedShape.hxx>
#include <TopoDS.hxx>
#include <TopoDS_Edge.hxx>
#include <TopTools_ListOfShape.hxx>
#include <TopTools_ListIteratorOfListOfShape.hxx>
-
-#include <TNaming_Builder.hxx>
-#include <TNaming_NamedShape.hxx>
-
-#include <BRepBuilderAPI_MakeShape.hxx>
-
#include <ShapeUpgrade_UnifySameDomain.hxx>
+#include <BRepTools_ReShape.hxx>
IMPLEMENT_STANDARD_HANDLE(HYDROData_ShapesGroup,HYDROData_Entity)
IMPLEMENT_STANDARD_RTTIEXT(HYDROData_ShapesGroup,HYDROData_Entity)
for ( int i = 1; i <= aGroupDef.Shapes.Length(); ++i )
{
TopoDS_Shape aShape = aGroupDef.Shapes.Value( i );
- /*
- if ( theAlgo->IsDeleted( aShape ) )
+
+ const TopTools_ListOfShape& aModifiedByAlgo = theAlgo->Modified( aShape );
+ if ( !aModifiedByAlgo.IsEmpty() )
{
+ HYDROData_ShapesTool::AddShapes( aShapesToAdd, aModifiedByAlgo );
aGroupDef.Shapes.Remove( i );
--i;
}
- else
- {*/
- const TopTools_ListOfShape& aModifiedByAlgo = theAlgo->Modified( aShape );
- if ( !aModifiedByAlgo.IsEmpty() )
+ else
+ {
+ const TopTools_ListOfShape& aGeneratedByAlgo = theAlgo->Generated( aShape );
+ if ( !aGeneratedByAlgo.IsEmpty() )
{
- HYDROData_ShapesTool::AddShapes( aShapesToAdd, aModifiedByAlgo );
+ HYDROData_ShapesTool::AddShapes( aShapesToAdd, aGeneratedByAlgo );
aGroupDef.Shapes.Remove( i );
--i;
}
- else
- {
- const TopTools_ListOfShape& aGeneratedByAlgo = theAlgo->Generated( aShape );
- if ( !aGeneratedByAlgo.IsEmpty() )
- {
- HYDROData_ShapesTool::AddShapes( aShapesToAdd, aGeneratedByAlgo );
- aGroupDef.Shapes.Remove( i );
- --i;
- }
- }
- //}
+ }
}
HYDROData_ShapesTool::AddShapes( aGroupDef.Shapes, aShapesToAdd );
TopoDS_Shape aShape = aGroupDef.Shapes.Value( i );
TopoDS_Shape aGeneratedByAlgo = theAlgo->Generated( aShape );
- if ( aGeneratedByAlgo.IsNull() || aShape.IsEqual( aGeneratedByAlgo ) )
- continue;
+ if ( aGeneratedByAlgo.IsNull() )
+ {
+ // Edge has been removed
+ aGroupDef.Shapes.Remove( i );
+ --i;
+ }
+ else if ( !aShape.IsEqual( aGeneratedByAlgo ) )
+ {
+ // Edge has been modified
+ aShapesToAdd.Append( aGeneratedByAlgo );
+ aGroupDef.Shapes.Remove( i );
+ --i;
+ }
+ }
+
+ HYDROData_ShapesTool::AddShapes( aGroupDef.Shapes, aShapesToAdd );
+ }
+}
+
+void HYDROData_ShapesGroup::GroupDefinition::Update( SeqOfGroupsDefs* theGroupsDefs,
+ BRepTools_ReShape* theAlgo )
+{
+ if ( !theGroupsDefs || !theAlgo )
+ return;
+
+ SeqOfGroupsDefs::Iterator anIter( *theGroupsDefs );
+ for ( ; anIter.More(); anIter.Next() )
+ {
+ GroupDefinition& aGroupDef = anIter.ChangeValue();
+ if ( aGroupDef.Shapes.IsEmpty() )
+ continue;
- aShapesToAdd.Append( aGeneratedByAlgo );
- aGroupDef.Shapes.Remove( i );
- --i;
+ TopTools_ListOfShape aShapesToAdd;
+ for ( int i = 1; i <= aGroupDef.Shapes.Length(); ++i )
+ {
+ TopoDS_Shape aShape = aGroupDef.Shapes.Value( i );
+
+ TopoDS_Shape aGeneratedByAlgo = theAlgo->Value( aShape );
+ if ( aGeneratedByAlgo.IsNull() )
+ {
+ // Edge has been removed
+ aGroupDef.Shapes.Remove( i );
+ --i;
+ }
+ else if ( !aShape.IsEqual( aGeneratedByAlgo ) )
+ {
+ // Edge has been modified
+ aShapesToAdd.Append( aGeneratedByAlgo );
+ aGroupDef.Shapes.Remove( i );
+ --i;
+ }
}
HYDROData_ShapesTool::AddShapes( aGroupDef.Shapes, aShapesToAdd );
}
}
+void HYDROData_ShapesGroup::GroupDefinition::Dump( std::ostream& theStream ) const
+{
+ theStream << "Name: " << Name.ToCString() << "\n";
+ HYDROData_ShapesTool::DumpSequenceOfShapes( theStream, Shapes );
+}
+
+void HYDROData_ShapesGroup::GroupDefinition::Dump( std::ostream& theStream,
+ const SeqOfGroupsDefs& theGroups )
+{
+ SeqOfGroupsDefs::Iterator anIter( theGroups );
+ for ( ; anIter.More(); anIter.Next() )
+ {
+ const GroupDefinition& aGroupDef = anIter.Value();
+ aGroupDef.Dump( theStream );
+ }
+}
+
+
+
HYDROData_ShapesGroup::HYDROData_ShapesGroup()
-: HYDROData_Entity()
+: HYDROData_Entity( Geom_Groups )
{
}