Merge pull request GeoscienceAustralia#276 from GeoscienceAustralia/dr-refactor-printing

Refactor printing

Author: daleroberts

dynadjust/dynadjust/dnaadjust/CMakeLists.txt

@@ -31,6 +31,7 @@ add_library (${PROJECT_NAME} SHARED
              measurement_processor.cpp
              dnaadjust-stage.cpp
              dnaadjust.cpp
+             dnaadjust_printer.cpp
              ${CMAKE_SOURCE_DIR}/dynadjust.rc)
 
 target_link_libraries (${PROJECT_NAME} ${DNA_LIBRARIES})

dynadjust/dynadjust/dnaadjust/dnaadjust-multi.cpp

@@ -125,7 +125,7 @@ void dna_adjust::AdjustPhasedMultiThread()
 		// Print the iteration # to adj file.
 		// protected write to adj file (not needed here since write to
 		// adj file at this stage is via single thread
-		PrintIteration(incrementIteration());
+		printer_->PrintIteration(incrementIteration());
 		///////////////////////////////////
 
 		concurrentAdjustments.reset_adjustment_runs();		
@@ -244,9 +244,9 @@ void dna_adjust::AdjustPhasedMultiThread()
 		adjustStatus_ = ADJUST_MAX_ITERATIONS_EXCEEDED;
 
 	// Print status
-	PrintAdjustmentStatus();
+	printer_->PrintAdjustmentStatus();
 	// Compute and print time taken to run adjustment
-	PrintAdjustmentTime(tot_time, total_time);
+	printer_->PrintAdjustmentTime(tot_time, total_time);
 }