Trim data value in downloaded JSON and VOTable files (related to #6566)

Benjamin Renard
1 parent 954b4c5b
Showing 8 changed files with 36 additions and 1 deletions Show diff stats
src/ParamOutputImpl/Download/FileWriterASCIIAbstract.cc
src/ParamOutputImpl/Download/FileWriterASCIIAbstract.hh
src/ParamOutputImpl/Download/FileWriterASCIIJson.cc
src/ParamOutputImpl/Download/FileWriterASCIIJson.hh
src/ParamOutputImpl/Download/FileWriterASCIITabular.cc
src/ParamOutputImpl/Download/FileWriterASCIITabular.hh
src/ParamOutputImpl/Download/FileWriterASCIIVOTable.cc
src/ParamOutputImpl/Download/FileWriterASCIIVOTable.hh
@@ -546,7 +546,7 @@ bool FileWriterASCIIAbstract::writeFloatData(std::string paramId, int varIndex, 
 		crtFile->setf(std::ios::right, std::ios::adjustfield);
 		crtFile->precision(3);
 	}
-	else {
+	else if (!trimData()) {
 		crtFile->width(12);
 	}
 	if (isNAN(data))
@@ -169,6 +169,11 @@ public:
 	virtual std::string getDataValueSeparator(void) = 0;
  
 	/*
+         * @brief Abstract method used to know if data must be trimmed
+         */
+	virtual bool trimData(void) = 0;
+
+	/*
 	 * @overload FileWriter::createNewFile - Create a new ASCII file
 	 */
 	virtual bool createNewFile(std::string filePath);
@@ -271,6 +271,11 @@ std::string FileWriterASCIIJson::getDataValueSeparator(void)
 	return ", ";
 }
  
+bool FileWriterASCIIJson::trimData(void)
+{
+    return true;
+}
+
 } /* namespace FileWriter */
 } /* namespace Download */
 } /* namespace ParamOutputImpl */
@@ -145,6 +145,11 @@ public:
 	 */
 	virtual std::string getDataValueSeparator(void);
  
+	/*
+         * @overload FileWriterASCIIAbstract::trimData  method used to know if data must be trimmed
+         */
+	virtual bool trimData(void);
+
 private:
 	/*
 	 * @brief List of boolean to know if a first element is already write in a group for json format
@@ -204,6 +204,11 @@ std::string FileWriterASCIITabular::getDataValueSeparator(void)
 	return "";
 }
  
+bool FileWriterASCIITabular::trimData(void)
+{
+    return false;
+}
+
 } /* namespace FileWriter */
 } /* namespace Download */
 } /* namespace ParamOutputImpl */
@@ -144,6 +144,11 @@ public:
 	 * @overload FileWriterASCIIAbstract::getDataValueSeparator method to get data value separator for tabular format
 	 */
 	virtual std::string getDataValueSeparator(void);
+        
+        /*
+         * @overload FileWriterASCIIAbstract::trimData  method used to know if data must be trimmed
+         */
+        virtual bool trimData(void);
 };
  
 } /* namespace FileWriter */
@@ -232,6 +232,11 @@ std::string FileWriterASCIIVOTable::getDataValueSeparator(void)
 	return " ";
 }
  
+bool FileWriterASCIIVOTable::trimData(void)
+{
+    return true;
+}
+
 bool FileWriterASCIIVOTable::writeTimeData(std::string paramId, double data, OutputFormatTime /*timeFormat*/, bool isFirstParam)
 {
 	//force ISO format for time field
@@ -149,6 +149,11 @@ public:
 	 * @overload FileWriterASCIIAbstract::getDataValueSeparator method to get data value separator for votable format
 	 */
 	virtual std::string getDataValueSeparator(void);
+        
+        /*
+         * @overload FileWriterASCIIAbstract::trimData  method used to know if data must be trimmed
+         */
+        virtual bool trimData(void);
  
 	/*
 	 * @overload FileWriterASCIIAbstract::writeTimeData - Write a time data in the ASCII file - Fot VOTable, only ISO time is available