GIT_REPOSITORIES/LPP/Users/mperrinel/SciQLop-fork Commit - r1088:1eed201e150e

Keep the selection zones when a graph is dropped in another synchro zone

trabillard -

r1088:1eed201e150e

parent child

Context file:

r1088:1eed201e150e

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

                 SqpRange graphRange() const noexcept;
                 void setGraphRange(const SqpRange &range);
+                /// Returns the ranges of all the selection zones on the graph
+                QVector<SqpRange> selectionZoneRanges() const;
+                /// Adds new selection zones in the graph
+                void addSelectionZones(const QVector<SqpRange> &ranges);
                 /// Undo the last zoom  done with a zoom box
                 void undoZoom();

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

                 VisualizationGraphWidget *createGraph(const QList<std::shared_ptr<Variable> > variables,
                                                       int index);
+                /// Returns the first graph in the zone or nullptr if there is no graph inside
+                VisualizationGraphWidget *firstGraph() const;
                 // IVisualizationWidget interface
                 void accept(IVisualizationWidgetVisitor *visitor) override;
                 bool canDrop(const Variable &variable) const override;

gui/src/Visualization/VisualizationDragWidget.cpp +1 -1

             {
             }
-            virtual QPixmap VisualizationDragWidget::customDragPixmap(const QPoint &dragPosition)
+            QPixmap VisualizationDragWidget::customDragPixmap(const QPoint &dragPosition)
             {
                 Q_UNUSED(dragPosition);
                 return QPixmap();

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

@@ -335,6 +335,27 void VisualizationGraphWidget::setGraphRange(const SqpRange &range)
335	qCDebug(LOG_VisualizationGraphWidget()) << tr("VisualizationGraphWidget::setGraphRange END");	335	qCDebug(LOG_VisualizationGraphWidget()) << tr("VisualizationGraphWidget::setGraphRange END");
336	}	336	}
337		337
		338	QVector<SqpRange> VisualizationGraphWidget::selectionZoneRanges() const
		339	{
		340	QVector<SqpRange> ranges;
		341	for (auto zone : impl->m_SelectionZones) {
		342	ranges << zone->range();
		343	}
		344
		345	return ranges;
		346	}
		347
		348	void VisualizationGraphWidget::addSelectionZones(const QVector<SqpRange> &ranges)
		349	{
		350	for (const auto &range : ranges) {
		351	auto zone = new VisualizationSelectionZoneItem(&plot());
		352	zone->setRange(range.m_TStart, range.m_TEnd);
		353	impl->m_SelectionZones << zone;
		354	}
		355
		356	plot().replot(QCustomPlot::rpQueuedReplot);
		357	}
		358
338	void VisualizationGraphWidget::undoZoom()	359	void VisualizationGraphWidget::undoZoom()
339	{	360	{
340	auto zoom = impl->m_ZoomStack.pop();	361	auto zoom = impl->m_ZoomStack.pop();

gui/src/Visualization/VisualizationTabWidget.cpp +10 -1

@@ -255,7 +255,16 void VisualizationTabWidget::VisualizationTabWidgetPrivate::dropGraph(
255	helper.delayedCloseWidget(graphWidget);	255	helper.delayedCloseWidget(graphWidget);
256	}	256	}
257		257
258	tabWidget->createZone(variables, index);	258	auto zoneWidget = tabWidget->createZone(variables, index);
		259	auto firstGraph = zoneWidget->firstGraph();
		260	if (firstGraph) {
		261	firstGraph->addSelectionZones(graphWidget->selectionZoneRanges());
		262	}
		263	else {
		264	qCWarning(LOG_VisualizationZoneWidget())
		265	<< tr("VisualizationTabWidget::dropGraph, no graph added in the widget.");
		266	Q_ASSERT(false);
		267	}
259	}	268	}
260	else {	269	else {
261	// The graph is empty, create an empty zone and move the graph inside	270	// The graph is empty, create an empty zone and move the graph inside

gui/src/Visualization/VisualizationZoneWidget.cpp +18 -18

                 QUuid m_SynchronisationGroupId;
                 std::unique_ptr<IGraphSynchronizer> m_Synchronizer;
-                // Returns the first graph in the zone or nullptr if there is no graph inside
-                VisualizationGraphWidget *firstGraph(const VisualizationZoneWidget *zoneWidget) const
-                    VisualizationGraphWidget *firstGraph = nullptr;
-                    auto layout = zoneWidget->ui->dragDropContainer->layout();
-                    if (layout->count() > 0) {
-                        if (auto visualizationGraphWidget
-                            = qobject_cast<VisualizationGraphWidget *>(layout->itemAt(0)->widget())) {
-                            firstGraph = visualizationGraphWidget;
-                    return firstGraph;
                 void dropGraph(int index, VisualizationZoneWidget *zoneWidget);
                 void dropVariables(const QList<std::shared_ptr<Variable> > &variables, int index,
                                    VisualizationZoneWidget *zoneWidget);
                         &VisualizationZoneWidget::onVariableAboutToBeRemoved);
                 auto range = SqpRange{};
-                if (auto firstGraph = impl->firstGraph(this)) {
+                if (auto firstGraph = this->firstGraph()) {
                     // Case of a new graph in a existant zone
                     range = firstGraph->graphRange();
                 }
                 return graphWidget;
             }
+            VisualizationGraphWidget *VisualizationZoneWidget::firstGraph() const
+            {
+                VisualizationGraphWidget *firstGraph = nullptr;
+                auto layout = ui->dragDropContainer->layout();
+                if (layout->count() > 0) {
+                    if (auto visualizationGraphWidget
+                        = qobject_cast<VisualizationGraphWidget *>(layout->itemAt(0)->widget())) {
+                        firstGraph = visualizationGraphWidget;
+                    }
+                }
+                return firstGraph;
+            }
             void VisualizationZoneWidget::accept(IVisualizationWidgetVisitor *visitor)
             {
                 if (visitor) {
                 auto mimeData = new QMimeData;
                 mimeData->setData(MIME_TYPE_ZONE, QByteArray{});
-                if (auto firstGraph = impl->firstGraph(this)) {
+                if (auto firstGraph = this->firstGraph()) {
                     auto timeRangeData = TimeController::mimeDataForTimeRange(firstGraph->graphRange());
                     mimeData->setData(MIME_TYPE_TIME_RANGE, timeRangeData);
                 }
                     }
                     // Creates the new graph in the zone
-                    zoneWidget->createGraph(variables, index);
+                    auto newGraphWidget = zoneWidget->createGraph(variables, index);
+                    newGraphWidget->addSelectionZones(graphWidget->selectionZoneRanges());
                 }
                 else {
                     // The drop occurred in the same zone or the graph is empty

General Comments 3

trabillard

|

Auto status change to "Under Review"

perrinel

|

Status change > Approved

Write
Preview

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

	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