GIT_REPOSITORIES/LPP/Users/mperrinel/SciQLop-fork Commit - r887:f5851ce3ff09

Add an empty area at the bottom of the tab where a new zone can be created from a drop. Differentiate graph and zone placeHolders.

trabillard -

r887:f5851ce3ff09

parent child

Context file:

r887:f5851ce3ff09

Collapse all files

gui/include/DragDropHelper.h +4 -1

                 static const QString MIME_TYPE_GRAPH;
                 static const QString MIME_TYPE_ZONE;
+                enum class PlaceHolderType { Default, Graph, Zone };
                 DragDropHelper();
                 virtual ~DragDropHelper();
                 VisualizationDragWidget *getCurrentDragWidget() const;
                 QWidget &placeHolder() const;
-                void insertPlaceHolder(QVBoxLayout *layout, int index);
+                void insertPlaceHolder(QVBoxLayout *layout, int index, PlaceHolderType type,
+                                       const QString &topLabelText);
                 void removePlaceHolder();
                 bool isPlaceHolderSet() const;

gui/include/Visualization/VisualizationDragDropContainer.h +5 0

             #include <functional>
+            #include <DragDropHelper.h>
             Q_DECLARE_LOGGING_CATEGORY(LOG_VisualizationDragDropContainer)
             class VisualizationDragWidget;
                 void setAcceptMimeDataFunction(AcceptMimeDataFunction fun);
+                void setPlaceHolderType(DragDropHelper::PlaceHolderType type,
+                                        const QString &placeHolderText = QString());
             protected:
                 void dragEnterEvent(QDragEnterEvent *event);
                 void dragLeaveEvent(QDragLeaveEvent *event);

gui/src/DragDropHelper.cpp +36 -6

             #include <QDir>
             #include <QDragEnterEvent>
             #include <QDragMoveEvent>
+            #include <QLabel>
             #include <QScrollArea>
             #include <QScrollBar>
             #include <QTimer>
                 VisualizationDragWidget *m_CurrentDragWidget = nullptr;
                 std::unique_ptr<QWidget> m_PlaceHolder = nullptr;
+                QLabel *m_PlaceHolderLabel;
+                QWidget *m_PlaceBackground;
                 std::unique_ptr<DragDropScroller> m_DragDropScroller = nullptr;
                 QString m_ImageTempUrl; // Temporary file for image url generated by the drag & drop. Not using
                                         // QTemporaryFile to have a name which is not generated.
                         : m_PlaceHolder{std::make_unique<QWidget>()},
                           m_DragDropScroller{std::make_unique<DragDropScroller>()}
                 {
-                    m_PlaceHolder->setStyleSheet("background-color: #BBD5EE; border:2px solid #2A7FD4");
-                    sqpApp->installEventFilter(m_DragDropScroller.get());
+                    auto layout = new QVBoxLayout{m_PlaceHolder.get()};
+                    layout->setSpacing(0);
+                    layout->setContentsMargins(0, 0, 0, 0);
+                    m_PlaceHolderLabel = new QLabel{"", m_PlaceHolder.get()};
+                    m_PlaceHolderLabel->setMinimumHeight(25);
+                    layout->addWidget(m_PlaceHolderLabel);
+                    m_PlaceBackground = new QWidget{m_PlaceHolder.get()};
+                    m_PlaceBackground->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
+                    layout->addWidget(m_PlaceBackground);
+                    sqpApp->installEventFilter(m_DragDropScroller.get());
                     m_ImageTempUrl = QDir::temp().absoluteFilePath("Sciqlop_graph.png");
                 }
-                void preparePlaceHolder() const
+                void preparePlaceHolder(DragDropHelper::PlaceHolderType type, const QString &topLabelText) const
                 {
                     if (m_CurrentDragWidget) {
                         m_PlaceHolder->setMinimumSize(m_CurrentDragWidget->size());
                         m_PlaceHolder->setMinimumSize(0, GRAPH_MINIMUM_HEIGHT);
                         m_PlaceHolder->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
                     }
+                    switch (type) {
+                        case DragDropHelper::PlaceHolderType::Graph:
+                            m_PlaceBackground->setStyleSheet(
+                                "background-color: #BBD5EE; border: 1px solid #2A7FD4");
+                            break;
+                        case DragDropHelper::PlaceHolderType::Zone:
+                        case DragDropHelper::PlaceHolderType::Default:
+                            m_PlaceBackground->setStyleSheet(
+                                "background-color: #BBD5EE; border: 2px solid #2A7FD4");
+                            m_PlaceHolderLabel->setStyleSheet("color: #2A7FD4");
+                            break;
+                    }
+                    m_PlaceHolderLabel->setText(topLabelText);
+                    m_PlaceHolderLabel->setVisible(!topLabelText.isEmpty());
                 }
             };
                 return impl->m_CurrentDragWidget;
             }
             QWidget &DragDropHelper::placeHolder() const
             {
                 return *impl->m_PlaceHolder;
             }
-            void DragDropHelper::insertPlaceHolder(QVBoxLayout *layout, int index)
+            void DragDropHelper::insertPlaceHolder(QVBoxLayout *layout, int index, PlaceHolderType type,
+                                                   const QString &topLabelText)
             {
                 removePlaceHolder();
-                impl->preparePlaceHolder();
+                impl->preparePlaceHolder(type, topLabelText);
                 layout->insertWidget(index, impl->m_PlaceHolder.get());
                 impl->m_PlaceHolder->show();
             }

gui/src/Visualization/VisualizationDragDropContainer.cpp +20 -9

                 QVBoxLayout *m_Layout;
                 QHash<QString, VisualizationDragDropContainer::DropBehavior> m_AcceptedMimeTypes;
+                QString m_PlaceHolderText;
+                DragDropHelper::PlaceHolderType m_PlaceHolderType = DragDropHelper::PlaceHolderType::Graph;
                 VisualizationDragDropContainer::AcceptMimeDataFunction m_AcceptMimeDataFun
                     = [](auto mimeData) { return true; };
                 impl->m_AcceptMimeDataFun = fun;
             }
+            void VisualizationDragDropContainer::setPlaceHolderType(DragDropHelper::PlaceHolderType type,
+                                                                    const QString &placeHolderText)
+            {
+                impl->m_PlaceHolderType = type;
+                impl->m_PlaceHolderText = placeHolderText;
+            }
             void VisualizationDragDropContainer::startDrag(VisualizationDragWidget *dragWidget,
                                                            const QPoint &dragPosition)
             {
                     if (impl->cursorIsInContainer(this)) {
                         auto dragWidgetIndex = impl->m_Layout->indexOf(dragWidget);
-                        helper.insertPlaceHolder(impl->m_Layout, dragWidgetIndex);
+                        helper.insertPlaceHolder(impl->m_Layout, dragWidgetIndex, impl->m_PlaceHolderType,
+                                                 impl->m_PlaceHolderText);
                         dragWidget->setVisible(false);
                     }
                     else {
                 if (countDragWidget(container, true) == 0) {
                     // Drop on an empty container, just add the placeHolder at the top
-                    helper.insertPlaceHolder(m_Layout, 0);
+                    helper.insertPlaceHolder(m_Layout, 0, m_PlaceHolderType, m_PlaceHolderText);
                 }
                 else if (!isOnPlaceHolder) {
                     auto nbDragWidget = countDragWidget(container);
                             }
                             if (dropIndex != placeHolderIndex) {
-                                helper.insertPlaceHolder(m_Layout, dropIndex);
+                                helper.insertPlaceHolder(m_Layout, dropIndex, m_PlaceHolderType,
+                                                         m_PlaceHolderText);
                             }
                             helper.setHightlightedDragWidget(nullptr);
                             helper.setHightlightedDragWidget(dragWidgetHovered);
                         }
                         else {
-                            qCWarning(LOG_VisualizationDragDropContainer()) << tr(
+                            qCWarning(LOG_VisualizationDragDropContainer())
-                                                                                   "VisualizationDragDropContainer::findPlaceHolderPosition, no valid drop "
+                                << tr("VisualizationDragDropContainer::findPlaceHolderPosition, no valid drop "
-                                                                                   "action.");
+                                      "action.");
                             Q_ASSERT(false);
                         }
                     }
                     else {
                         qCWarning(LOG_VisualizationDragDropContainer())
-                                << tr("VisualizationDragDropContainer::findPlaceHolderPosition, no widget "
+                            << tr("VisualizationDragDropContainer::findPlaceHolderPosition, no widget "
-                                      "found in the "
+                                  "found in the "
-                                      "container");
+                                  "container");
                     }
                 }
                 else {

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

             {
                 ui->setupUi(this);
+                ui->dragDropContainer->setPlaceHolderType(DragDropHelper::PlaceHolderType::Zone, "Zone");
+                ui->dragDropContainer->layout()->setContentsMargins(0, 0, 0, 5);
                 ui->dragDropContainer->addAcceptedMimeType(
                     MIME_TYPE_GRAPH, VisualizationDragDropContainer::DropBehavior::Inserted);
                 ui->dragDropContainer->addAcceptedMimeType(

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

                 ui->zoneNameLabel->setText(name);
+                ui->dragDropContainer->setPlaceHolderType(DragDropHelper::PlaceHolderType::Graph);
                 ui->dragDropContainer->addAcceptedMimeType(
                     MIME_TYPE_GRAPH, VisualizationDragDropContainer::DropBehavior::Inserted);
                 ui->dragDropContainer->addAcceptedMimeType(

General Comments 3

trabillard

|

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

Changed commits:
  * 1 added
  * 0 removed

Changed files:
  * A core/tests/meson.build

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