more changes

jasp-stats · Jan 22, 2025 · c34d9ce · c34d9ce
1 parent e0fd782
commit c34d9ce
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 23 deletions.
diff --git a/Desktop/data/datasetpackage.h b/Desktop/data/datasetpackage.h
@@ -277,12 +277,9 @@ class DataSetPackage : public QObject
 				void				dataSetQChanged();
 
 public slots:
-				void				refresh()							{ beginResetModel(); endResetModel(); }
-				void				refreshWithDelay();
 				void				refreshColumn(						QString columnName);
 				void				columnWasOverwritten(				const std::string & columnName, const std::string & possibleError);
 				void				notifyColumnFilterStatusChanged(	int columnIndex);
-				void				setColumnsUsedInEasyFilter(			stringset usedColumns);
 				void				setCurrentFile(						QString currentFile);
 				void				setFolder(							QString folder);
 				void				generateEmptyData();
@@ -298,12 +295,6 @@ public slots:
 
 private:
 				bool				isThisTheSameThreadAsEngineSync();
-				bool				setLabelAllowFilter(	const QModelIndex & index, bool newAllowValue);
-				bool				setLabelDescription(	const QModelIndex & index, const QString & newDescription);
-				bool				setLabelDisplay(		const QModelIndex & index, const QString & newLabel);
-				bool				setLabelValue(			const QModelIndex & index, const QString & newLabel);
-				QModelIndex			lastCurrentCell();
-				int					getColIndex(QVariant colID);
 				void				columnsApply(intset columnIndexes, std::function<bool (Column *)>		applyThis);
 				void				columnsApply(intset columnIndexes, std::function<bool (Column *, int)>	applyThis);
 				void				dbDelete();

diff --git a/Desktop/data/filtermodel.cpp b/Desktop/data/filtermodel.cpp
@@ -9,10 +9,8 @@
 FilterModel::FilterModel(QObject * parent)
 	: QObject(parent)
 {
-	_undoStack = DataSetPackage::pkg()->undoStack();
 
-	reset();
-	connect(this,					&FilterModel::rFilterChanged,	this, &FilterModel::rescanRFilterForColumns	);
+
 }
 
 QString FilterModel::rFilter()			const	{ return !filter() ? defaultRFilter()		: tq(filter()->rFilter());					}
@@ -21,12 +19,6 @@ QString FilterModel::filterErrorMsg()	const	{ return !filter() ? ""						: tq(fi
 QString FilterModel::generatedFilter()	const	{ return !filter() ? DEFAULT_FILTER_GEN		: tq(filter()->generatedFilter());			}
 QString FilterModel::constructorJson()	const	{ return !filter() ? DEFAULT_FILTER_JSON	: tq(filter()->constructorJson());			}
 
-
-void FilterModel::reset()
-{
-	filter()->reset()();
-}
-
 void FilterModel::applyConstructorJson(QString newConstructorJson)
 {
 	if (newConstructorJson != constructorJson())

diff --git a/Desktop/data/filtermodel.h b/Desktop/data/filtermodel.h
@@ -32,10 +32,6 @@ class FilterModel : public QObject
 
 				void			runFilter();
 
-				void			updateStatusBar();
-				void			reset();
-				void			modelInit();
-
 public slots:
 	void applyConstructorJson(	QString constructorJson);
 	void applyRFilter(			QString rFilter);

diff --git a/Engine/CMakeLists.txt b/Engine/CMakeLists.txt
@@ -39,7 +39,8 @@ add_dependencies(JASPEngine R-Interface)
 
 target_include_directories(
 	JASPEngine
-	PUBLIC ${PROJECT_SOURCE_DIR}/R-Interface
+	PUBLIC
+	${PROJECT_SOURCE_DIR}/R-Interface
 	${PROJECT_SOURCE_DIR}/CommonData
 	${PROJECT_SOURCE_DIR}/Common
 	${PROJECT_SOURCE_DIR}/Common/jaspColumnEncoder