Make sure editing is quick and analyses are hidden in dataMode (jasp-…

…stats#5040)
RensDofferhoff · Aug 21, 2023 · 8cff078 · 8cff078
1 parent c418300
commit 8cff078
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 10 deletions.
diff --git a/Desktop/components/JASP/Widgets/MainPage.qml b/Desktop/components/JASP/Widgets/MainPage.qml
@@ -39,7 +39,7 @@ Item
 	// position of the rest)
 
 	property bool hasData:		mainWindow.dataAvailable
-	property bool hasAnalysis:	mainWindow.analysesAvailable
+	property bool hasAnalysis:	mainWindow.analysesAvailable && !ribbonModel.dataMode
 
 	function minimizeDataPanel()
 	{

diff --git a/Desktop/engine/enginesync.cpp b/Desktop/engine/enginesync.cpp
@@ -966,9 +966,7 @@ void EngineSync::heartbeatTempFiles()
 }
 
 void EngineSync::stopEngines()
-{
-	_stopProcessing = true; 
-
+{	
 	auto timeout = QDateTime::currentSecsSinceEpoch() + 10;
 
 	for(EngineRepresentation * e : _engines)
@@ -1033,8 +1031,6 @@ void EngineSync::resumeEngines()
 	for(EngineRepresentation * engine : _engines)
 		startStoppedEngine(engine);
 
-	_stopProcessing = false;
-
 	while(!allEnginesResumed())
 		for (auto * engine : _engines)
 			engine->processReplies();
@@ -1074,13 +1070,19 @@ bool EngineSync::allEnginesInitializing(std::set<EngineRepresentation *> these)
 
 void EngineSync::dataModeChanged(bool dataMode)
 {
+	_stopProcessing = dataMode;
+
 	if(!dataMode)
 	{
-		Log::log() << "Data mode turned off, so restarting engines." << std::endl;
-
-		pauseEngines();
+		Log::log() << "Data mode turned off, resuming engines." << std::endl;
 		resumeEngines();
 	}
+	else
+	{
+		Log::log() << "Data mode turned on, pausing engines." << std::endl;
+		pauseEngines();
+	}
+
 }
 
 void EngineSync::enginesPrepareForData()

diff --git a/Desktop/mainwindow.cpp b/Desktop/mainwindow.cpp
@@ -668,6 +668,12 @@ void MainWindow::setCurrentJaspTheme()
 	_qml->rootContext()->setContextProperty("jaspTheme", JaspTheme::currentTheme());
 }
 
+void MainWindow::onDataModeChanged(bool dataMode)
+{
+	if(dataMode && welcomePageVisible())
+		setWelcomePageVisible(false);
+}
+
 void MainWindow::initLog()
 {
 	assert(_engineSync != nullptr && _preferences != nullptr);

diff --git a/Desktop/mainwindow.h b/Desktop/mainwindow.h
@@ -237,7 +237,7 @@ private slots:
 
 	void resetQmlCache();
 	void setCurrentJaspTheme();
-	void onDataModeChanged(bool dataMode) { if(dataMode && welcomePageVisible()) setWelcomePageVisible(false); }
+	void onDataModeChanged(bool dataMode);
 	void printQmlWarnings(const QList<QQmlError> &warnings);
 	void setQmlImportPaths();