Monetary columns and locale sensitive number display

CommonData/column.cpp

@@ -460,6 +460,18 @@ stringset Column::mergeOldMissingDataMap(const Json::Value &missingData)
 	return foundEmpty;
 }
 
+void Column::updateLabelsPostLocaleChange()
+{
+	labelsTempReset();
+
+	beginBatchedLabelsDB();
+
+	for(Label * label : _labels)
+		label->updateDoubleLabelsPostLocaleChange();
+
+	endBatchedLabelsDB(true);	
+}
+
 columnType Column::setValues(const stringvec & values, const stringvec & labels, int thresholdScale, bool * aChange)
 {
 	JASPTIMER_SCOPE(Column::setValues);

CommonData/column.h

@@ -226,10 +226,11 @@ class Column : public DataSetBaseNode
 			bool					isEmptyValue(					const std::string	& val)															const;
 			bool					isEmptyValue(					const double		  val)															const;
 
-			size_t				getMaximumWidthInCharactersIncludingShadow();
-			size_t				getMaximumWidthInCharacters(bool shortenAndFancyEmptyValue, bool valuesPlease, size_t	extraPad	= 4); ///< Tries to take into consideration that utf-8 can have more characters than codepoints and compensates for it
+			size_t					getMaximumWidthInCharactersIncludingShadow();
+			size_t					getMaximumWidthInCharacters(bool shortenAndFancyEmptyValue, bool valuesPlease, size_t	extraPad	= 4); ///< Tries to take into consideration that utf-8 can have more characters than codepoints and compensates for it
 			columnType				resetValues(int thresholdScale); ///< "Reimport" the values it already has with a possibly different threshold of values 
 			stringset				mergeOldMissingDataMap(const Json::Value & missingData); ///< <0.19 JASP collected the removed empty values values in a map in a json object... We need to be able to read at least 0.18.3 so here this function that absorbs such a map and adds any required labels. It does not add the empty values itself though!
+			void					updateLabelsPostLocaleChange();
 
 	static	void					setAutoSortByValuesByDefault(bool autoSort);
 	static	bool					autoSortByValuesByDefault();

CommonData/columnutils.cpp

@@ -16,8 +16,22 @@ using namespace std;
 using namespace boost::posix_time;
 using namespace boost;
 
+std::string				ColumnUtils::_decimalPoint			= ".";
+std::string				ColumnUtils::_currentQLocaleId		= "C";
+ColumnUtils::toDoubleF	ColumnUtils::_extraStringToDouble;
+ColumnUtils::toIntF		ColumnUtils::_extraStringToInt;
+
+void ColumnUtils::setExtraStringToNumber(toDoubleF newDoubleFunc, toIntF newIntFunc)
+{
+	_extraStringToDouble	= newDoubleFunc;
+	_extraStringToInt		= newIntFunc;
+}
+
 bool ColumnUtils::getIntValue(const string &value, int &intValue)
 {
+	if(_extraStringToInt && _extraStringToInt(value, intValue))
+		return true;
+
 	try
 	{
 		intValue = boost::lexical_cast<int>(value);
@@ -30,20 +44,14 @@ bool ColumnUtils::getIntValue(const string &value, int &intValue)
 
 bool ColumnUtils::isIntValue(const string &value)
 {
-	try
-	{
-		boost::lexical_cast<int>(value);
-		return true;
-	}
-	catch (...)	{}
-
-	return false;
+	int dummy;
+	return getIntValue(value, dummy);
 }
 
 bool ColumnUtils::getIntValue(const double &value, int &intValue)
 {
 	JASPTIMER_SCOPE(ColumnUtils::getIntValue);
-	
+
 	try
 	{
 		double intPart;
@@ -65,19 +73,32 @@ bool ColumnUtils::getIntValue(const double &value, int &intValue)
 bool ColumnUtils::getDoubleValue(const string &value, double &doubleValue)
 {
 	doubleValue = EmptyValues::missingValueDouble;
-	
+
 	if(value == "∞" || value == "-∞")
 	{
 		doubleValue = std::numeric_limits<double>::infinity() * (value == "-∞" ? -1 : 1);
 		return true;
 	}
+
+	if(_extraStringToDouble && _extraStringToDouble(value, doubleValue))
+		return true;
 
 	try
 	{
-		doubleValue = boost::lexical_cast<double>(deEuropeaniseForImport(value));
+		doubleValue = boost::lexical_cast<double>((value));
 		return true;
 	}
-	catch (...) {}
+	catch (...) // If it failed try to "deEuropeanise it"
+	{
+		try
+		{
+			doubleValue = boost::lexical_cast<double>(deEuropeaniseForImport(value));
+			return true;
+		}
+		catch (...) 
+		{
+		}
+	}
 
 	return false;
 }
@@ -216,14 +237,25 @@ std::string ColumnUtils::doubleToStringMaxPrec(double dbl)
 	return 	doubleToString(dbl, max_precision);
 }
 
+ColumnUtils::doubleF ColumnUtils::_alternativeDoubleToString;
+
+void ColumnUtils::setAlternativeDoubleToString(doubleF newDoubleFunc)
+{
+	_alternativeDoubleToString = newDoubleFunc;
+}
+
 std::string ColumnUtils::doubleToString(double dbl, int precision)
 {
 	JASPTIMER_SCOPE(ColumnUtils::doubleToString);
 
 	if (dbl > std::numeric_limits<double>::max())		return "∞";
 	if (dbl < std::numeric_limits<double>::lowest())	return "-∞";
 
+	if(_alternativeDoubleToString)
+		return _alternativeDoubleToString(dbl, precision); //Use QString for translations
+
 	std::stringstream conv; //Use this instead of std::to_string to make sure there are no trailing zeroes (and to get full precision)
+
 	conv << std::setprecision(precision);
 	conv << dbl;
 	return conv.str();

CommonData/columnutils.h

@@ -3,30 +3,50 @@
 
 #include <string>
 #include "utils.h"
+#include <locale>
+#include <functional>
 
 class ColumnUtils
 {
 public:
+	typedef std::function<std::string(double, int)>		doubleF;
+	typedef std::function<bool(std::string, double&)>	toDoubleF;
+	typedef std::function<bool(std::string, int&)>		toIntF;
+
 	friend class PreferencesModel;
 
-	static bool			getIntValue(	const std::string	& value, int	& intValue);
-	static bool			getIntValue(	const double		& value, int	& intValue);
-	static bool			getDoubleValue(	const std::string	& value, double	& doubleValue);
-	static doubleset	getDoubleValues(const stringset		& values, bool stripNAN = true);
+	static bool					getIntValue(	const std::string	& value, int	& intValue);
+	static bool					getIntValue(	const double		& value, int	& intValue);
+	static bool					getDoubleValue(	const std::string	& value, double	& doubleValue);
+	static doubleset			getDoubleValues(const stringset		& values, bool stripNAN = true);
 
-	static bool			isIntValue(		const std::string	& value);
-	static bool			isDoubleValue(	const std::string	& value);
+	static bool					isIntValue(		const std::string	& value);
+	static bool					isDoubleValue(	const std::string	& value);
 
-	static void			convertEscapedUnicodeToUTF8(			std::string & inputStr);
-	static std::string	deEuropeaniseForImport(					std::string   value);		//Convert a string to a double with a dot for a separator
+	static void					convertEscapedUnicodeToUTF8(			std::string & inputStr);
+	static std::string			deEuropeaniseForImport(					std::string   value);		//Convert a string to a double with a dot for a separator
 
-	static std::string	doubleToString(			double dbl, int precision = 10);
-	static std::string	doubleToStringMaxPrec(	double dbl);
+	static std::string			doubleToString(			double dbl, int precision = 10);
+	static std::string			doubleToStringMaxPrec(	double dbl);
+
+	static bool					convertVecToInt(	const stringvec & values, intvec	& intValues, intset & uniqueValues);
+	static bool					convertVecToDouble(	const stringvec & values, doublevec	& doubleValues);
+
+	static void					setAlternativeDoubleToString(	doubleF		newDoubleFunc);
+	static void					setExtraStringToNumber(			toDoubleF	newDoubleFunc, toIntF newIntFunc);
+	static const std::string &	decimalPoint()							{ return _decimalPoint; }
+	static void					setDecimalPoint(const std::string & p)	{ _decimalPoint = p;}
+
+	static const std::string &	currentQLocaleId()							{ return _currentQLocaleId; }
+	static void					setCurrentQLocaleId(const std::string & p)	{ _currentQLocaleId = p;}
 
-	static bool			convertVecToInt(	const stringvec & values, intvec	& intValues, intset & uniqueValues);
-	static bool			convertVecToDouble(	const stringvec & values, doublevec	& doubleValues);
-private:
-	static std::string _convertEscapedUnicodeToUTF8(	std::string hex);
+private:	
+	static std::string			_convertEscapedUnicodeToUTF8(	std::string hex);
+	static doubleF				_alternativeDoubleToString;
+	static toDoubleF			_extraStringToDouble;
+	static toIntF				_extraStringToInt;
+	static std::string			_decimalPoint,
+								_currentQLocaleId;
 };
 
 #endif // COLUMNUTILS_H

CommonData/dataset.cpp

@@ -587,6 +587,12 @@ void DataSet::setDescription(const std::string &desc)
 	dbUpdate();
 }
 
+void DataSet::updateLabelsPostLocaleChange()
+{
+	for(Column * column : _columns)
+		column->updateLabelsPostLocaleChange();
+}
+
 DatabaseInterface &DataSet::db()	
 { 
 	return *DatabaseInterface::singleton(); 

CommonData/dataset.h

@@ -85,7 +85,8 @@ class DataSet : public DataSetBaseNode
 			void					setWorkspaceEmptyValues(	const stringset& values);
 	const	std::string			&	description()																	const	{ return _description; }
 			void					setDescription(				const std::string& desc);
-
+			void					updateLabelsPostLocaleChange();
+
 private:			
 			void					upgradeTo019(const Json::Value & emptyVals);
 			void					setEmptyValuesJsonOldStuff(	const Json::Value & emptyValues);

CommonData/label.cpp

@@ -2,6 +2,7 @@
 #include "column.h"
 #include <cassert>
 #include "timers.h"
+#include "columnutils.h"
 #include "databaseinterface.h"
 
 const int Label::DOUBLE_LABEL_VALUE			= -1; 
@@ -103,6 +104,20 @@ void Label::setInformation(Column * column, int id, int order, const std::string
 	_originalValue	= originalValue;
 }
 
+void Label::updateDoubleLabelsPostLocaleChange()
+{
+	if(_originalValue.isDouble() && originalValueAsString() != _label)
+	{
+		//Maybe they really arent the same, but its also possible a languagechange just changed the way the decimal separator is written...
+		double labelDouble;
+		if(ColumnUtils::getDoubleValue(_label, labelDouble) && ColumnUtils::doubleToString(labelDouble) == originalValueAsString())
+		{
+			_label = originalValueAsString();
+			dbUpdate();
+		}
+	}
+}
+
 Json::Value Label::serialize() const
 {
 	Json::Value json(Json::objectValue);

CommonData/label.h

@@ -61,6 +61,8 @@ class Label : public DataSetBaseNode
 			bool				setDescription(		const std::string & description);
 			bool				setFilterAllows(	bool allowFilter);
 			void				setInformation(Column * column, int id, int order, const std::string &label, int value, bool filterAllows, const std::string & description, const Json::Value & originalValue);
+
+			void				updateDoubleLabelsPostLocaleChange();
 
 			Json::Value			serialize()	const;
 

Desktop/components/JASP/Widgets/FileMenu/PrefsUI.qml

@@ -185,12 +185,50 @@ ScrollView
 			DropDown
 			{
 				id:							languages
-				label:						qsTr("Choose language  ")
+				label:						qsTr("Choose language")
 				source:						languageModel
 				startValue: 				languageModel.currentLanguage
 				onValueChanged: 			languageModel.currentLanguage = value
 
-				KeyNavigation.tab: 			altnavcheckbox
+				KeyNavigation.tab: 			useAlternativeLocale
+
+			}
+
+			CheckBox
+			{
+				id:							useAlternativeLocale
+				label:						qsTr("Use an alternative locale for numbers")
+				checked:					languageModel.useAlternativeLocale
+				onCheckedChanged:			languageModel.useAlternativeLocale = checked
+				toolTip:					qsTr("Use the locale specified below for display of numbers and currency.") //dates and times will have to be added later
+
+				KeyNavigation.tab:			alternativeLocaleTerritory
+			}
+
+			Group
+			{
+				enabled:					languageModel.useAlternativeLocale
+				DropDown
+				{
+					id:							alternativeLocaleLanguage
+					label:						qsTr("Alt. language")
+					values:		 				languageModel.altLanguages
+					startValue:				 	languageModel.currentAltLanguage
+					onValueChanged:				if(value != "") languageModel.currentAltLanguage = value
+					addEmptyValue:				false
+					KeyNavigation.tab:			alternativeLocaleTerritory
+				}
+
+				DropDown
+				{
+					id:							alternativeLocaleTerritory
+					label:						qsTr("Alt. territory")
+					values:		 				languageModel.altTerritories
+					startValue:				 	languageModel.currentAltTerritory
+					onValueChanged:				if(value != "") languageModel.currentAltTerritory = value
+					addEmptyValue:				false
+					KeyNavigation.tab:			altnavcheckbox
+				}
 
 			}
 

Desktop/data/datasetpackage.cpp

@@ -672,7 +672,7 @@ bool DataSetPackage::setData(const QModelIndex &index, const QVariant &value, in
 {
     JASPTIMER_SCOPE(DataSetPackage::setData);
 
-	if(!index.isValid() || !_dataSet) return false;
+	if(_waitingForLanguageChange || !index.isValid() || !_dataSet) return false;
 
 	DataSetBaseNode * node = indexPointerToNode(index);
 
@@ -1248,6 +1248,23 @@ void DataSetPackage::resetFilterCounters()
 		col->nonFilteredCountersReset();
 }
 
+void DataSetPackage::prepareForLanguageChange()
+{
+	_waitingForLanguageChange = true; //Dont accept changes while the interface changes
+}
+
+void DataSetPackage::languageChangeDone()
+{
+	_waitingForLanguageChange = false; //Dont accept changes while the interface changes
+
+	if(_dataSet)
+		_dataSet->updateLabelsPostLocaleChange();
+
+	refresh();
+}
+
+
+
 void DataSetPackage::resetAllFilters()
 {
 	for(Column * col : _dataSet->columns())

Desktop/data/datasetpackage.h

@@ -333,6 +333,8 @@ public slots:
 				void				checkDataSetForUpdates();
 				void				delayedRefresh();
 				void				resetFilterCounters();
+				void				prepareForLanguageChange();
+				void				languageChangeDone();
 
 private:
 				bool				isThisTheSameThreadAsEngineSync();
@@ -366,7 +368,8 @@ public slots:
 								_analysesHTMLReady			= false,
 								_filterShouldRunInit		= false,
 								_dataMode					= false,
-								_manualEdits				= false;
+								_manualEdits				= false,
+								_waitingForLanguageChange	= false;
 
 	Json::Value					_analysesData,
 								_database					= Json::nullValue;

Desktop/html/index-jasp.html

@@ -15,18 +15,16 @@
 	<link rel="stylesheet" href="css/highlight-default.min.css"				type="text/css" />
 
 	<script type="text/javascript" >   var insideJASP = true;               </script>
-
-
     <script type="text/javascript" src="js/jquery-3.7.0.js">                </script>
 	<script type="text/javascript" src="js/jquery-ui-1.13.2.custom.js">    </script>
 	<script type="text/javascript" src="js/underscore-min.js">            </script>
 	<script type="text/javascript" src="js/backbone-1.5.0.js">           </script>
 	<script type="text/javascript" src="js/etch.js">                    </script>
-	<script type="text/javascript" src="js/mathjax-config.js">   	  </script>
+	<script type="text/javascript" src="js/mathjax-config.js">   	     </script>
 	<script type="text/javascript" src="js/mathjax-tex-svg-full.js">   	  </script>
-	<script type="text/javascript" src="js/highlight.min.js">           </script>
-	<script type="text/javascript" src="js/highlight-r.min.js">        </script>
 	<script type="text/javascript" src="js/quill-blot-formatter.min.js">  </script>
+	<script type="text/javascript" src="js/highlight.min.js">			 </script>
+	<script type="text/javascript" src="js/highlight-r.min.js">			</script>
 	<script type="text/javascript" src="js/quill.js">                  </script>
 	<script type="text/javascript" src="js/mrkdwn.js">                </script>
 	<script type="text/javascript" src="js/jaspwidgets.js">          </script>