use dropLevels in checking levels

jasp-stats · Feb 13, 2025 · ded1fd5 · ded1fd5
1 parent d9501fe
commit ded1fd5
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 8 deletions.
diff --git a/CommonData/column.cpp b/CommonData/column.cpp
@@ -1013,6 +1013,11 @@ int Column::nonFilteredNumericsCount()
 			if(_data->filter()->filtered()[r] && !isEmptyValue(_dbls[r]))
 					numerics.insert(_dbls[r]);
 
+		if(!_data->filter()->shouldDropLevels())
+			for(Label * label : _labels)
+				if(label->originalValue().isDouble())
+					numerics.insert(label->originalValue().asDouble());
+
 		_nonFilteredNumericsCount = numerics.size();
 	}
 
@@ -1023,27 +1028,31 @@ stringvec Column::nonFilteredLevels()
 {
 	if (_nonFilteredLevels.empty())
 	{
-        stringset levels;
+		stringset levels;
 		for(size_t r=0; r<_data->rowCount(); r++)
 			if(_data->filter()->filtered()[r])
 			{
 				if(_ints[r] != Label::DOUBLE_LABEL_VALUE)
 				{
 					Label * label = labelByIntsId(_ints[r]);
 					if(label && !label->isEmptyValue())
-                        levels.insert(label->label());
+						levels.insert(label->label());
 				}
 				else if(!isEmptyValue(_dbls[r]))
 					levels.insert(ColumnUtils::doubleToString(_dbls[r]));
 			}
 
-        // Use the right label order
-        for (std::string& label : _labelsTemp)
-            if (levels.find(label) != levels.end())
-                _nonFilteredLevels.push_back(label);
-    }
+		if(!_data->filter()->shouldDropLevels())
+			for(Label * label : _labels)
+				levels.insert(label->label());
+
+		// Use the right label order
+		for (std::string& label : _labelsTemp)
+			if (levels.find(label) != levels.end())
+				_nonFilteredLevels.push_back(label);
+	}
 
-    return _nonFilteredLevels;
+	return _nonFilteredLevels;
 }
 
 void Column::nonFilteredCountersReset()

diff --git a/Desktop/data/filtermodel.cpp b/Desktop/data/filtermodel.cpp
@@ -81,6 +81,9 @@ void FilterModel::setDropLevels(bool dropLevels)
 		DataSetPackage::filter()->setDropLevels(dropLevels);
 	emit dropLevelsChanged();
 	emit refreshAllCompCols();
+	emit refreshAllAnalyses();
+
+	emit filterUpdated();
 }
 
 bool FilterModel::_setRFilter(const QString& newRFilter)