update levels property whenever workspace emptyvalues change

Author: JorisGoosen

CommonData/dataset.cpp

@@ -563,6 +563,8 @@ void DataSet::setEmptyValuesJson(const Json::Value &emptyValues, bool updateDB)
 void DataSet::setWorkspaceEmptyValues(const stringset &values)
 {
 	_emptyValues->setEmptyValues(values);
+	for(Column * column : _columns)
+		column->labelsTempReset();
 	dbUpdate();
 }
 

Desktop/data/columnsmodel.cpp

@@ -16,9 +16,11 @@ ColumnsModel::ColumnsModel(DataSetTableModel *tableModel)
 	connect(_tableModel, &DataSetTableModel::columnTypeChanged,		this, [&](QString col, int) { emit columnTypeChanged(col); });
 	connect(_tableModel, &DataSetTableModel::labelChanged,			this, [&](QString col, QString orgLabel, QString newLabel) { emit labelsChanged(col, {std::make_pair(orgLabel, newLabel) }); } );
 	connect(_tableModel, &DataSetTableModel::labelsReordered,		this, &ColumnsModel::labelsReordered	);
+	connect(_tableModel, &DataSetTableModel::emptyValuesChanged,	this, &ColumnsModel::dataSetChanged		);
 
 	auto * info = new VariableInfo(_singleton);
 
+
 	connect(this, &ColumnsModel::namesChanged,							info, &VariableInfo::namesChanged		);
 	connect(this, &ColumnsModel::columnsChanged,						info, &VariableInfo::columnsChanged		);
 	connect(this, &ColumnsModel::columnTypeChanged,						info, &VariableInfo::columnTypeChanged	);

Desktop/data/datasettablemodel.cpp

@@ -28,6 +28,7 @@ DataSetTableModel::DataSetTableModel(bool showInactive)
 	connect(DataSetPackage::pkg(),	&DataSetPackage::columnDataTypeChanged,			this, [&](QString colName) { emit columnTypeChanged(colName, int(DataSetPackage::pkg()->getColumnType(colName)));	}, Qt::QueuedConnection);
 	connect(DataSetPackage::pkg(),	&DataSetPackage::labelChanged,					this, &DataSetTableModel::labelChanged					);
 	connect(DataSetPackage::pkg(),	&DataSetPackage::labelsReordered,				this, &DataSetTableModel::labelsReordered				);
+	connect(DataSetPackage::pkg(),	&DataSetPackage::workspaceEmptyValuesChanged,	this, &DataSetTableModel::emptyValuesChanged			);
 	//connect(this,		&DataSetTableModel::dataChanged,				this, &DataSetTableModel::onDataChanged,				Qt::QueuedConnection);
 
 	setFilterRole(int(DataSetPackage::specialRoles::filter));

Desktop/data/datasettablemodel.h

@@ -57,6 +57,7 @@ class DataSetTableModel : public DataSetTableProxy
 	void					columnTypeChanged(QString colName, int colType);
 	void					labelChanged(QString columnName, QString originalLabel, QString newLabel);
 	void					labelsReordered(QString columnName);
+	void					emptyValuesChanged();
 
 	void					renameColumnDialog(int columnIndex);
 

QMLComponents/controls/variableslistbase.cpp

@@ -45,6 +45,8 @@ VariablesListBase::VariablesListBase(QQuickItem* parent)
 	_controlType			= ControlType::VariablesListView;
 	_useControlMouseArea	= false;
 	_allowedTypesModel		= new ColumnTypesModel(this);
+	
+	connect(VariableInfo::info(),	&VariableInfo::dataSetChanged,		this,	&VariablesListBase::levelsChanged);
 }
 
 void VariablesListBase::setUp()