GIT_REPOSITORIES/LPP/Users/mperrinel/SciQLop-fork Commit - r737:e5aabf0f62fb

Handles desynchronisation when removing variable from a graph (1)...

Alexandre Leroux -

r737:e5aabf0f62fb

parent child

Context file:

r737:e5aabf0f62fb

Collapse all files

core/include/Variable/VariableController.h +5 -1

                 /// Cancel the current request for the variable
                 void onAbortProgressRequested(std::shared_ptr<Variable> variable);
-                /// synchronization group methods
+                // synchronization group methods
                 void onAddSynchronizationGroupId(QUuid synchronizationGroupId);
                 void onRemoveSynchronizationGroupId(QUuid synchronizationGroupId);
                 void onAddSynchronized(std::shared_ptr<Variable> variable, QUuid synchronizationGroupId);
+                /// Desynchronizes the variable of the group whose identifier is passed in parameter
+                /// @remarks the method does nothing if the variable is not part of the group
+                void desynchronize(std::shared_ptr<Variable> variable, QUuid synchronizationGroupId);
                 void initialize();
                 void finalize();

core/src/Variable/VariableController.cpp +30 0

@@ -389,6 +389,36 void VariableController::onAddSynchronized(std::shared_ptr<Variable> variable,
389	}	389	}
390	}	390	}
391		391
		392	void VariableController::desynchronize(std::shared_ptr<Variable> variable,
		393	QUuid synchronizationGroupId)
		394	{
		395	// Gets variable id
		396	auto variableIt = impl->m_VariableToIdentifierMap.find(variable);
		397	if (variableIt == impl->m_VariableToIdentifierMap.cend()) {
		398	qCCritical(LOG_VariableController())
		399	<< tr("Can't desynchronize variable %1: variable identifier not found")
		400	.arg(variable->name());
		401	return;
		402	}
		403
		404	// Gets synchronization group
		405	auto groupIt = impl->m_GroupIdToVariableSynchronizationGroupMap.find(synchronizationGroupId);
		406	if (groupIt == impl->m_GroupIdToVariableSynchronizationGroupMap.cend()) {
		407	qCCritical(LOG_VariableController())
		408	<< tr("Can't desynchronize variable %1: unknown synchronization group")
		409	.arg(variable->name());
		410	return;
		411	}
		412
		413	auto variableId = variableIt->second;
		414
		415	// Removes variable from synchronization group
		416	auto synchronizationGroup = groupIt->second;
		417	synchronizationGroup->removeVariableId(variableId);
		418
		419	// Removes link between variable and synchronization group
		420	impl->m_VariableIdGroupIdMap.erase(variableId);
		421	}
392		422
393	void VariableController::onRequestDataLoading(QVector<std::shared_ptr<Variable> > variables,	423	void VariableController::onRequestDataLoading(QVector<std::shared_ptr<Variable> > variables,
394	const SqpRange &range, const SqpRange &oldRange,	424	const SqpRange &range, const SqpRange &oldRange,

gui/include/Visualization/VisualizationGraphWidget.h +3 0

                 void requestDataLoading(QVector<std::shared_ptr<Variable> > variable, const SqpRange &range,
                                         const SqpRange &oldRange, bool synchronise);
+                /// Signal emitted when the variable is about to be removed from the graph
+                void variableAboutToBeRemoved(std::shared_ptr<Variable> var);
+                /// Signal emitted when the variable has been added to the graph
                 void variableAdded(std::shared_ptr<Variable> var);
             protected:

gui/include/Visualization/VisualizationZoneWidget.h +2 0

             private slots:
                 void onVariableAdded(std::shared_ptr<Variable> variable);
+                /// Slot called when a variable is about to be removed from a graph contained in the zone
+                void onVariableAboutToBeRemoved(std::shared_ptr<Variable> variable);
             };
             #endif // SCIQLOP_VISUALIZATIONZONEWIDGET_H

gui/src/Visualization/VisualizationGraphWidget.cpp +2 0

                 // - is no longer referenced in the map
                 auto variableIt = impl->m_VariableToPlotMultiMap.find(variable);
                 if (variableIt != impl->m_VariableToPlotMultiMap.cend()) {
+                    emit variableAboutToBeRemoved(variable);
                     auto &plottablesMap = variableIt->second;
                     for (auto plottableIt = plottablesMap.cbegin(), plottableEnd = plottablesMap.cend();

gui/src/Visualization/VisualizationZoneWidget.cpp +9 0

                 connect(graphWidget, &VisualizationGraphWidget::synchronize, synchronizeZoneWidget);
                 connect(graphWidget, &VisualizationGraphWidget::variableAdded, this,
                         &VisualizationZoneWidget::onVariableAdded);
+                connect(graphWidget, &VisualizationGraphWidget::variableAboutToBeRemoved, this,
+                        &VisualizationZoneWidget::onVariableAboutToBeRemoved);
                 auto range = SqpRange{};
                                           Qt::QueuedConnection, Q_ARG(std::shared_ptr<Variable>, variable),
                                           Q_ARG(QUuid, impl->m_SynchronisationGroupId));
             }
+            void VisualizationZoneWidget::onVariableAboutToBeRemoved(std::shared_ptr<Variable> variable)
+            {
+                QMetaObject::invokeMethod(&sqpApp->variableController(), "desynchronize", Qt::QueuedConnection,
+                                          Q_ARG(std::shared_ptr<Variable>, variable),
+                                          Q_ARG(QUuid, impl->m_SynchronisationGroupId));
+            }

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages