add sorting for alphabetical originalvalue containing labels

Author: JorisGoosen

CommonData/column.cpp

@@ -1731,7 +1731,8 @@ void Column::labelsOrderByValue(bool doDbUpdateEtc)
 		replaceDoublesTillLabelsRowWithLabels(labelsTempCount());
 
 	doublevec				asc			= valuesNumericOrdered();
-	size_t					curMax		= asc.size()+1;
+	auto					alpha		= valuesAlphabeticalOffsets();
+	size_t					ascMax		= asc.size()+1;
 	std::map<double, int>	orderMap;
 
 	for(size_t i=0; i<asc.size(); i++)
@@ -1747,7 +1748,7 @@ void Column::labelsOrderByValue(bool doDbUpdateEtc)
 		else 
 			ColumnUtils::getDoubleValue(label->originalValueAsString(), aValue);
 
-		label->setOrder(!std::isnan(aValue) ? orderMap[aValue] : curMax++);
+		label->setOrder(!std::isnan(aValue) ? orderMap[aValue] : alpha[label] + ascMax);
 	}
 
 	_sortLabelsByOrder();
@@ -1776,6 +1777,26 @@ doublevec Column::valuesNumericOrdered()
 	return doublevec(values.begin(), values.end());
 }
 
+std::map<Label*, size_t> Column::valuesAlphabeticalOffsets()
+{
+	std::map<Label*, size_t>	labelMap;
+	Labels						alphaLabels;
+	
+	for(Label * label : _labels)
+		if(!label->originalValue().isDouble())
+			alphaLabels.push_back(label);
+	
+	std::sort(alphaLabels.begin(), alphaLabels.end(), [](const Label * l, const Label * r)
+	{
+		return l->originalValueAsString() < r->originalValueAsString();
+	});
+	
+	for(size_t l=0; l<alphaLabels.size(); l++)
+		labelMap[alphaLabels[l]] = l;
+	
+	return labelMap;
+}
+
 void Column::valuesReverse()
 {
 	JASPTIMER_SCOPE(Column::valuesReverse);

CommonData/column.h

@@ -232,7 +232,7 @@ class Column : public DataSetBaseNode
 
 	static	void					setAutoSortByValuesByDefault(bool autoSort);
 	static	bool					autoSortByValuesByDefault();
-
+	
 protected:
 			void					_checkForDependencyLoop(stringset foundNames, std::list<std::string> loopList);
 			void					_dbUpdateLabelOrder(bool noIncRevisionWhenBatchedPlease = false);		///< Sets the order of the _labels to label.order and in DB
@@ -243,6 +243,7 @@ class Column : public DataSetBaseNode
 			void					_convertVectorIntToDouble(intvec & intValues, doublevec & doubleValues);
 			void					_resetLabelValueMap();
 			doublevec				valuesNumericOrdered();			
+			std::map<Label*,size_t> valuesAlphabeticalOffsets();
 
 private:
 			DataSet			* const	_data;