[Wsplgen-commits] r122 - trunk/src
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Sun Sep 14 19:16:36 CEST 2008
Author: mrchip
Date: 2008-09-14 19:16:34 +0200 (Sun, 14 Sep 2008)
New Revision: 122
Modified:
trunk/src/file.cpp
trunk/src/file.h
trunk/src/parameter.cpp
trunk/src/parameter.h
trunk/src/test_file.cpp
trunk/src/test_nodes.cpp
trunk/src/test_quadtree.cpp
trunk/src/test_tools.cpp
trunk/src/test_tri.cpp
trunk/src/test_xy.cpp
trunk/src/wsplgen.cpp
Log:
Der Parameter NOPROJWARN wurde eingefuehrt
Modified: trunk/src/file.cpp
===================================================================
--- trunk/src/file.cpp 2008-08-19 18:43:09 UTC (rev 121)
+++ trunk/src/file.cpp 2008-09-14 17:16:34 UTC (rev 122)
@@ -59,7 +59,7 @@
}
//---------------------------------------------------------------------
-bool LoadPRJ(std::string FileName, int DebugLevel)
+bool LoadPRJ(std::string FileName, bool NoProjWarn, int DebugLevel)
{
write_fortschritt("->Laden der Projektionsdatei gestartet\n", FileName.c_str());
@@ -98,7 +98,7 @@
}
else
{
- if (strncmp(PrjOut, PrjIn, sizeof(PrjOut)-1) != 0)
+ if (false == NoProjWarn && strncmp(PrjOut, PrjIn, sizeof(PrjOut)-1) != 0)
{
write_warning(3115, "Nicht alle Projektionen sind gleich\nDies kann zu merkwürdigen Ergebnissen führen\n");
}
@@ -116,7 +116,7 @@
}
//---------------------------------------------------------------------
-bool LoadDGM(std::string FileName, TNodeList *NodeList, TElementList *ElementList, TXYZList *BegrenzungsPolygon, int DebugLevel)
+bool LoadDGM(std::string FileName, TNodeList *NodeList, TElementList *ElementList, TXYZList *BegrenzungsPolygon, bool IsSetNoProjWarn, int DebugLevel)
{
write_fortschritt("->Laden des DGM in Datei '%s' gestartet\n", FileName.c_str());
@@ -151,7 +151,7 @@
}
else if (ToUpperCase(Ext) == ".SHP")
{
- LoadDGMSHP(FileName, NodeList, BegrenzungsPolygon, DebugLevel);
+ LoadDGMSHP(FileName, NodeList, BegrenzungsPolygon, IsSetNoProjWarn, DebugLevel);
CheckForDuplicates(NodeList, ElementList, DebugLevel);
}
else
@@ -735,11 +735,11 @@
}
//---------------------------------------------------------------------------
-bool LoadDGMSHP(std::string FileName, TNodeList *NodeList, TXYZList *XyList, int DebugLevel)
+bool LoadDGMSHP(std::string FileName, TNodeList *NodeList, TXYZList *XyList, bool NoProjWarn, int DebugLevel)
{
write_fortschritt("->Laden des DGM in Datei '%s' als SHP gestartet\n", FileName.c_str());
- LoadPRJ(FileName, DebugLevel);
+ LoadPRJ(FileName, NoProjWarn, DebugLevel);
std::string SHPFileName = ExchangeFileExt(FileName, ".shp");
SHPHandle hSHP = SHPOpen(SHPFileName.c_str(), "rb");
@@ -1123,11 +1123,11 @@
}
//---------------------------------------------------------------------
-bool LoadProfile(std::string FileName, TProfilList* ProfilList, TGewaesserAchseList* GewaesserAchseList, double VonKmD, double BisKmD, int DebugLevel)
+bool LoadProfile(std::string FileName, TProfilList* ProfilList, TGewaesserAchseList* GewaesserAchseList, double VonKmD, double BisKmD, bool NoProjWarn, int DebugLevel)
{
write_fortschritt("->Laden der Profilspuren gestartet\n");
- LoadPRJ(FileName, DebugLevel);
+ LoadPRJ(FileName, NoProjWarn, DebugLevel);
if (VonKmD > -9999 && BisKmD > -9999) write_fortschritt("Nur Profile von Station %.4f bis %.4f werden geladen\n", VonKmD, BisKmD);
else if (VonKmD > -9999) write_fortschritt("Nur Profile mit einer Station größer als %.4f werden geladen\n", VonKmD);
@@ -1611,11 +1611,11 @@
}
//---------------------------------------------------------------------
-bool LoadLinien(std::string FileName, TProfilList* SperrenList, TProfilList* GrabenList, TProfilList* Rohre1List, TProfilList* Rohre2List, int DebugLevel)
+bool LoadLinien(std::string FileName, TProfilList* SperrenList, TProfilList* GrabenList, TProfilList* Rohre1List, TProfilList* Rohre2List, bool NoProjWarn, int DebugLevel)
{
write_fortschritt("->Laden der Linien Strukturen (Sperren, Gräben und Rohre) gestartet\n");
- LoadPRJ(FileName, DebugLevel);
+ LoadPRJ(FileName, NoProjWarn, DebugLevel);
if (SperrenList == 0 || GrabenList == 0 || Rohre1List == 0)
{
@@ -2402,11 +2402,11 @@
}
//---------------------------------------------------------------------
-bool LoadAchse(std::string FileName, TGewaesserAchseList* GewaesserAchseList, int DebugLevel)
+bool LoadAchse(std::string FileName, TGewaesserAchseList* GewaesserAchseList, bool NoProjWarn, int DebugLevel)
{
write_fortschritt("->Laden der Gewässerachsen gestartet\n");
- LoadPRJ(FileName, DebugLevel);
+ LoadPRJ(FileName, NoProjWarn, DebugLevel);
if (GewaesserAchseList == 0)
{
@@ -2668,11 +2668,11 @@
}
//---------------------------------------------------------------------
-bool LoadGebiet(std::string FileName, TXYZList *XyList, int DebugLevel)
+bool LoadGebiet(std::string FileName, TXYZList *XyList, bool NoProjWarn, int DebugLevel)
{
write_fortschritt("->Laden der hydraulischen Grenze gestartet\n");
- LoadPRJ(FileName, DebugLevel);
+ LoadPRJ(FileName, NoProjWarn, DebugLevel);
if (XyList == 0)
{
Modified: trunk/src/file.h
===================================================================
--- trunk/src/file.h 2008-08-19 18:43:09 UTC (rev 121)
+++ trunk/src/file.h 2008-09-14 17:16:34 UTC (rev 122)
@@ -24,26 +24,26 @@
//----------------------------------------------------------------------------
bool LoadPar(std::string FileName, std::vector<std::string> *ParList);
-bool LoadPRJ(std::string FileName, int DebugLevel);
+bool LoadPRJ(std::string FileName, bool NoProjWarn, int DebugLevel);
-bool LoadDGM(std::string FileName, TNodeList *NodeList, TElementList *ElementList, TXYZList *XyList, int DebugLevel);
+bool LoadDGM(std::string FileName, TNodeList *NodeList, TElementList *ElementList, TXYZList *XyList, bool NoProjWarn, int DebugLevel);
bool LoadDGMTIN(std::string FileName, TNodeList *NodeList, TElementList *ElementList, TXYZList *XyList, int DebugLevel);
bool LoadDGMGRD(std::string FileName, TNodeList *NodeList, TXYZList *XyList, int DebugLevel);
bool LoadDGMXYZ(std::string FileName, TNodeList *NodeList, TXYZList *XyList, int DebugLevel);
-bool LoadDGMSHP(std::string FileName, TNodeList *NodeList, TXYZList *XyList, int DebugLevel);
+bool LoadDGMSHP(std::string FileName, TNodeList *NodeList, TXYZList *XyList, bool NoProjWarn, int DebugLevel);
bool LoadDGM2DM(std::string FileName, TNodeList *NodeList, TElementList *ElementList, TXYZList *XyList, int DebugLevel);
-bool LoadProfile(std::string FileName, TProfilList* ProfilList, TGewaesserAchseList* GewaesserAchseList, double VonKmD, double BisKmD, int DebugLevel);
-bool LoadLinien(std::string FileName, TProfilList* SperrenList, TProfilList* GrabenList, TProfilList* Rohre1List, TProfilList* Rohre2List, int DebugLevel);
+bool LoadProfile(std::string FileName, TProfilList* ProfilList, TGewaesserAchseList* GewaesserAchseList, double VonKmD, double BisKmD, bool NoProjWarn, int DebugLevel);
+bool LoadLinien(std::string FileName, TProfilList* SperrenList, TProfilList* GrabenList, TProfilList* Rohre1List, TProfilList* Rohre2List, bool NoProjWarn, int DebugLevel);
bool LoadWsp(std::string FileName, TProfilList* ProfilList, std::string Tag, int DebugLevel);
bool LoadWspTxt(std::string FileName, TProfilList* ProfilList, int DebugLevel);
bool LoadWspDBF(std::string FileName, TProfilList* ProfilList, int DebugLevel);
bool LoadWspWst(std::string FileName, TProfilList* ProfilList, std::string Tag, int DebugLevel);
-bool LoadAchse(std::string FileName, TGewaesserAchseList* GewaesserAchseList, int DebugLevel);
+bool LoadAchse(std::string FileName, TGewaesserAchseList* GewaesserAchseList, bool NoProjWarn, int DebugLevel);
-bool LoadGebiet(std::string FileName, TXYZList *XyList, int DebugLevel);
+bool LoadGebiet(std::string FileName, TXYZList *XyList, bool NoProjWarn, int DebugLevel);
bool SavePRJ(std::string FileName, int DebugLevel);
bool SaveNet(std::string FileName, TNodeList *NodeList, TElementList *ElementList, int DebugLevel);
Modified: trunk/src/parameter.cpp
===================================================================
--- trunk/src/parameter.cpp 2008-08-19 18:43:09 UTC (rev 121)
+++ trunk/src/parameter.cpp 2008-09-14 17:16:34 UTC (rev 122)
@@ -75,6 +75,8 @@
IsSetAusgabe = false;
FileNameAusgabe = "WSPLGEN.SHP";
+ IsSetNoProjWarn = false;
+
if (argc == 0 || argv == 0)
{
write_error(1201, "Es wurden keine Parameter übergeben.\nWenigstens die Parameter -DGM=<DGM-Datei>, -PRO=<Profil-Datei>, -ACHSE=<Achse-Datei> und -WSP=<Wasserstands-Datei>\nmüssen angegeben werden.\n");
@@ -328,7 +330,7 @@
if (FirstKommaPos >= Parameter.size())
{
write_warning(1108, "Es wurden nicht genug Argumente für den Parameter -DELTA übergeben.\nDas Format lautet korrekt -DELTA=<Von>,<Bis>,<Diff>.\n");
- continue;
+ continue;
}
unsigned int SecondKommaPos = Parameter.find(",", FirstKommaPos + 1);
@@ -604,6 +606,23 @@
write_fortschritt("Ausgabe-Datei: '%s'\n", FileNameAusgabe.c_str());
}
+ else if (Parameter.substr(0, 8) == "-SAVE2DM" || Parameter.substr(0, 8) == "-save2dm")
+ {
+ ///////////////////////////////////////////////
+ // NOPROJWARN
+ ///////////////////////////////////////////////
+ if (IsSetDebug) write_fortschritt("Parameter -NOPROJWARN erkannt.\n");
+
+ if (IsSetNoProjWarn)
+ {
+ write_warning(1106, "Der Parameter -NOPROJWARN wurde mehrfach angegeben.\n");
+ continue;
+ }
+
+ IsSetNoProjWarn = true;
+
+ write_fortschritt("Es werden keine Warnungen zu verschiedenen Projektionen ausgegeben\n");
+ }
else if (Parameter.substr(0, 1) == "$")
{
// Geheimer Parameter zum Umleiten der Ausgaben
Modified: trunk/src/parameter.h
===================================================================
--- trunk/src/parameter.h 2008-08-19 18:43:09 UTC (rev 121)
+++ trunk/src/parameter.h 2008-09-14 17:16:34 UTC (rev 122)
@@ -80,6 +80,8 @@
bool IsSetAusgabe;
std::string FileNameAusgabe;
+
+ bool IsSetNoProjWarn;
};
//---------------------------------------------------------------------------
Modified: trunk/src/test_file.cpp
===================================================================
--- trunk/src/test_file.cpp 2008-08-19 18:43:09 UTC (rev 121)
+++ trunk/src/test_file.cpp 2008-09-14 17:16:34 UTC (rev 122)
@@ -188,7 +188,7 @@
TProfilList *ProfilList = new TProfilList();
- LoadProfile(PROFILFILE, ProfilList, 0, -9999.9, 9999.9, 8);
+ LoadProfile(PROFILFILE, ProfilList, 0, -9999.9, 9999.9, false, 8);
if (ProfilList->size() != 8) printf("Failed\n");
else printf("Pass\n");
@@ -205,7 +205,7 @@
TProfilList *ProfilList = new TProfilList();
- LoadProfile(PROFILZFILE, ProfilList, 0, -9999.9, 9999.9, 8);
+ LoadProfile(PROFILZFILE, ProfilList, 0, -9999.9, 9999.9, false, 8);
if (ProfilList->size() != 5) printf("Failed\n");
else printf("Pass\n");
@@ -249,7 +249,7 @@
TProfilList *RohreList = new TProfilList();
TProfilList *GradientenList = new TProfilList();
- LoadLinien(LINIENFILE, SperrenList, GrabenList, RohreList, GradientenList, 8);
+ LoadLinien(LINIENFILE, SperrenList, GrabenList, RohreList, GradientenList, false, 8);
if (SperrenList->size() != 5) printf("Failed\n");
else if (GrabenList->size() != 4) printf("Failed\n");
@@ -271,7 +271,7 @@
TProfilList *RohreList = new TProfilList();
TProfilList *GradientenList = new TProfilList();
- LoadLinien(LINIENFILE3, SperrenList, GrabenList, RohreList, GradientenList, 8);
+ LoadLinien(LINIENFILE3, SperrenList, GrabenList, RohreList, GradientenList, false, 8);
int SperrenSumme = 0;
for (TProfilList::iterator i=SperrenList->begin(); i != SperrenList->end(); i++)
@@ -439,7 +439,7 @@
TGewaesserAchseList *AchsenList = new TGewaesserAchseList();
- LoadAchse(ACHSEFILE, AchsenList, 8);
+ LoadAchse(ACHSEFILE, AchsenList, false, 8);
TGewaesserAchse* Achse = *AchsenList->begin();
@@ -459,7 +459,7 @@
TXYZList *Gebiet = new TXYZList();
- LoadGebiet(GRENZEFILE, Gebiet, 8);
+ LoadGebiet(GRENZEFILE, Gebiet, false, 8);
if (Gebiet->size() != 14) printf("Failed\n");
else printf("Pass\n");
@@ -477,7 +477,7 @@
TNodeList *NodeList = new TNodeList();
TElementList *ElementList = new TElementList();
- LoadDGM(DGMTINFILE, NodeList, ElementList, 0, 8);
+ LoadDGM(DGMTINFILE, NodeList, ElementList, 0, false, 8);
if (NodeList->size() != 114) printf("Failed\n");
else if (ElementList->size() != 218) printf("Failed\n");
@@ -503,7 +503,7 @@
XyList->Add(new TXYZ(826648700, 262559500));
XyList->Add(new TXYZ(826648700, 246716800));
- LoadDGM(DGMTINFILE, NodeList, ElementList, XyList, 8);
+ LoadDGM(DGMTINFILE, NodeList, ElementList, XyList, false, 8);
if (NodeList->size() != 71) printf("Failed\n");
else if (ElementList->size() != 110) printf("Failed\n");
@@ -524,7 +524,7 @@
TNodeList *NodeList = new TNodeList();
TElementList *ElementList = new TElementList();
- LoadDGM(DGMTINFILE2, NodeList, ElementList, 0, 8);
+ LoadDGM(DGMTINFILE2, NodeList, ElementList, 0, false, 8);
if (NodeList->size() != 19) printf("Failed\n");
else if (ElementList->size() != 28) printf("Failed\n");
@@ -573,7 +573,7 @@
XyList->Add(new TXYZ(826648700, 262559500));
XyList->Add(new TXYZ(826648700, 246716800));
- LoadDGM(DGMGRDFILE, NodeList, ElementList, XyList, 8);
+ LoadDGM(DGMGRDFILE, NodeList, ElementList, XyList, false, 8);
if (NodeList->size() != 24624) printf("Failed\n");
else printf("Pass\n");
@@ -593,7 +593,7 @@
TNodeList *NodeList = new TNodeList();
TElementList *ElementList = new TElementList();
- LoadDGM(DGMXYZFILE, NodeList, ElementList, 0, 8);
+ LoadDGM(DGMXYZFILE, NodeList, ElementList, 0, false, 8);
if (NodeList->size() != 10) printf("Failed\n");
else printf("Pass\n");
@@ -612,7 +612,7 @@
TNodeList *NodeList = new TNodeList();
TElementList *ElementList = new TElementList();
- LoadDGM(DGMXYZFILE2, NodeList, ElementList, 0, 8);
+ LoadDGM(DGMXYZFILE2, NodeList, ElementList, 0, false, 8);
if (NodeList->size() != 1126) printf("Failed\n");
else printf("Pass\n");
@@ -631,7 +631,7 @@
TNodeList *NodeList = new TNodeList();
TElementList *ElementList = new TElementList();
- LoadDGM(DGMXYZFILE3, NodeList, ElementList, 0, 8);
+ LoadDGM(DGMXYZFILE3, NodeList, ElementList, 0, false, 8);
if (NodeList->size() != 43332) printf("Failed\n");
else printf("Pass\n");
@@ -650,7 +650,7 @@
TNodeList *NodeList = new TNodeList();
TElementList *ElementList = new TElementList();
- LoadDGM(DGMXYZFILE4, NodeList, ElementList, 0, 8);
+ LoadDGM(DGMXYZFILE4, NodeList, ElementList, 0, false, 8);
if (NodeList->size() != 98636) printf("Failed\n");
else printf("Pass\n");
@@ -669,7 +669,7 @@
TNodeList *NodeList = new TNodeList();
TElementList *ElementList = new TElementList();
- LoadDGM(DGMSHPFILE, NodeList, ElementList, 0, 8);
+ LoadDGM(DGMSHPFILE, NodeList, ElementList, 0, false, 8);
if (NodeList->size() != 114) printf("Failed\n");
else printf("Pass\n");
@@ -713,7 +713,7 @@
XyList->Add(new TXYZ(349516400, 587493600));
XyList->Add(new TXYZ(349516400, 587483400));
- LoadDGM(DGMSHPFILE2, NodeList, ElementList, XyList, 8);
+ LoadDGM(DGMSHPFILE2, NodeList, ElementList, XyList, false, 8);
if (NodeList->size() != 28287) printf("Failed\n");
else printf("Pass\n");
@@ -733,7 +733,7 @@
TNodeList *NodeList = new TNodeList();
TElementList *ElementList = new TElementList();
- LoadDGM(DGM2DMFILE, NodeList, ElementList, 0, 8);
+ LoadDGM(DGM2DMFILE, NodeList, ElementList, 0, false, 8);
if (NodeList->size() != 1126) printf("Failed\n");
else if (ElementList->size() != 2225) printf("Failed\n");
Modified: trunk/src/test_nodes.cpp
===================================================================
--- trunk/src/test_nodes.cpp 2008-08-19 18:43:09 UTC (rev 121)
+++ trunk/src/test_nodes.cpp 2008-09-14 17:16:34 UTC (rev 122)
@@ -174,7 +174,7 @@
TNodeList *NodeList = new TNodeList();
TElementList *ElementList = new TElementList();
- LoadDGM(DGMSHPFILE, NodeList, ElementList, 0, 8);
+ LoadDGM(DGMSHPFILE, NodeList, ElementList, 0, false, 8);
NodeList->SortByXY();
Modified: trunk/src/test_quadtree.cpp
===================================================================
--- trunk/src/test_quadtree.cpp 2008-08-19 18:43:09 UTC (rev 121)
+++ trunk/src/test_quadtree.cpp 2008-09-14 17:16:34 UTC (rev 122)
@@ -264,7 +264,7 @@
TNodeList *NodeList = new TNodeList();
TElementList *ElementList = new TElementList();
- LoadDGM(DGMFILE, NodeList, ElementList, 0, 1);
+ LoadDGM(DGMFILE, NodeList, ElementList, 0, false, 1);
TQuadTree<TNodeList, TNode> *QuadTree = new TQuadTree<TNodeList, TNode>();
Modified: trunk/src/test_tools.cpp
===================================================================
--- trunk/src/test_tools.cpp 2008-08-19 18:43:09 UTC (rev 121)
+++ trunk/src/test_tools.cpp 2008-09-14 17:16:34 UTC (rev 122)
@@ -58,13 +58,13 @@
TNodeList *NodeList = new TNodeList();
TNodeList *NassNodeList = new TNodeList();
TElementList *ElementList = new TElementList();
- LoadDGM(DGM2DMFILE, NodeList, ElementList, 0, 8);
+ LoadDGM(DGM2DMFILE, NodeList, ElementList, 0, false, 8);
TProfilList *ProfilList = new TProfilList();
- LoadProfile(PROFILFILE, ProfilList, 0, -9999.9, 9999.9, 8);
+ LoadProfile(PROFILFILE, ProfilList, 0, -9999.9, 9999.9, false, 8);
TGewaesserAchseList *AchsenList = new TGewaesserAchseList();
- LoadAchse(ACHSEFILE, AchsenList, 8);
+ LoadAchse(ACHSEFILE, AchsenList, false, 8);
TProfilList *WspList = new TProfilList();
LoadWsp(WSPFILE, WspList, "", 8);
@@ -77,7 +77,7 @@
TProfilList *GrabenList = new TProfilList();
TProfilList *RohreList = new TProfilList();
TProfilList *GradientenList = new TProfilList();
- LoadLinien(LINIENFILE, SperrenList, GrabenList, RohreList, GradientenList, 8);
+ LoadLinien(LINIENFILE, SperrenList, GrabenList, RohreList, GradientenList, false, 8);
TEdgeList* EdgeList = new TEdgeList;
BuildEdgeList(NodeList, ElementList, EdgeList, 8);
@@ -378,7 +378,7 @@
TElementList *ElementList = new TElementList();
TEdgeList* EdgeList = new TEdgeList;
- LoadDGM(DGMXYZFILE, NodeList, ElementList, 0, 8);
+ LoadDGM(DGMXYZFILE, NodeList, ElementList, 0, false, 8);
Triangulate(NodeList, ElementList, 0, 8);
Modified: trunk/src/test_tri.cpp
===================================================================
--- trunk/src/test_tri.cpp 2008-08-19 18:43:09 UTC (rev 121)
+++ trunk/src/test_tri.cpp 2008-09-14 17:16:34 UTC (rev 122)
@@ -82,7 +82,7 @@
TNodeList *NodeList = new TNodeList();
TElementList *ElementList = new TElementList();
- LoadDGM(DGMFILE3, NodeList, ElementList, 0, 1);
+ LoadDGM(DGMFILE3, NodeList, ElementList, 0, false, 1);
Triangulate(NodeList, ElementList, 0, 8);
@@ -143,7 +143,7 @@
TNodeList *NodeList = new TNodeList();
TElementList *ElementList = new TElementList();
- LoadDGM(DGMFILE1, NodeList, ElementList, 0, 1);
+ LoadDGM(DGMFILE1, NodeList, ElementList, 0, false, 1);
Triangulate(NodeList, ElementList, 0, 8);
@@ -161,7 +161,7 @@
TNodeList *NodeList = new TNodeList();
TElementList *ElementList = new TElementList();
- LoadDGM(DGMFILE4, NodeList, ElementList, 0, 1);
+ LoadDGM(DGMFILE4, NodeList, ElementList, 0, false, 1);
Triangulate(NodeList, ElementList, 0, 8);
@@ -179,7 +179,7 @@
TNodeList *NodeList = new TNodeList();
TElementList *ElementList = new TElementList();
- LoadDGM(DGMFILE5, NodeList, ElementList, 0, 1);
+ LoadDGM(DGMFILE5, NodeList, ElementList, 0, false, 1);
Triangulate(NodeList, ElementList, 0, 8);
@@ -197,7 +197,7 @@
TNodeList *NodeList = new TNodeList();
TElementList *ElementList = new TElementList();
- LoadDGM(DGMFILE2, NodeList, ElementList, 0, 1);
+ LoadDGM(DGMFILE2, NodeList, ElementList, 0, false, 1);
Triangulate(NodeList, ElementList, 0, 8);
@@ -215,7 +215,7 @@
TNodeList *NodeList = new TNodeList();
TElementList *ElementList = new TElementList();
- LoadDGM(DGMFILE6, NodeList, ElementList, 0, 1);
+ LoadDGM(DGMFILE6, NodeList, ElementList, 0, false, 1);
Triangulate(NodeList, ElementList, 0, 8);
Modified: trunk/src/test_xy.cpp
===================================================================
--- trunk/src/test_xy.cpp 2008-08-19 18:43:09 UTC (rev 121)
+++ trunk/src/test_xy.cpp 2008-09-14 17:16:34 UTC (rev 122)
@@ -414,8 +414,8 @@
TProfilList* Profile = new TProfilList();
TXYZList *Gebiet = new TXYZList();
- LoadGebiet(POLYGONFILE, Gebiet, 8);
- LoadProfile(PROFILFILE, Profile, 0, -9999.9, 9999.9, 8);
+ LoadGebiet(POLYGONFILE, Gebiet, false, 8);
+ LoadProfile(PROFILFILE, Profile, 0, -9999.9, 9999.9, false, 8);
TProfil* CutProfil = *Profile->begin();
Modified: trunk/src/wsplgen.cpp
===================================================================
--- trunk/src/wsplgen.cpp 2008-08-19 18:43:09 UTC (rev 121)
+++ trunk/src/wsplgen.cpp 2008-09-14 17:16:34 UTC (rev 122)
@@ -118,13 +118,13 @@
// Jetzt die Gewässerachse einlesen, wenn es notwendig ist
if (Parameter.IsSetAchse)
{
- LoadAchse(Parameter.FileNameAchse, GewaesserAchseList, Parameter.DebugLevel);
+ LoadAchse(Parameter.FileNameAchse, GewaesserAchseList, Parameter.IsSetNoProjWarn, Parameter.DebugLevel);
}
// Jetzt die Profile einlesen
// Dabei wird die Stationierung von km in cm umgerechnet
// [km] in float nach [cm] in int
- LoadProfile(Parameter.FileNamePro, ProfilList, GewaesserAchseList, Parameter.VonKm, Parameter.BisKm, Parameter.DebugLevel);
+ LoadProfile(Parameter.FileNamePro, ProfilList, GewaesserAchseList, Parameter.VonKm, Parameter.BisKm, Parameter.IsSetNoProjWarn, Parameter.DebugLevel);
if (ProfilList->size() < 2)
{
@@ -154,7 +154,7 @@
{
std::string FileNameLin = *i;
- LoadLinien(FileNameLin, SperrenList, GrabenList, Rohre1List, Rohre2List, Parameter.DebugLevel);
+ LoadLinien(FileNameLin, SperrenList, GrabenList, Rohre1List, Rohre2List, Parameter.IsSetNoProjWarn, Parameter.DebugLevel);
}
}
@@ -162,7 +162,7 @@
if (Parameter.IsSetGebiet)
{
TXYZList* Tmp1BegrenzungsPolygon = new TXYZList();
- LoadGebiet(Parameter.FileNameGebiet, Tmp1BegrenzungsPolygon, Parameter.DebugLevel);
+ LoadGebiet(Parameter.FileNameGebiet, Tmp1BegrenzungsPolygon, Parameter.IsSetNoProjWarn, Parameter.DebugLevel);
TXYZList* ProfilPolygon = new TXYZList();
BuildPolygon(ProfilList, ProfilPolygon, Parameter.DebugLevel);
@@ -192,7 +192,7 @@
if (Parameter.DebugLevel > 2) SavePolygon(PolygonFileName, BegrenzungsPolygon, Parameter.DebugLevel);
}
- LoadDGM(Parameter.FileNameDgm, NodeList, ElementList, BegrenzungsPolygon, Parameter.DebugLevel);
+ LoadDGM(Parameter.FileNameDgm, NodeList, ElementList, BegrenzungsPolygon, Parameter.IsSetNoProjWarn, Parameter.DebugLevel);
// Wenn die Elementliste noch leer ist, müssen die Knoten noch trianguliert werden.
if (ElementList->size() == 0)
More information about the Wsplgen-commits
mailing list