collect a map of dataset types per column (#5791)

now we always encode the type of the column with it

Author: JorisGoosen

Common/jaspColumnEncoder

@@ -218,6 +218,18 @@ stringvec DataSet::getColumnNames()
 	return names;
 }
 
+
+std::map<std::string,columnType> DataSet::getColumnTypesMap()
+{
+	std::map<std::string,columnType> theMap;
+
+	for(const Column * col : columns())
+		theMap[col->name()] = col->type();
+
+	return theMap;
+}
+
+
 void DataSet::dbCreate()
 {
 	JASPTIMER_SCOPE(DataSet::dbCreate);

CommonData/dataset.cpp

@@ -52,8 +52,10 @@ class DataSet : public DataSetBaseNode
 
 			bool			allColumnsPassFilter()					const;
 
-			size_t		getMaximumColumnWidthInCharacters(size_t columnIndex) const;
+			size_t			getMaximumColumnWidthInCharacters(size_t columnIndex) const;
 			stringvec		getColumnNames();
+	std::map<std::string,
+			columnType>		getColumnTypesMap();
 
 			void			setDataFile( const std::string & dataFilePath, long timestamp)	{ _dataFilePath	= dataFilePath;	_dataFileTimestamp = timestamp; dbUpdate(); }
 			void			setDatabaseJson(	const std::string & databaseJson)	{ _databaseJson		= databaseJson;			dbUpdate(); }

CommonData/dataset.h

@@ -114,7 +114,8 @@ void DataSetPackage::enginesReceiveNewData()
 		else									emit enginesReceiveNewDataSignal();
 	}
 
-	ColumnEncoder::setCurrentColumnNames(getColumnNames()); //Same place as in engine, should be fine right?
+	ColumnEncoder::setCurrentColumnNames(	getColumnNames()); //Same place as in engine, should be fine right?
+	ColumnEncoder::setCurrentColTypePerName(getColumnTypesMap());
 }
 
 bool DataSetPackage::dataSetBaseNodeStillExists(DataSetBaseNode *node) const
@@ -1506,12 +1507,24 @@ stringvec DataSetPackage::getColumnNames()
 	stringvec names;
 
 	if(_dataSet)
-		for(const Column * col : _dataSet->columns())
-				names.push_back(col->name());
+		return _dataSet->getColumnNames();
 
 	return names;
 }
 
+
+std::map<std::string,columnType> DataSetPackage::getColumnTypesMap()
+{
+	std::map<std::string,columnType> theMap;
+
+	if(_dataSet)
+		return _dataSet->getColumnTypesMap();
+
+	return theMap;
+}
+
+
+
 bool DataSetPackage::isColumnDifferentFromStringValues(const std::string & columnName, const std::string & title, const stringvec & strVals, const stringvec & strLabs, const stringset & strEmptyVals)
 {
 	Column * col = _dataSet->column(columnName);
@@ -2033,7 +2046,8 @@ QString DataSetPackage::insertColumnSpecial(int columnIndex, const QMap<QString,
 
 	emit datasetChanged(tq(stringvec{column->name()}), {}, {}, false, true);
 
-	ColumnEncoder::setCurrentColumnNames(getColumnNames());
+	ColumnEncoder::setCurrentColumnNames(	getColumnNames());
+	ColumnEncoder::setCurrentColTypePerName(getColumnTypesMap());
 
 	if(column->codeType() == computedColumnType::constructorCode || column->codeType() == computedColumnType::rCode)
 		emit columnAddedManually(tq(column->name())); //Will trigger setChosenColumn and setVisible(true) on ColumnModel, showing it to the user
@@ -2081,7 +2095,8 @@ bool DataSetPackage::insertColumns(int column, int count, const QModelIndex & ap
 
 	emit datasetChanged(tq(changed), tq(missingColumns), tq(changeNameColumns), true, false);
 
-	ColumnEncoder::setCurrentColumnNames(getColumnNames());
+	ColumnEncoder::setCurrentColumnNames(	getColumnNames());
+	ColumnEncoder::setCurrentColTypePerName(getColumnTypesMap());
 
 	return true;
 }
@@ -2116,7 +2131,8 @@ bool DataSetPackage::removeColumns(int column, int count, const QModelIndex & ap
 #endif
 	emit datasetChanged(tq(changed), tq(missingColumns), tq(changeNameColumns), false, true);
 
-	ColumnEncoder::setCurrentColumnNames(getColumnNames());
+	ColumnEncoder::setCurrentColumnNames(	getColumnNames());
+	ColumnEncoder::setCurrentColTypePerName(getColumnTypesMap());
 
 	return true;
 }

Desktop/data/datasetpackage.cpp

@@ -200,6 +200,7 @@ class DataSetPackage : public QAbstractItemModel //Not QAbstractTableModel becau
 				void						columnsReorder(			const stringvec		& order);
 
 				stringvec					getColumnNames();
+		std::map<std::string, columnType>	getColumnTypesMap();
 				bool						isColumnDifferentFromStringValues(const std::string & columnName, const std::string & title, const stringvec & strVals, const stringvec & strLabs, const stringset & strEmptyVals);
 				int							findIndexByName(const std::string & name)	const;
 
@@ -272,6 +273,7 @@ class DataSetPackage : public QAbstractItemModel //Not QAbstractTableModel becau
 				void						resetVariableTypes();
 
 
+
 signals:
 				void				datasetChanged(	QStringList				changedColumns,
 													QStringList				missingColumns,

Desktop/data/datasetpackage.h

@@ -136,7 +136,8 @@ bool EngineBase::setColumnDataAndType(const std::string &columnName, const std::
 
 void EngineBase::reloadColumnNames()
 {
-	ColumnEncoder::columnEncoder()->setCurrentColumnNames(provideAndUpdateDataSet() == nullptr ? std::vector<std::string>({}) : provideAndUpdateDataSet()->getColumnNames());
+	ColumnEncoder::columnEncoder()->setCurrentColumnNames(		provideAndUpdateDataSet() == nullptr ? std::vector<std::string>({})			: provideAndUpdateDataSet()->getColumnNames());
+	ColumnEncoder::columnEncoder()->setCurrentColTypePerName(	provideAndUpdateDataSet() == nullptr ? std::map<std::string,columnType>()	: provideAndUpdateDataSet()->getColumnTypesMap());
 }