29.01.2014. Workaround eliminating.

diff --git a/src/HYDROData/HYDROData_SplitToZonesTool.cxx b/src/HYDROData/HYDROData_SplitToZonesTool.cxx
index 2205bc0b67536a87c43b1e1af4f84bdadd8ca15f..b3cdc22e70a9534b2d92aaf8e2de77d84213a328 100644 (file)
--- a/src/HYDROData/HYDROData_SplitToZonesTool.cxx
+++ b/src/HYDROData/HYDROData_SplitToZonesTool.cxx
@@ -399,12 +399,12 @@ HYDROData_SplitToZonesTool::SplitDataList
                 for(;expt.More();expt.Next()) {
                   const TopoDS_Shape& anEdge = expt.Current();
                   if(!anEdge.IsNull()) {
-             const TopTools_ListOfShape& aListOfNewEd = mkCom.Modified(anEdge);
-                        const TopTools_ListOfShape& aListOfGenEd = mkCom.Generated(anEdge);
+             const TopTools_ListOfShape& aListOfNewEd = mkCom.Modified(anEdge);                         
              if(!aListOfNewEd.IsEmpty())
                   aDM4.Bind(anEdge, aListOfNewEd);
                         else {
                           if(!mkCom.IsDeleted(anEdge)) {
+                 const TopTools_ListOfShape& aListOfGenEd = mkCom.Generated(anEdge);
                                 if(!aListOfGenEd.IsEmpty()) {
                                   aDM4.Bind(anEdge, aListOfGenEd);
                                 } else {

diff --git a/src/HYDROData/HYDROData_Tool.cxx b/src/HYDROData/HYDROData_Tool.cxx
index b058b8f31a0d59fbbb774232662c0c4061fafdbd..8867c8eafe999e2d99c20929d0a7eb6cd5400b2f 100644 (file)
--- a/src/HYDROData/HYDROData_Tool.cxx
+++ b/src/HYDROData/HYDROData_Tool.cxx
@@ -6,34 +6,19 @@
 #include "HYDROData_Iterator.h"
 #include "HYDROData_NaturalObject.h"
 
-#include <TopTools_SequenceOfShape.hxx>
-#include <TopExp_Explorer.hxx>
-
 #include <QFile>
 #include <QStringList>
 #include <QTextStream>
 
 #include <limits>
 #include <gp_Pnt.hxx>
-#include <gp_Vec.hxx>
 #include <gp_Pln.hxx>
-#include <TopExp.hxx>
-#include <Geom_Plane.hxx>
-#include <BRep_Tool.hxx>
-#include <BRepBuilderAPI_FindPlane.hxx>
-#include <TopoDS.hxx>
-#include <TopoDS_Vertex.hxx>
-#include <TopoDS_Wire.hxx>
-#include <TopoDS_Face.hxx>
-#include <TopoDS_Iterator.hxx>
-#include <TopTools_MapOfShape.hxx>
-#include <TColgp_SequenceOfVec.hxx>
-#include <TopTools_ShapeMapHasher.hxx>
 #include <ElSLib.hxx>
+#include <TopAbs_State.hxx>
 #include <BRepAdaptor_Surface.hxx>
 #include <BRepTopAdaptor_FClass2d.hxx>
 #include <BRep_Tool.hxx>
-#include <TopAbs_State.hxx>
+
 static int aMaxNameId = std::numeric_limits<int>::max();
 
 void HYDROData_Tool::WriteStringsToFile( QFile&             theFile,