add hide dependencies to resultmenu

Desktop/analysis/analyses.cpp

@@ -741,6 +741,15 @@ void Analyses::showDependenciesInAnalysis(size_t analysis_id, QString optionName
 	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)
+	{
+		analysis.second->hideDependencies();
+	}
+}
+
 void Analyses::analysisTitleChangedHandler(string moduleName, string oldTitle, string newTitle)
 {
 	applyToAll([&](Analysis * a)

Desktop/analysis/analyses.h

@@ -130,6 +130,7 @@ public slots:
 	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 analysisTitleChangedHandler(std::string moduleName, std::string oldTitle, std::string newTitlesendRScriptHandler);
 	void prepareForLanguageChange();
 	void languageChangedHandler();

Desktop/analysis/analysis.cpp

@@ -574,6 +574,13 @@ void Analysis::showDependenciesOnQMLForObject(QString uniqueName)
 	processResultsForDependenciesToBeShown();
 }
 
+void Analysis::hideDependencies()
+{
+	_analysisForm->setMustBe({});
+	_analysisForm->setMustContain({});
+}
+
+
 bool Analysis::processResultsForDependenciesToBeShownMetaTraverser(const Json::Value & array)
 {
 	if(!array.isArray())

Desktop/analysis/analysis.h

@@ -188,6 +188,7 @@ public slots:
 	void					setDynamicModule(	Modules::DynamicModule * module);
 	void					emitDuplicationSignals();
 	void					showDependenciesOnQMLForObject(QString uniqueName); //uniqueName is basically "name" in meta in results.
+	void					hideDependencies();
 	void					boundValueChangedHandler()																	override;
 	void					requestComputedColumnCreationHandler(	const std::string & columnName)						override;
 	void					requestColumnCreationHandler(			const std::string & columnName, columnType colType)	override	{ emit requestColumnCreation(columnName, this, colType); }

Desktop/components/JASP/Widgets/MainPage.qml

@@ -339,7 +339,8 @@ 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)	}
+				function showDependenciesInAnalysis(id, optName)	{ resultsJsInterface.showDependenciesInAnalysis(id, optName); resultMenuModel.setDependenciesShown(true)	}
+				function hideDependenciesInAnalysis(id, optName)	{ resultsJsInterface.hideDependenciesInAnalysis(id, optName); resultMenuModel.setDependenciesShown(false)	}
 
 				function showAnalysesMenu(options)
 				{

Desktop/html/js/analysis.js

@@ -102,7 +102,7 @@ JASPWidgets.AnalysisView = JASPWidgets.View.extend({
 		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.$el.on("changed:userData",	this, this.onUserDataChanged);
 	},
 

Desktop/html/js/collection.js

@@ -88,6 +88,8 @@ JASPWidgets.collectionView = JASPWidgets.View.extend({
 	},
 
 	showDependenciesClicked:	function()  { this.model.trigger("ShowDependencies:clicked", this.model.get("name")); },
+	hideDependenciesClicked:	function()  { this.model.trigger("HideDependencies:clicked", this.model.get("name")); },
+
 	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;															},

Desktop/html/js/image.js

@@ -45,6 +45,8 @@ JASPWidgets.imageView = JASPWidgets.objectView.extend({
 	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")); },
+
 
 	menuName:			"Plot",
 	myView:				undefined,

Desktop/html/js/jaspwidgets.js

@@ -967,6 +967,7 @@ JASPWidgets.Toolbar = JASPWidgets.View.extend({
 			hasRemove:				(parent.hasRemove		=== undefined || parent.hasRemove())		&& parent.removeMenuClicked			!== undefined,
 			hasDuplicate:			(parent.hasDuplicate	=== undefined || parent.hasDuplicate())		&& parent.duplicateMenuClicked		!== undefined,
 			hasShowDeps:			(parent.hasShowDeps		=== undefined || parent.hasShowDeps())		&& parent.showDependenciesClicked	!== undefined,
+			hasHideDeps:			true,
 			hasCollapse:			(parent.hasCollapse		=== undefined || parent.hasCollapse())		&& parent.collapseMenuClicked		!== undefined,
 			hasLaTeXCode:			(parent.hasLaTeXCode	=== undefined || parent.hasLaTeXCode())		&& parent.latexCodeMenuClicked		!== undefined,
 			hasRemoveAllAnalyses:	parent.menuName			=== 'All',

Desktop/html/js/main.js

@@ -146,6 +146,7 @@ $(document).ready(function () {
 	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"	); }
@@ -471,6 +472,7 @@ $(document).ready(function () {
 			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("analysis:remove",			function (id)			{ jasp.removeAnalysisRequest(id);								});
 			jaspWidget.on("analysis:duplicate",			function (id)			{ jasp.duplicateAnalysis(id);									});
 			jaspWidget.on("analysis:userDataChanged",	function ()				{ window.getAllUserData();										});

Desktop/html/js/object.js

@@ -73,6 +73,7 @@ JASPWidgets.objectConstructor = function (results, params, ignoreEvents) {
 	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("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); }); }

Desktop/html/js/table.js

@@ -38,6 +38,7 @@ JASPWidgets.tableView = JASPWidgets.objectView.extend({
 	},
 
 	showDependenciesClicked: function() { this.model.trigger("ShowDependencies:clicked", this.model.get("name")); },
+	hideDependenciesClicked: function() { this.model.trigger("HideDependencies:clicked", this.model.get("name")); },
 
 	hasLaTeXCode: function () {
 	  var optLaTeXCode = this.model.get("latexCode");

Desktop/mainwindow.cpp

@@ -327,6 +327,7 @@ 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								);

Desktop/results/resultmenumodel.cpp

@@ -48,8 +48,9 @@ void ResultMenuModel::_generateCorrectlyTranslatedResultEntries()
 		{	"hasRemoveAllAnalyses",		ResultMenuEntry(tr("Remove All"),			"hasRemoveAllAnalyses",		"close-button.png",			"")									},
 		{	"hasRefreshAllAnalyses",	ResultMenuEntry(tr("Refresh All"),			"hasRefreshAllAnalyses",	"",							"")									},
 		{	"hasShowDeps",				ResultMenuEntry(tr("Show Dependencies"),	"hasShowDeps",				"",							"window.showDependenciesClicked()")	},
-		{	"hasExportResults",			ResultMenuEntry(tr("Export Results"),		"hasExportResults",			"",							"")									}
-   };
+		{	"hasExportResults",			ResultMenuEntry(tr("Export Results"),		"hasExportResults",			"",							"")									},
+		{	"hasHideDeps",				ResultMenuEntry(tr("Hide Dependencies"),	"hasHideDeps",				"",							"window.hideDependenciesClicked()")	}
+	};
 }
 
 QVariant ResultMenuModel::data(const QModelIndex &index, int role) const
@@ -126,11 +127,19 @@ void ResultMenuModel::setOptions(QString options, QStringList selected)
 		}
 		else if (key == "hasShowDeps")
 		{
-			if(Settings::value(Settings::DEVELOPER_MODE).toBool())
+			if (Settings::value(Settings::DEVELOPER_MODE).toBool())
 			{
 				//It's developerMode time!
-				entries.push_back(separator);
-				entries.push_back(entry);
+				if (!_dependenciesShown)
+				{
+					entries.push_back(separator);
+					entries.push_back(entry);
+				}
+				else
+				{
+					entries.push_back(separator);
+					entries.push_back(_allResultEntries.find("hasHideDeps")->second);
+				}
 			}
 		}
 		else

Desktop/results/resultmenumodel.h

@@ -51,6 +51,7 @@ class ResultMenuModel : public QAbstractListModel
 	Q_INVOKABLE void						setOptions(QString, QStringList);
 	Q_INVOKABLE QString						getJSFunction(int index)									const			{	return _resultMenuEntries.at(index).jsFunction();	}
 	Q_INVOKABLE QString						getName(int index)											const			{	return _resultMenuEntries.at(index).name();			}
+	Q_INVOKABLE void						setDependenciesShown(bool value)	{ _dependenciesShown = value; }
 
 private slots:
 	void									_generateCorrectlyTranslatedResultEntries();
@@ -59,6 +60,7 @@ private slots:
 	std::vector<ResultMenuEntry>			_resultMenuEntries;
 	std::map<QString, ResultMenuEntry>		_allResultEntries;
 	QStringList								_entriesOrder;
+	bool _dependenciesShown = false;
 
 };
 

Desktop/results/resultsjsinterface.h

@@ -81,6 +81,7 @@ class ResultsJsInterface : public QObject
 	Q_INVOKABLE void removeAnalysisRequest(			int id);
 	Q_INVOKABLE void duplicateAnalysis(				int id);
 	Q_INVOKABLE void showDependenciesInAnalysis(	int id, QString optionName);
+	Q_INVOKABLE void hideDependenciesInAnalysis(	int id, QString optionName);
 	Q_INVOKABLE void packageModified();
 	Q_INVOKABLE void refreshAllAnalyses();
 	Q_INVOKABLE void removeAllAnalyses();