Minor changes to prevent output of unused stations to adjusted statio…

…ns file(s)
icsm-au · Apr 5, 2021 · 9a057db · 9a057db
1 parent 15119dd
commit 9a057db
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 22 deletions.
diff --git a/dynadjust/dynadjust/dnaadjust/dnaadjust.cpp b/dynadjust/dynadjust/dnaadjust/dnaadjust.cpp
@@ -2857,7 +2857,7 @@ bool dna_adjust::PrintEstimatedStationCoordinatestoSNX(string& sinex_filename)
 }
 
 // This should be put into a class separate to dnaadjust
-void dna_adjust::PrintEstimatedStationCoordinatestoDNAXML(const string& stnFile, INPUT_FILE_TYPE t)
+void dna_adjust::PrintEstimatedStationCoordinatestoDNAXML(const string& stnFile, INPUT_FILE_TYPE t, bool flagUnused)
 {
 	// Stations
 	std::ofstream stn_file;
@@ -2926,32 +2926,51 @@ void dna_adjust::PrintEstimatedStationCoordinatestoDNAXML(const string& stnFile,
 		CompareStnFileOrder<station_t, UINT32> stnorderCompareFunc(&bstBinaryRecords_);
 		sort(vStationList.begin(), vStationList.end(), stnorderCompareFunc);
 
-		// print header
+		// print station coordinates
 		switch (t)
 		{
 		case dynaml:
 
-			// Print stations in DynaML format
-			for_each(vStationList.begin(), vStationList.end(),
-				[&stn_file, &stnPtr, this](const UINT32& stn) {
-					stnPtr->SetStationRec(bstBinaryRecords_.at(stn));
-					stnPtr->WriteDNAXMLStnCurrentEstimates(&stn_file, 
-						datum_.GetEllipsoidRef(), &projection_, dynaml);
-			});
+			if (flagUnused)
+				// Print stations in DynaML format
+				for_each(vStationList.begin(), vStationList.end(),
+					[&stn_file, &stnPtr, this](const UINT32& stn) {
+						stnPtr->SetStationRec(bstBinaryRecords_.at(stn));
+						if (stnPtr->IsNotUnused())
+							stnPtr->WriteDNAXMLStnCurrentEstimates(&stn_file,
+								datum_.GetEllipsoidRef(), &projection_, dynaml);
+				});
+			else
+				// Print stations in DynaML format
+				for_each(vStationList.begin(), vStationList.end(),
+					[&stn_file, &stnPtr, this](const UINT32& stn) {
+						stnPtr->SetStationRec(bstBinaryRecords_.at(stn));
+						stnPtr->WriteDNAXMLStnCurrentEstimates(&stn_file,
+							datum_.GetEllipsoidRef(), &projection_, dynaml);
+				});
 
 			stn_file << "</DnaXmlFormat>" << endl;
 
 			break;
 		case dna:
 
-			// Print stations in DNA format
-			for_each(vStationList.begin(), vStationList.end(),
-				[&stn_file, &stnPtr, &dsw, this](const UINT32& stn) {
-					stnPtr->SetStationRec(bstBinaryRecords_.at(stn));
-					//if (stnPtr->IsNotUnused())
-					stnPtr->WriteDNAXMLStnCurrentEstimates(&stn_file, 
-						datum_.GetEllipsoidRef(), &projection_, dna, &dsw);
-			});
+			if (flagUnused)
+				// Print stations in DNA format
+				for_each(vStationList.begin(), vStationList.end(),
+					[&stn_file, &stnPtr, &dsw, this](const UINT32& stn) {
+						stnPtr->SetStationRec(bstBinaryRecords_.at(stn));
+						if (stnPtr->IsNotUnused())
+							stnPtr->WriteDNAXMLStnCurrentEstimates(&stn_file, 
+								datum_.GetEllipsoidRef(), &projection_, dna, &dsw);
+				});
+			else
+				// Print stations in DNA format
+				for_each(vStationList.begin(), vStationList.end(),
+					[&stn_file, &stnPtr, &dsw, this](const UINT32& stn) {
+						stnPtr->SetStationRec(bstBinaryRecords_.at(stn));
+						stnPtr->WriteDNAXMLStnCurrentEstimates(&stn_file,
+							datum_.GetEllipsoidRef(), &projection_, dna, &dsw);
+				});
 
 			break;
 		default:

diff --git a/dynadjust/dynadjust/dnaadjust/dnaadjust.hpp b/dynadjust/dynadjust/dnaadjust/dnaadjust.hpp
@@ -268,7 +268,7 @@ class dna_adjust {
 	void PrintMeasurementsToStation();
 
 	bool PrintEstimatedStationCoordinatestoSNX(string& sinex_file);
-	void PrintEstimatedStationCoordinatestoDNAXML(const string& stnFile, INPUT_FILE_TYPE t);
+	void PrintEstimatedStationCoordinatestoDNAXML(const string& stnFile, INPUT_FILE_TYPE t, bool flagUnused = false);
 
 	void CloseOutputFiles();
 	void UpdateBinaryFiles();

diff --git a/dynadjust/dynadjust/dnaadjustwrapper/dnaadjustwrapper.cpp b/dynadjust/dynadjust/dnaadjustwrapper/dnaadjustwrapper.cpp
@@ -333,7 +333,8 @@ void ExportDynaML(dna_adjust* netAdjust, project_settings* p)
 			cout << "+ Serializing estimated coordinates to " << leafStr<string>(p->o._xml_file) << "... ";
 
 		// Export Stations file
-		netAdjust->PrintEstimatedStationCoordinatestoDNAXML(p->o._xml_file, dynaml);			
+		netAdjust->PrintEstimatedStationCoordinatestoDNAXML(p->o._xml_file, dynaml, 
+			(p->i.flag_unused_stn ? true : false));
 
 		if (!p->g.quiet)
 			cout << "Done." << endl;
@@ -351,7 +352,8 @@ void ExportDNA(dna_adjust* netAdjust, project_settings* p)
 			cout << "+ Serializing estimated coordinates to " << leafStr<string>(stnfilename) << "... ";
 
 		// Export Station file
-		netAdjust->PrintEstimatedStationCoordinatestoDNAXML(stnfilename, dna);
+		netAdjust->PrintEstimatedStationCoordinatestoDNAXML(stnfilename, dna, 
+			(p->i.flag_unused_stn ? true : false));
 
 		if (!p->g.quiet)
 			cout << "Done." << endl;
@@ -424,16 +426,25 @@ int ParseCommandLineOptions(const int& argc, char* argv[], const variables_map&
 
 	p.g.project_file = formPath<string>(p.g.output_folder, p.g.network_name, "dnaproj");
 
-	// update geoid file name from dnaproj file (blank if geoid was not run)
 	if (exists(p.g.project_file))
 	{
+		// update import settings from dnaproj file
+		try {
+			CDnaProjectFile projectFile(p.g.project_file, importSetting);
+			p.i = projectFile.GetSettings().i;
+		}
+		catch (...) {
+			// do nothing
+		}
+
+		// update geoid file name from dnaproj file (blank if geoid was not run)
 		try {
 			CDnaProjectFile projectFile(p.g.project_file, geoidSetting);
 			p.n = projectFile.GetSettings().n;
 		}
 		catch (...) {
 			// do nothing
-		}			
+		}		
 	}
 
 	// binary station file location (output)