#include <BRepCheck_Shell.hxx>
#include <BRepCheck_ListOfStatus.hxx>
#include <TopTools_SequenceOfShape.hxx>
-#include <Handle_Geom_Curve.hxx>
-#include <Handle_Geom_Line.hxx>
-#include <Handle_Geom_TrimmedCurve.hxx>
+#include <Geom_Curve.hxx>
+#include <Geom_Line.hxx>
+#include <Geom_TrimmedCurve.hxx>
#include <Geom_TrimmedCurve.hxx>
#include <TopTools_DataMapOfShapeListOfShape.hxx>
#include <NCollection_DoubleMap.hxx>
+#include <stdexcept>
#include <QFile>
#include <QString>
#include <QTextStream>
#include <QFileInfo>
+#define _DEVDEBUG_
+#include "HYDRO_trace.hxx"
+
const char TELEMAC_FORMAT = 'f';
const int TELEMAC_PRECISION = 3;
-IMPLEMENT_STANDARD_HANDLE(HYDROData_LandCoverMap, HYDROData_Entity)
IMPLEMENT_STANDARD_RTTIEXT(HYDROData_LandCoverMap, HYDROData_Entity)
/**
TopTools_IndexedDataMapOfShapeListOfShape* theShHistory,
double theTolerance)
{
+ //DEBTRACE("MergeFaces");
int anError;
TopTools_ListIteratorOfListOfShape anIt;
BOPCol_ListOfShape aLC;
aShapesList.Append( anIt.Face() );
aShapesList.Append( theNewShape );
+ //DEBTRACE("theNewType " << theNewType);
if( aShapesList.Size()==1 && theNewShape.ShapeType()==TopAbs_FACE )
{
aNewFaces.Add( TopoDS::Face( theNewShape ), theNewType );
for( ; aMIt.More(); aMIt.Next() )
{
//std::cout << " " << aMIt.Value() << std::endl;
+ //DEBTRACE(aMIt.Value());
int aKey = (int)(uintptr_t)aMIt.Value().TShape().operator->();
aShapesFromNewFace.Add( aKey );
}
for( ; anIt.More(); anIt.Next() )
{
QString aSType = anIt.StricklerType();
+ //DEBTRACE(anIt.StricklerType() << " " << anIt.Face());
//std::cout << "from " << anIt.Face() << ": " << anIt.StricklerType() << std::endl;
TopTools_ListOfShape aModified = aBuilder.Modified( anIt.Face() );
//
if( aModified.Extent() == 0 )
aModified.Append( anIt.Face() );
+ //DEBTRACE(anIt.StricklerType() << " " << anIt.Face());
TopTools_ListIteratorOfListOfShape aMIt( aModified );
for( ; aMIt.More(); aMIt.Next() )
if( isFace && !isAlsoFromNew )
aNewFaces.Add( TopoDS::Face( aShape ), aSType );
}
+ //DEBTRACE(anIt.StricklerType() << " " << anIt.Face());
}
-
// c. add the new shape if it is face with its type
if( theNewShape.ShapeType()==TopAbs_FACE )
aNewFaces.Add( TopoDS::Face( theNewShape ), theNewType );
+ //DEBTRACE(theNewShape << " " << theNewType);
// convert map of shape to type to compound and list of types
StoreLandCovers( aNewFaces );
+
+// anIt.Init( *this );
+// for( ; anIt.More(); anIt.Next() )
+// {
+// DEBTRACE(anIt.StricklerType() << " " << anIt.Face());
+// }
return true;
}
{
TopTools_ListOfShape aListOfFaces;
+ //DEBTRACE("theMap.Extent() " << theMap.Extent());
for( int i = 1; i <= theMap.Extent(); i++ )
{
TopoDS_Face aFace = theMap.FindKey(i);
}
TopTools_IndexedDataMapOfShapeListOfShape ShHistory;
+ ShHistory.Clear();
TopoDS_Shape aResult;
if( aListOfFaces.Extent() == 1 )
for( int i = 1; i <= theMap.Extent(); i++ )
{
TopoDS_Face aFF = theMap.FindKey(i);
+ //DEBTRACE(" --- " << aFF);
if( aFF.IsNull() )
continue;
- TopTools_ListOfShape aLS = ShHistory.FindFromKey(aFF);
+ //DEBTRACE(ShHistory.IsEmpty());
+ //DEBTRACE(aFF.Checked());
+ TopTools_ListOfShape aLS;
+ try
+ {
+ aLS = ShHistory.FindFromKey(aFF); //TODO: bug to fix. Observed on an incomplete split of a face
+ }
+ catch (...)
+ {
+ DEBTRACE("TODO: bug to fix. Observed on an incomplete split of a face");
+ //continue; // No, keep aLS empty and propagate the type of the original face
+ }
if (aLS.IsEmpty())
{
+ //DEBTRACE("--- aLS.IsEmpty()");
QString aSType = theMap.FindFromKey(aFF);
+ //DEBTRACE(" --- " << aSType.toStdString());
if (ShF2FHistory.Contains(aFF))
- aChF2ST.Add(ShF2FHistory.FindFromKey(aFF), aSType);
+ {
+ //DEBTRACE("ShF2FHistory.FindFromKey(aFF) " << ShF2FHistory.FindFromKey(aFF));
+ aChF2ST.Add(ShF2FHistory.FindFromKey(aFF), aSType);
+ }
else
- aChF2ST.Add(aFF, aSType);
+ {
+ //DEBTRACE("aFF " << aFF);
+ aChF2ST.Add(aFF, aSType);
+ }
}
else
{
+ //DEBTRACE("--- !aLS.IsEmpty()");
TopTools_ListIteratorOfListOfShape anIt(aLS);
for (; anIt.More(); anIt.Next())
{
QString aSType = theMap.FindFromKey(aFF);
+ //DEBTRACE(" --- " << aSType.toStdString());
const TopoDS_Face& aMF = TopoDS::Face(anIt.Value());
- if (ShF2FHistory.Contains(aFF))
- aChF2ST.Add(ShF2FHistory.FindFromKey(aFF), aSType);
+ //if (ShF2FHistory.Contains(aFF))
+ if (ShF2FHistory.Contains(aMF))
+ {
+ //DEBTRACE("ShF2FHistory.FindFromKey(aMF) " << ShF2FHistory.FindFromKey(aFF));
+ aChF2ST.Add(ShF2FHistory.FindFromKey(aMF), aSType);
+ }
else
- aChF2ST.Add(aFF, aSType);
+ {
+ //DEBTRACE("aMF " << aMF);
+ aChF2ST.Add(aMF, aSType);
+ }
}
}
}
QString aST = "";
if (aChF2ST.Contains(aFace))
aST = aChF2ST.FindFromKey(aFace);
+ //DEBTRACE("aFace " << aFace << " aST " << aST.toStdString());
aSTypes << aST;
}
int k = 0;
foreach (QString aST, aSTypes)
{
+ //DEBTRACE("aST " << aST.toStdString());
aTypes->SetValue( k, HYDROData_Tool::toExtString( aST ) );
k++;
}
void HYDROData_LandCoverMap::RemoveInternal(TopoDS_Shape& ShToRebuild, NCollection_IndexedDataMap<TopoDS_Face, TopoDS_Face>* aF2FReplace)
{
+ //DEBTRACE("RemoveInternal");
//Shape must be topologically correct
TopExp_Explorer anExpF(ShToRebuild, TopAbs_FACE);
//
//
if (!anEdgesToRemove.IsEmpty())
{
- Handle_ShapeBuild_ReShape aReshape = new ShapeBuild_ReShape();
+ Handle(ShapeBuild_ReShape) aReshape = new ShapeBuild_ReShape();
TopoDS_Shape OutF = aReshape->Apply(CurFace);
TopTools_ListIteratorOfListOfShape aIt(anEdgesToRemove);
for (; aIt.More(); aIt.Next())
}
}
//
- Handle_ShapeBuild_ReShape anExtReshape = new ShapeBuild_ReShape();
+ Handle(ShapeBuild_ReShape) anExtReshape = new ShapeBuild_ReShape();
for (int i = 1; i <= aF2FReplace->Extent(); i++)
{
TopoDS_Face aFK = aF2FReplace->FindKey(i);
anExtReshape->Replace(aFK, aFV);
ShToRebuild = anExtReshape->Apply(ShToRebuild);
}
+// for (int i = 1; i <= aF2FReplace->Extent(); i++)
+// {
+// DEBTRACE("aF2FReplace key,value " << aF2FReplace->FindKey(i) << " " << aF2FReplace->FindFromIndex(i));
+// }
}
QStringList aPolyList;
TopTools_SequenceOfShape aFaces;
int aSHapeType = -1;
- int Stat = anImporter.ImportPolygons(theSHPFileName, aPolyList, aFaces, aSHapeType);
+ int Stat = anImporter.ImportPolygons(HYDROData_Document::Document(1), theSHPFileName, aPolyList, aFaces, aSHapeType);
//
if (Stat != 1)
return false;
{
HYDROData_ShapeFile anExporter;
QStringList aList;
- anExporter.Export(theSHPFileName, this, aList, bUseDiscr, theDefl );
+ anExporter.Export(HYDROData_Document::Document(1), theSHPFileName, this, aList, bUseDiscr, theDefl );
if (aList.empty())
return true;
else
{
TopoDS_Edge E = TopoDS::Edge(anEdgeEx.Current());
double aFP, aLP;
- Handle_Geom_Curve aCur = BRep_Tool::Curve(E, aFP, aLP);
+ Handle(Geom_Curve) aCur = BRep_Tool::Curve(E, aFP, aLP);
Handle(Geom_Line) aLine = Handle(Geom_Line)::DownCast(aCur);
if (aLine.IsNull())
{
