improvements

RensDofferhoff · RensDofferhoff · commit 219e98b87a57 · 2023-04-17T16:14:47.000+02:00
diff --git a/Desktop/analysis/analyses.cpp b/Desktop/analysis/analyses.cpp
@@ -734,19 +734,19 @@ void Analyses::duplicateAnalysis(size_t id)
 	analysis->refresh();
 }
 
-void Analyses::showDependenciesInAnalysis(size_t analysis_id, QString optionName)
+void Analyses::showDependenciesInAnalysis(size_t analysis_id, QString optionName, bool show)
 {
 	if(!get(analysis_id)) return;
 
-	get(analysis_id)->showDependenciesOnQMLForObject(optionName);
-}
-
-void Analyses::hideDependenciesInAnalysis(size_t analysis_id, QString optionName)
-{
-	//just hide it for all analysis, probably desired
-	for (auto& analysis : _analysisMap)
+	if(show)
+		get(analysis_id)->showDependenciesOnQMLForObject(optionName);
+	else
 	{
-		analysis.second->hideDependencies();
+		//just hide it for all analysis, probably desired
+		for (auto& analysis : _analysisMap)
+		{
+			analysis.second->hideDependencies();
+		}
 	}
 }
 
diff --git a/Desktop/analysis/analyses.h b/Desktop/analysis/analyses.h
@@ -129,8 +129,7 @@ public slots:
 	void setCurrentFormPrevH(double currentFormPrevH);
 	void move(int fromIndex, int toIndex);
 	void duplicateAnalysis(size_t id);
-	void showDependenciesInAnalysis(size_t analysis_id, QString optionName);
-	void hideDependenciesInAnalysis(size_t analysis_id, QString optionName);
+	void showDependenciesInAnalysis(size_t analysis_id, QString optionName, bool show);
 	void analysisTitleChangedHandler(std::string moduleName, std::string oldTitle, std::string newTitlesendRScriptHandler);
 	void prepareForLanguageChange();
 	void languageChangedHandler();
diff --git a/Desktop/components/JASP/Widgets/MainPage.qml b/Desktop/components/JASP/Widgets/MainPage.qml
@@ -341,8 +341,10 @@ Item
 				function setAllUserDataFromJavascript(json)			{ resultsJsInterface.setAllUserDataFromJavascript(json)			}
 				function setResultsMetaFromJavascript(json)			{ resultsJsInterface.setResultsMetaFromJavascript(json)			}
 				function duplicateAnalysis(id)						{ resultsJsInterface.duplicateAnalysis(id)						}
-				function showDependenciesInAnalysis(id, optName)	{ resultsJsInterface.showDependenciesInAnalysis(id, optName); resultMenuModel.setDependenciesShown(true)	}
-				function hideDependenciesInAnalysis(id, optName)	{ resultsJsInterface.hideDependenciesInAnalysis(id, optName); resultMenuModel.setDependenciesShown(false)	}
+
+				function showDependenciesInAnalysis(id, optName, show)	{
+					resultsJsInterface.showDependenciesInAnalysis(id, optName, show);
+					resultMenuModel.setDependenciesShown(show);	}
 
 				function showAnalysesMenu(options)
 				{
diff --git a/Desktop/html/js/analysis.js b/Desktop/html/js/analysis.js
@@ -101,8 +101,7 @@ JASPWidgets.AnalysisView = JASPWidgets.View.extend({
 		this.model.on("CustomOptions:changed",		function (options)			{											this.trigger("optionschanged",		this.model.get("id"), options)	},	this);
 		this.model.on("SaveImage:clicked",			function (options)			{											this.trigger("saveimage",			this.model.get("id"), options)	},	this);
 		this.model.on("EditImage:clicked",			function (image, options)	{ this.imageBeingEdited = image;			this.trigger("editimage",			this.model.get("id"), options)	},	this);
-		this.model.on("ShowDependencies:clicked",	function (optName)			{											this.trigger("showDependencies",	this.model.get("id"), optName)	},	this);
-		this.model.on("HideDependencies:clicked",	function (optName)			{											this.trigger("hideDependencies",	this.model.get("id"), optName)	},	this);
+		this.model.on("ShowDependencies:clicked",	function (optName, show)	{											this.trigger("showDependencies",	this.model.get("id"), optName, show)	},	this);
 		this.$el.on("changed:userData",	this, this.onUserDataChanged);
 	},
 
diff --git a/Desktop/html/js/collection.js b/Desktop/html/js/collection.js
@@ -87,9 +87,7 @@ JASPWidgets.collectionView = JASPWidgets.View.extend({
 		return true;
 	},
 
-	showDependenciesClicked:	function()  { this.model.trigger("ShowDependencies:clicked", this.model.get("name")); },
-	hideDependenciesClicked:	function()  { this.model.trigger("HideDependencies:clicked", this.model.get("name")); },
-
+	showDependenciesClicked:	function(show)  { this.model.trigger("ShowDependencies:clicked", this.model.get("name"), show); },
 	collapseMenuClicked:		function()  { this.setCollapsedState(!this.model.get('collapsed'));	},
 	noteOptions:				function()  { return [ { key: this.noteBoxKey, visible: this.noteBox.visible } ];			},
 	hasNotes:					function()  { return this.model.get('name') !== null;															},
diff --git a/Desktop/html/js/image.js b/Desktop/html/js/image.js
@@ -44,8 +44,7 @@ JASPWidgets.imageView = JASPWidgets.objectView.extend({
 	hasCollapse:				function() {	return this.$el.hasClass('jasp-collection-item')	=== false;	},
 	saveImageClicked:			function() {	this.model.trigger("SaveImage:clicked",							{ data: this.model.get("data"), width: this.model.get("width"), height: this.model.get("height"), name: this.model.get("name")							});	},
 	editImageClicked:			function() {	this.model.trigger("EditImage:clicked",			this.myView,	{ data: this.model.get("data"), width: this.model.get("width"), height: this.model.get("height"), name: this.model.get("name"), title: this.model.get("title"), type: "interactive"		});	},
-	showDependenciesClicked:	function() {	this.model.trigger("ShowDependencies:clicked",	this.model.get("name")); },
-	hideDependenciesClicked:	function() {	this.model.trigger("HideDependencies:clicked",	this.model.get("name")); },
+	showDependenciesClicked:	function(show) {	this.model.trigger("ShowDependencies:clicked",	this.model.get("name"), show); },
 
 
 	menuName:			"Plot",
diff --git a/Desktop/html/js/main.js b/Desktop/html/js/main.js
@@ -145,13 +145,13 @@ $(document).ready(function () {
 	window.editImageClicked			= function () { window.menuObjectFunctionCaller( window.menuObject.editImageClicked			.bind(window.menuObject) ); }
 	window.editTitleMenuClicked		= function () { window.menuObjectFunctionCaller( window.menuObject.editTitleClicked			.bind(window.menuObject) ); }
 	window.collapseMenuClicked		= function () { window.menuObjectFunctionCaller( window.menuObject.collapseMenuClicked		.bind(window.menuObject) ); }
-	window.showDependenciesClicked	= function () { window.menuObjectFunctionCaller( window.menuObject.showDependenciesClicked	.bind(window.menuObject) ); }
-	window.hideDependenciesClicked	= function () { window.menuObjectFunctionCaller( window.menuObject.hideDependenciesClicked	.bind(window.menuObject) ); }
 	window.duplicateMenuClicked		= function () { window.menuObjectFunctionCaller( window.menuObject.duplicateMenuClicked		.bind(window.menuObject) ); }
 	window.removeMenuClicked		= function () { window.menuObjectFunctionCaller( window.menuObject.removeMenuClicked		.bind(window.menuObject) ); }
 	window.citeMenuClicked			= function () { window.menuObjectFunctionCaller( window.menuObject.citeMenuClicked			.bind(window.menuObject),	"Citations copied to clipboard"	); }
 	window.latexCodeMenuClicked		= function () { window.menuObjectFunctionCaller( window.menuObject.latexCodeMenuClicked		.bind(window.menuObject),	"LaTeX code copied to clipboard"); }
 
+	window.showDependenciesClicked	= function (show) { window.menuObject.showDependenciesClicked(show); }
+
 	window.notesMenuClicked = function (noteType, visibility) {
 		if (window.menuObject.notesMenuClicked && window.menuObject.notesMenuClicked(noteType, visibility))
 			window.menuObject.toolbar.displayMessage();
@@ -471,8 +471,7 @@ $(document).ready(function () {
 			jaspWidget.on("optionschanged",				function (id, options)	{ jasp.analysisChangedDownstream(id, JSON.stringify(options))	});
 			jaspWidget.on("saveimage",					function (id, options)	{ jasp.analysisSaveImage(id, JSON.stringify(options))			});
 			jaspWidget.on("editimage",					function (id, options)	{ jasp.analysisEditImage(id, JSON.stringify(options))			});
-			jaspWidget.on("showDependencies",			function (id, optName)	{ jasp.showDependenciesInAnalysis(id, optName);					});
-			jaspWidget.on("hideDependencies",			function (id, optName)	{ jasp.hideDependenciesInAnalysis(id, optName);					});
+			jaspWidget.on("showDependencies",			function (id, optName, show)	{ jasp.showDependenciesInAnalysis(id, optName, show);	});
 			jaspWidget.on("analysis:remove",			function (id)			{ jasp.removeAnalysisRequest(id);								});
 			jaspWidget.on("analysis:duplicate",			function (id)			{ jasp.duplicateAnalysis(id);									});
 			jaspWidget.on("analysis:userDataChanged",	function ()				{ window.getAllUserData();										});
diff --git a/Desktop/html/js/object.js b/Desktop/html/js/object.js
@@ -72,8 +72,7 @@ JASPWidgets.objectConstructor = function (results, params, ignoreEvents) {
 	itemModel.on("CustomOptions:changed",		function (options)			{ this.trigger("CustomOptions:changed",		options)		}, this.model);
 	itemModel.on("SaveImage:clicked",			function (options)			{ this.trigger("SaveImage:clicked",			options)		}, this.model);
 	itemModel.on("EditImage:clicked",			function (image, options)	{ this.trigger("EditImage:clicked",			image, options)	}, this.model);
-	itemModel.on("ShowDependencies:clicked",	function (options)			{ this.trigger("ShowDependencies:clicked",	options)		}, this.model);
-	itemModel.on("HideDependencies:clicked",	function (options)			{ this.trigger("HideDependencies:clicked",	options)		}, this.model);
+	itemModel.on("ShowDependencies:clicked",	function (options, show)	{ this.trigger("ShowDependencies:clicked",	options, show)	}, this.model);
 	itemModel.on("analysis:resizeStarted",		function (image)			{ this.trigger("analysis:resizeStarted",	image)			}, this.model);
 
 	if (!ignoreEvents) { this.listenTo(itemView, "toolbar:showMenu", function (obj, options) { this.trigger("toolbar:showMenu", obj, options); }); }
diff --git a/Desktop/html/js/table.js b/Desktop/html/js/table.js
@@ -37,8 +37,7 @@ JASPWidgets.tableView = JASPWidgets.objectView.extend({
 		return true;
 	},
 
-	showDependenciesClicked: function() { this.model.trigger("ShowDependencies:clicked", this.model.get("name")); },
-	hideDependenciesClicked: function() { this.model.trigger("HideDependencies:clicked", this.model.get("name")); },
+	showDependenciesClicked: function(show) { this.model.trigger("ShowDependencies:clicked", this.model.get("name"), show); },
 
 	hasLaTeXCode: function () {
 	  var optLaTeXCode = this.model.get("latexCode");
diff --git a/Desktop/mainwindow.cpp b/Desktop/mainwindow.cpp
@@ -327,7 +327,6 @@ void MainWindow::makeConnections()
 	connect(_resultsJsInterface,	&ResultsJsInterface::analysisTitleChangedInResults,	_analyses,				&Analyses::analysisTitleChangedInResults					);
 	connect(_resultsJsInterface,	&ResultsJsInterface::duplicateAnalysis,				_analyses,				&Analyses::duplicateAnalysis								);
 	connect(_resultsJsInterface,	&ResultsJsInterface::showDependenciesInAnalysis,	_analyses,				&Analyses::showDependenciesInAnalysis						);
-	connect(_resultsJsInterface,	&ResultsJsInterface::hideDependenciesInAnalysis,	_analyses,				&Analyses::hideDependenciesInAnalysis						);
 	connect(_resultsJsInterface,	&ResultsJsInterface::showPlotEditor,				_plotEditorModel,		&PlotEditorModel::showPlotEditor							);
 	connect(_resultsJsInterface,	&ResultsJsInterface::resultsMetaChanged,			_analyses,				&Analyses::resultsMetaChanged								);
 	connect(_resultsJsInterface,	&ResultsJsInterface::allUserDataChanged,			_analyses,				&Analyses::allUserDataChanged								);
diff --git a/Desktop/results/resultmenumodel.cpp b/Desktop/results/resultmenumodel.cpp
@@ -49,7 +49,6 @@ void ResultMenuModel::_generateCorrectlyTranslatedResultEntries()
 		{	"hasRefreshAllAnalyses",	ResultMenuEntry(tr("Refresh All"),			"hasRefreshAllAnalyses",	"",							"")									},
 		{	"hasShowDeps",				ResultMenuEntry(tr("Show Dependencies"),	"hasShowDeps",				"",							"window.showDependenciesClicked()")	},
 		{	"hasExportResults",			ResultMenuEntry(tr("Export Results"),		"hasExportResults",			"",							"")									},
-		{	"hasHideDeps",				ResultMenuEntry(tr("Hide Dependencies"),	"hasHideDeps",				"",							"window.hideDependenciesClicked()")	}
 	};
 }
 
@@ -129,17 +128,10 @@ void ResultMenuModel::setOptions(QString options, QStringList selected)
 		{
 			if (Settings::value(Settings::DEVELOPER_MODE).toBool())
 			{
-				//It's developerMode time!
-				if (!_dependenciesShown)
-				{
-					entries.push_back(separator);
-					entries.push_back(entry);
-				}
-				else
-				{
-					entries.push_back(separator);
-					entries.push_back(_allResultEntries.find("hasHideDeps")->second);
-				}
+                entry.setDisplayText(_dependenciesShown ? "Hide Dependencies" : "Show Dependencies");
+                entry.setJSFunction(QString("window.showDependenciesClicked(%1)").arg(_dependenciesShown ? "false" : "true"));
+                entries.push_back(separator);
+                entries.push_back(entry);
 			}
 		}
 		else
diff --git a/Desktop/results/resultsjsinterface.h b/Desktop/results/resultsjsinterface.h
@@ -80,7 +80,7 @@ class ResultsJsInterface : public QObject
 	Q_INVOKABLE void analysisTitleChangedInResults(	int id, QString title);
 	Q_INVOKABLE void removeAnalysisRequest(			int id);
 	Q_INVOKABLE void duplicateAnalysis(				int id);
-	Q_INVOKABLE void showDependenciesInAnalysis(	int id, QString optionName);
+	Q_INVOKABLE void showDependenciesInAnalysis(	int id, QString optionName, bool show);
 	Q_INVOKABLE void hideDependenciesInAnalysis(	int id, QString optionName);
 	Q_INVOKABLE void packageModified();
 	Q_INVOKABLE void refreshAllAnalyses();

Original file line number	Diff line number	Diff line change
`@@ -734,19 +734,19 @@ void Analyses::duplicateAnalysis(size_t id)`
`734`	`734`	`analysis->refresh();`
`735`	`735`	`}`
`736`	`736`
`737`		`-void Analyses::showDependenciesInAnalysis(size_t analysis_id, QString optionName)`
	`737`	`+void Analyses::showDependenciesInAnalysis(size_t analysis_id, QString optionName, bool show)`
`738`	`738`	`{`
`739`	`739`	`if(!get(analysis_id)) return;`
`740`	`740`
`741`		`- get(analysis_id)->showDependenciesOnQMLForObject(optionName);`
`742`		`-}`
`743`		`-`
`744`		`-void Analyses::hideDependenciesInAnalysis(size_t analysis_id, QString optionName)`
`745`		`-{`
`746`		`- //just hide it for all analysis, probably desired`
`747`		`- for (auto& analysis : _analysisMap)`
	`741`	`+ if(show)`
	`742`	`+ get(analysis_id)->showDependenciesOnQMLForObject(optionName);`
	`743`	`+ else`
`748`	`744`	`{`
`749`		`- analysis.second->hideDependencies();`
	`745`	`+ //just hide it for all analysis, probably desired`
	`746`	`+ for (auto& analysis : _analysisMap)`
	`747`	`+ {`
	`748`	`+ analysis.second->hideDependencies();`
	`749`	`+ }`
`750`	`750`	`}`
`751`	`751`	`}`
`752`	`752`