GIT_REPOSITORIES/LPP/Users/mperrinel/SciQLop-fork Commit - r853:1ba93038a6bd

Move the GRAPH_MINIMUM_HEIGHT constant in a place accessible everywhere and use it in the drag&drop

trabillard -

r853:1ba93038a6bd

parent child

Context file:

r853:1ba93038a6bd

gui/include/Common/VisualizationDef.h created 644 +7 0

@@ -0,0 +1,7
	1	#ifndef SCIQLOP_VISUALIZATIONDEF_H
	2	#define SCIQLOP_VISUALIZATIONDEF_H
	3
	4	/// Minimum height for graph added in zones (in pixels)
	5	extern const int GRAPH_MINIMUM_HEIGHT;
	6
	7	#endif // SCIQLOP_VISUALIZATIONDEF_H

gui/src/Common/VisualizationDef.cpp created 644 +3 0

@@ -0,0 +1,3
	1	#include "Common/VisualizationDef.h"
	2
	3	const int GRAPH_MINIMUM_HEIGHT = 300;

gui/src/DragDropHelper.cpp +1 -1

                         // Configuration of the placeHolder when there is no dragWidget
                         // (for instance with a drag from a variable)
-                        m_PlaceHolder->setMinimumSize(400, 300);
+                        m_PlaceHolder->setMinimumSize(0, GRAPH_MINIMUM_HEIGHT);
                         m_PlaceHolder->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
                     }
                 }

gui/src/Visualization/VisualizationDragDropContainer.cpp +4 -1

             #include "SqpApplication.h"
             #include "Visualization/VisualizationDragWidget.h"
+            #include "Common/VisualizationDef.h"
             #include <QDrag>
             #include <QDragEnterEvent>
             #include <QVBoxLayout>
                         auto nbDragWidget = countDragWidget();
                         if (nbDragWidget > 0) {
-                            auto graphHeight = size().height() / nbDragWidget;
+                            auto graphHeight = qMax(size().height() / nbDragWidget, GRAPH_MINIMUM_HEIGHT);
                             auto dropIndex = floor(event->pos().y() / graphHeight);
                             auto zoneSize = qMin(graphHeight / 3.0, 150.0);

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

             #include "ui_VisualizationZoneWidget.h"
             #include "Common/MimeTypesDef.h"
+            #include "Common/VisualizationDef.h"
             #include <Data/SqpRange.h>
             #include <Variable/Variable.h>
             #include <Variable/VariableController.h>
             namespace {
-            /// Minimum height for graph added in zones (in pixels)
-            const auto GRAPH_MINIMUM_HEIGHT = 300;
             /// Generates a default name for a new graph, according to the number of graphs already displayed in
             /// the zone

General Comments 1

trabillard

|

Auto status change to "Under Review"

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

No TODOs yet

	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