diff --git a/FileIO/XmlIO/XMLInterface.cpp b/FileIO/XmlIO/XMLInterface.cpp index 7b2200bbbdaa8c24c3a423ab37070af3a9c8db46..467cd801ffbb6ec9d2a1e1fcba228d903aadd24d 100644 --- a/FileIO/XmlIO/XMLInterface.cpp +++ b/FileIO/XmlIO/XMLInterface.cpp @@ -29,8 +29,8 @@ namespace FileIO { -XMLInterface::XMLInterface(ProjectData* project, const std::string &schemaFile) : - _project(project), _exportName(""), _schemaName(schemaFile) +XMLInterface::XMLInterface(const std::string &schemaFile) : + _exportName(""), _schemaName(schemaFile) { } diff --git a/FileIO/XmlIO/XMLInterface.h b/FileIO/XmlIO/XMLInterface.h index 2c673adda43ae07f1408567f3e7cf89873c6ba80..e621a460a48bfefbd9f565d95e8fd0e2d11d78dc 100644 --- a/FileIO/XmlIO/XMLInterface.h +++ b/FileIO/XmlIO/XMLInterface.h @@ -37,10 +37,9 @@ class XMLInterface : public Writer public: /** * Constructor - * \param project Project data. * \param schemaFile An XML schema file (*.xsd) that defines the structure of a valid data file. */ - XMLInterface(ProjectData* project, const std::string &schemaFile); + XMLInterface(const std::string &schemaFile); virtual ~XMLInterface() {} @@ -70,8 +69,6 @@ protected: /// Checks if the given file is conform to the given hash. bool hashIsGood(const QString &fileName, const QByteArray &hash) const; - ProjectData* _project; - std::string _exportName; std::string _schemaName; std::map<std::size_t, std::size_t> _idx_map; diff --git a/FileIO/XmlIO/XmlCndInterface.cpp b/FileIO/XmlIO/XmlCndInterface.cpp index a6d4579b79e272ebc5cc0ac72c6a311fce3e2017..6eaf315dfc030e67099fbc3ee81583bf4f37091f 100644 --- a/FileIO/XmlIO/XmlCndInterface.cpp +++ b/FileIO/XmlIO/XmlCndInterface.cpp @@ -23,7 +23,7 @@ namespace FileIO { XmlCndInterface::XmlCndInterface(ProjectData* project, const std::string &schemaFile) - : XMLInterface(project, schemaFile), _type(FEMCondition::UNSPECIFIED) + : XMLInterface(schemaFile), _type(FEMCondition::UNSPECIFIED), _project(project) { } diff --git a/FileIO/XmlIO/XmlCndInterface.h b/FileIO/XmlIO/XmlCndInterface.h index 4ff06c5906d4dc28258c478c4fee44a9593c5c73..de5a7e1e76a90a73deb4a289d3a1187e48bef3b8 100644 --- a/FileIO/XmlIO/XmlCndInterface.h +++ b/FileIO/XmlIO/XmlCndInterface.h @@ -67,6 +67,8 @@ private: const QString &condText, const QString &geoName) const; FEMCondition::CondType _type; + + ProjectData* _project; }; } diff --git a/FileIO/XmlIO/XmlGmlInterface.cpp b/FileIO/XmlIO/XmlGmlInterface.cpp index 8572333f6eb2b81ddc864675e956b8f868a3fa2f..809c5681462dd6acf0374e972d323228c720650e 100644 --- a/FileIO/XmlIO/XmlGmlInterface.cpp +++ b/FileIO/XmlIO/XmlGmlInterface.cpp @@ -24,7 +24,7 @@ namespace FileIO { XmlGmlInterface::XmlGmlInterface(ProjectData* project, const std::string &schemaFile) : - XMLInterface(project, schemaFile) + XMLInterface(schemaFile), _project(project) { } diff --git a/FileIO/XmlIO/XmlGmlInterface.h b/FileIO/XmlIO/XmlGmlInterface.h index cc849800d5b31f1585a6d98f1e835ed5a7242958..7d6a9e273824bd467704b88a3ebc82f104ca3c2c 100644 --- a/FileIO/XmlIO/XmlGmlInterface.h +++ b/FileIO/XmlIO/XmlGmlInterface.h @@ -61,6 +61,7 @@ private: const std::vector<std::size_t> &pnt_id_map, std::map<std::string, std::size_t>* sfc_names ); + ProjectData* _project; }; } diff --git a/FileIO/XmlIO/XmlGspInterface.cpp b/FileIO/XmlIO/XmlGspInterface.cpp index f384e61706ff4eac11ee0d45b76e04600e30ec9d..73d1706d907c5d700429b45422f017176fef6862 100644 --- a/FileIO/XmlIO/XmlGspInterface.cpp +++ b/FileIO/XmlIO/XmlGspInterface.cpp @@ -31,7 +31,7 @@ namespace FileIO { XmlGspInterface::XmlGspInterface(ProjectData* project, const std::string &schemaFile) : - XMLInterface(project, schemaFile) + XMLInterface(schemaFile), _project(project) { } diff --git a/FileIO/XmlIO/XmlGspInterface.h b/FileIO/XmlIO/XmlGspInterface.h index 580fb8e8c3ced809d2f8106b49d0f469571813f5..0c2ebedfe6f78d3b41945b57017545888cad730a 100644 --- a/FileIO/XmlIO/XmlGspInterface.h +++ b/FileIO/XmlIO/XmlGspInterface.h @@ -46,6 +46,8 @@ protected: private: std::string _filename; + + ProjectData* _project; }; } diff --git a/FileIO/XmlIO/XmlStnInterface.cpp b/FileIO/XmlIO/XmlStnInterface.cpp index 54174af4b9d833a3d133a6342336c025d1d69b53..6fe9876b1954c550cc8c6ca7cfa28df249c7804b 100644 --- a/FileIO/XmlIO/XmlStnInterface.cpp +++ b/FileIO/XmlIO/XmlStnInterface.cpp @@ -31,7 +31,7 @@ namespace FileIO { XmlStnInterface::XmlStnInterface(ProjectData* project, const std::string &schemaFile) : - XMLInterface(project, schemaFile) + XMLInterface(schemaFile), _project(project) { } diff --git a/FileIO/XmlIO/XmlStnInterface.h b/FileIO/XmlIO/XmlStnInterface.h index 0cd920960f25815df42974e4d9973d478d8d7ffc..6da678799ad70f6bf827faba5a9ba7e8d7fb7dcb 100644 --- a/FileIO/XmlIO/XmlStnInterface.h +++ b/FileIO/XmlIO/XmlStnInterface.h @@ -65,6 +65,9 @@ private: /// Reads the stratigraphy of a borehole from an xml-file using the RapidXML parser void rapidReadStratigraphy(const rapidxml::xml_node<>* strat_root, GeoLib::StationBorehole* borehole); + + + ProjectData* _project; }; }