GIT_REPOSITORIES/LPP/Users/mperrinel/SciQLop-fork Commit - r844:a582bf0b199a

Manage drag&drop of empty graphs

trabillard -

r844:a582bf0b199a

parent child

Context file:

r844:a582bf0b199a

gui/include/Visualization/VisualizationTabWidget.h +7 0

                  */
                 VisualizationZoneWidget *createZone(const QList<std::shared_ptr<Variable>>& variables, int index);
+                /**
+                 * Creates a zone which is empty (no variables). The zone is inserted at the specified index.
+                 * @param index The index where the zone should be inserted in the layout
+                 * @return the pointer to the created zone
+                 */
+                VisualizationZoneWidget *createEmptyZone(int index);
                 // IVisualizationWidget interface
                 void accept(IVisualizationWidgetVisitor *visitor) override;
                 bool canDrop(const Variable &variable) const override;

gui/src/Visualization/VisualizationTabWidget.cpp +32 -3

             #include "Visualization/VisualizationZoneWidget.h"
             #include "Visualization/VisualizationGraphWidget.h"
+            #include "Variable/VariableController.h"
             #include "SqpApplication.h"
             #include "DragDropHelper.h"
             VisualizationZoneWidget *VisualizationTabWidget::createZone(const QList<std::shared_ptr<Variable> > &variables, int index)
             {
-                auto zoneWidget = new VisualizationZoneWidget{defaultZoneName(*ui->dragDropContainer->layout()), this};
+                auto zoneWidget = createEmptyZone(index);
-                this->insertZone(index, zoneWidget);
                 // Creates a new graph into the zone
                 zoneWidget->createGraph(variables, index);
                 return zoneWidget;
             }
+            VisualizationZoneWidget *VisualizationTabWidget::createEmptyZone(int index)
+            {
+                auto zoneWidget = new VisualizationZoneWidget{defaultZoneName(*ui->dragDropContainer->layout()), this};
+                this->insertZone(index, zoneWidget);
+                return zoneWidget;
+            }
             void VisualizationTabWidget::accept(IVisualizationWidgetVisitor *visitor)
             {
                 if (visitor) {
                     Q_ASSERT(parentDragDropContainer);
                     auto nbGraph = parentDragDropContainer->countDragWidget();
+                    const auto& variables = graphWidget->variables();
+                    if (!variables.isEmpty())
+                    {
                         if (nbGraph == 1)
                         {
                             //This is the only graph in the previous zone, close the zone
                             graphWidget->close();
                         }
-                    const auto& variables = graphWidget->variables();
                         createZone(variables, index);
                     }
+                    else
+                    {
+                        //The graph is empty, create an empty zone and move the graph inside
+                        auto parentZoneWidget = graphWidget->parentZoneWidget();
+                        parentDragDropContainer->layout()->removeWidget(graphWidget);
+                        auto zoneWidget = createEmptyZone(index);
+                        zoneWidget->addGraph(graphWidget);
+                        //Close the old zone if it was the only graph inside
+                        if (nbGraph == 1)
+                            parentZoneWidget->close();
+                    }
+                }
                 else if (mimeData->hasFormat(DragDropHelper::MIME_TYPE_ZONE))
                 {
                     //Simple move of the zone, no variable operation associated

gui/src/Visualization/VisualizationZoneWidget.cpp +17 -5

                     const auto& variables = graphWidget->variables();
-                    if (!variables.empty())
+                    if (parentDragDropContainer != ui->dragDropContainer && !variables.isEmpty())
-                        if (parentDragDropContainer != ui->dragDropContainer)
                     {
                         //The drop didn't occur in the same zone
                     }
                     else
                     {
-                            //The drop occurred in the same zone
+                        //The drop occurred in the same zone or the graph is empty
                         //Simple move of the graph, no variable operation associated
                         parentDragDropContainer->layout()->removeWidget(graphWidget);
-                            ui->dragDropContainer->insertDragWidget(index, graphWidget);
+                        if (variables.isEmpty() && parentDragDropContainer != ui->dragDropContainer)
+                        {
+                            // The graph is empty and dropped in a different zone.
+                            // Take the range of the first graph in the zone (if existing).
+                            auto layout = ui->dragDropContainer->layout();
+                            if (layout->count() > 0)
+                            {
+                                if (auto visualizationGraphWidget = qobject_cast<VisualizationGraphWidget *>(layout->itemAt(0)->widget()))
+                                {
+                                    graphWidget->setGraphRange(visualizationGraphWidget->graphRange());
+                                }
+                            }
                         }
+                        ui->dragDropContainer->insertDragWidget(index, graphWidget);
                     }
                 }
             }

General Comments 6

trabillard

|

Pull request updated. Auto status change to "Under Review"

Changed commits:
  * 1 added
  * 0 removed

Changed files:
  * M gui/include/DragDropHelper.h
  * M gui/include/Visualization/VisualizationDragDropContainer.h
  * M gui/include/Visualization/VisualizationDragWidget.h
  * M gui/src/DragDropHelper.cpp
  * M gui/src/Visualization/VisualizationDragDropContainer.cpp
  * M gui/src/Visualization/VisualizationDragWidget.cpp
  * M gui/include/SqpApplication.h
  * M gui/include/Visualization/VisualizationGraphWidget.h
  * M gui/include/Visualization/VisualizationTabWidget.h
  * M gui/include/Visualization/VisualizationZoneWidget.h
  * M gui/src/SqpApplication.cpp
  * M gui/src/Visualization/VisualizationGraphWidget.cpp
  * M gui/src/Visualization/VisualizationTabWidget.cpp
  * M gui/src/Visualization/VisualizationZoneWidget.cpp
  * R core/include/Variable/VariableCacheStrategyFactory.h
  * R core/include/Variable/VariableSingleThresholdCacheStrategy.h
  * R core/tests/Variable/TestVariableSync.cpp
  * R plugins/amda/tests-resources/TestAmdaResultParser/amdaV2/FileNotFound.txt
  * R plugins/amda/tests-resources/TestAmdaResultParser/amdaV2/NaNValue.txt
  * R plugins/amda/tests-resources/TestAmdaResultParser/amdaV2/NaNX.txt
  * R plugins/amda/tests-resources/TestAmdaResultParser/amdaV2/NoUnit.txt
  * R plugins/amda/tests-resources/TestAmdaResultParser/amdaV2/TooManyValues.txt
  * R plugins/amda/tests-resources/TestAmdaResultParser/amdaV2/ValidScalar1.txt
  * R plugins/amda/tests-resources/TestAmdaResultParser/amdaV2/ValidVector1.txt
  * R plugins/amda/tests-resources/TestAmdaResultParser/amdaV2/WrongDate.txt
  * R plugins/amda/tests-resources/TestAmdaResultParser/amdaV2/WrongUnit.txt
  * R plugins/amda/tests-resources/TestAmdaResultParser/amdaV2/WrongValue.txt
  * R plugins/mockplugin/include/MockDefs.h
  * R plugins/mockplugin/src/MockDefs.cpp
  * R core/include/Data/DataSeries.h
  * R core/include/Data/IDataSeries.h
  * R core/include/Data/VariableRequest.h
  * R core/include/Variable/Variable.h
  * R core/include/Variable/VariableCacheStrategy.h
  * R core/include/Variable/VariableController.h
  * R core/meson.build
  * R core/src/Data/VectorSeries.cpp
  * R core/src/Variable/Variable.cpp
  * R core/src/Variable/VariableAcquisitionWorker.cpp
  * R core/src/Variable/VariableController.cpp
  * R core/tests/Data/TestDataSeries.cpp
  * R core/tests/Variable/TestVariable.cpp
  * R core/tests/meson.build
  * R gui/meson.build
  * R gui/src/Variable/VariableInspectorWidget.cpp
  * R gui/src/Visualization/operations/RescaleAxeOperation.cpp
  * R plugins/amda/src/AmdaProvider.cpp
  * R plugins/amda/src/AmdaResultParser.cpp
  * R plugins/amda/tests/TestAmdaAcquisition.cpp
  * R plugins/amda/tests/TestAmdaResultParser.cpp
  * R plugins/mockplugin/include/CosinusProvider.h
  * R plugins/mockplugin/meson.build
  * R plugins/mockplugin/src/CosinusProvider.cpp
  * R plugins/mockplugin/src/MockPlugin.cpp
  * R plugins/mockplugin/tests/TestCosinusAcquisition.cpp
  * R core/src/Variable/VariableCacheStrategy.cpp

trabillard

|

Pull request updated. Auto status change to "Under Review"

Changed commits:
  * 1 added
  * 0 removed

Changed files:
  * M gui/include/Visualization/VisualizationDragDropContainer.h
  * M gui/include/Visualization/VisualizationDragWidget.h
  * M gui/src/Visualization/VisualizationDragDropContainer.cpp
  * M gui/src/Visualization/VisualizationGraphWidget.cpp
  * M gui/src/Visualization/VisualizationZoneWidget.cpp

perrinel

|

Status change > Approved

Write
Preview

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

		Status change > Approved
		Pull request updated. Auto status change to \|under_review\|...
		Status change > Approved
		Pull request updated. Auto status change to \|under_review\|...
		Pull request updated. Auto status change to \|under_review\|...
		Auto status change to \|new_status\|...

	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