the event can just be aware of when it ought to be readonly

jasp-stats · Jan 3, 2024 · ca40346 · ca40346
1 parent b97fc67
commit ca40346
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 12 deletions.
diff --git a/Desktop/analysis/analysis.h b/Desktop/analysis/analysis.h
@@ -178,7 +178,7 @@ class Analysis : public AnalysisBase
 	void					requestComputedColumnDestruction(	const std::string & columnName);
 
 	void					refreshTableViewModels();
-	Q_INVOKABLE void		expandAnalysis();
+	void					expandAnalysis();
 	void					emptyQMLCache();
 
 	void					createFormWhenYouHaveAMoment(QQuickItem* parent = nullptr);

diff --git a/Desktop/data/fileevent.cpp b/Desktop/data/fileevent.cpp
@@ -22,8 +22,7 @@
 #include "exporters/jaspexporter.h"
 
 #include <QTimer>
-#include "utilities/qutils.h"
-#include "log.h"
+#include "utilities/appdirs.h"
 
 FileEvent::FileEvent(QObject *parent, FileEvent::FileMode fileMode)
 	: QObject(parent), _operation(fileMode)
@@ -51,8 +50,6 @@ void FileEvent::setDataFilePath(const QString & path)
 
 void FileEvent::setDatabase(const Json::Value & dbInfo)
 {
-	setReadOnly();
-
 	_database = dbInfo;
 }
 
@@ -110,6 +107,11 @@ void FileEvent::chain(FileEvent *event)
 	connect(event, &FileEvent::completed, this, &FileEvent::chainedComplete);
 }
 
+bool FileEvent::isExample() const
+{
+	return path().startsWith(AppDirs::examples());
+}
+
 const std::string FileEvent::databaseStr() const 
 { 
 	return _database.toStyledString();

diff --git a/Desktop/data/fileevent.h b/Desktop/data/fileevent.h
@@ -47,11 +47,10 @@ class FileEvent : public QObject
 	void				setComplete(bool success = true, const QString &message = "");
 	void				chain(FileEvent *event);
 
-	void				setReadOnly()		  { _readOnly = true;		}
-
 	bool				isDatabase()	const { return _database != Json::nullValue;	}
 	bool				isOnlineNode()	const { return _path.startsWith("http");		}
-	bool				isReadOnly()	const { return _readOnly;						}
+	bool				isExample()		const;
+	bool				isReadOnly()	const { return isExample() || isDatabase();		}
 	bool				isCompleted()	const { return _completed;						}
 	bool				isSuccessful()	const { return _success;						}
 
@@ -83,8 +82,7 @@ private slots:
 						_dataFilePath,
 						_last_error		= "Unknown error",
 						_message;
-	bool				_readOnly		= false,
-						_completed		= false,
+	bool				_completed		= false,
 						_success		= false;
 	FileEvent		*	_chainedTo		= nullptr;
 	Exporter		*	_exporter		= nullptr;

diff --git a/Desktop/widgets/filemenu/datalibrarylistmodel.cpp b/Desktop/widgets/filemenu/datalibrarylistmodel.cpp
@@ -52,7 +52,6 @@ void DataLibraryListModel::openFile(const QString &path)
 {
 	FileEvent *event = new FileEvent(this->parent(), FileEvent::FileOpen);
 	event->setPath(path);
-	event->setReadOnly(); // A file from the Data Library should be read only, also csv file so that its path is not added in the recent list
 
 	emit openFileEvent(event);
 

diff --git a/Desktop/widgets/filemenu/filemenu.cpp b/Desktop/widgets/filemenu/filemenu.cpp
@@ -260,7 +260,7 @@ void FileMenu::dataSetIOCompleted(FileEvent *event)
 			if (!event->isDatabase())
 			{
 				_recentFiles->pushRecentFilePath(event->path());
-				if (!event->path().startsWith(AppDirs::examples()))
+				if (!event->isExample())
 					_computer->addRecentFolder(event->path());
 			}