GIT_REPOSITORIES/LPP/Users/mperrinel/SciQLop-fork Commit - r1140:342312d662e7

Skeleton to fill the inspector with the selection

trabillard -

r1140:342312d662e7

parent child

Context file:

r1140:342312d662e7

gui/include/Catalogue/CatalogueEventsWidget.h +1 -1

             #ifndef SCIQLOP_CATALOGUEEVENTSWIDGET_H
             #define SCIQLOP_CATALOGUEEVENTSWIDGET_H
             #include <Common/spimpl.h>
             #include <QWidget>
             namespace Ui {
             class CatalogueEventsWidget;
             }
             class CatalogueEventsWidget : public QWidget {
                 Q_OBJECT
             signals:
-                void eventSelected();
+                void eventSelected(const QString &event);
             public:
                 explicit CatalogueEventsWidget(QWidget *parent = 0);
                 virtual ~CatalogueEventsWidget();
             public slots:
                 void populateWithCatalogue(const QString &catalogue);
             private:
                 Ui::CatalogueEventsWidget *ui;
                 class CatalogueEventsWidgetPrivate;
                 spimpl::unique_impl_ptr<CatalogueEventsWidgetPrivate> impl;
             };
             #endif // SCIQLOP_CATALOGUEEVENTSWIDGET_H

gui/include/Catalogue/CatalogueInspectorWidget.h +3 0

             #ifndef SCIQLOP_CATALOGUEINSPECTORWIDGET_H
             #define SCIQLOP_CATALOGUEINSPECTORWIDGET_H
             #include <QWidget>
             namespace Ui {
             class CatalogueInspectorWidget;
             }
             class CatalogueInspectorWidget : public QWidget {
                 Q_OBJECT
             public:
                 explicit CatalogueInspectorWidget(QWidget *parent = 0);
                 virtual ~CatalogueInspectorWidget();
                 /// Enum matching the pages inside the stacked widget
                 enum class Page { Empty, CatalogueProperties, EventProperties };
                 Page currentPage() const;
+                void setEvent(const QString &event);
+                void setCatalogue(const QString &catalogue);
             public slots:
                 void showPage(Page page);
             private:
                 Ui::CatalogueInspectorWidget *ui;
             };
             #endif // SCIQLOP_CATALOGUEINSPECTORWIDGET_H

gui/src/Catalogue/CatalogueEventsWidget.cpp +21 -2

             #include "Catalogue/CatalogueEventsWidget.h"
             #include "ui_CatalogueEventsWidget.h"
+            #include <QtDebug>
             struct CatalogueEventsWidget::CatalogueEventsWidgetPrivate {
                 void addEventItem(const QStringList &data, QTableWidget *tableWidget);
                 enum class Column { Event, TStart, TEnd, Tags, Product, NbColumn };
                 QStringList columnNames() { return QStringList{"Event", "TStart", "TEnd", "Tags", "Product"}; }
             };
             CatalogueEventsWidget::CatalogueEventsWidget(QWidget *parent)
                     : QWidget(parent),
                       ui(new Ui::CatalogueEventsWidget),
                       impl{spimpl::make_unique_impl<CatalogueEventsWidgetPrivate>()}
             {
                 ui->setupUi(this);
                 connect(ui->btnTime, &QToolButton::clicked, [this](auto checked) {
                     if (checked) {
                         ui->btnChart->setChecked(false);
                     }
                 });
                 connect(ui->btnChart, &QToolButton::clicked, [this](auto checked) {
                     if (checked) {
                         ui->btnTime->setChecked(false);
                     }
                 });
-                connect(ui->tableWidget, &QTableWidget::cellClicked,
+                connect(ui->tableWidget, &QTableWidget::cellClicked, [this](auto row, auto column) {
-                        [this](auto row, auto column) { emit this->eventSelected(); });
+                    auto event = ui->tableWidget->item(row, 0)->text();
+                    emit this->eventSelected(event);
+                });
+                connect(ui->tableWidget, &QTableWidget::currentItemChanged,
+                        [this](auto current, auto previous) {
+                            if (current && current->row() >= 0) {
+                                auto event = ui->tableWidget->item(current->row(), 0)->text();
+                                emit this->eventSelected(event);
+                            }
+                        });
+                connect(ui->tableWidget, &QTableWidget::itemSelectionChanged, [this]() {
+                    auto selection = ui->tableWidget->selectedRanges();
+                    auto isSingleSelection = selection.count() == 1 && selection.first().rowCount() == 1;
+                    ui->btnChart->setEnabled(isSingleSelection);
+                    ui->btnTime->setEnabled(isSingleSelection);
+                });
                 Q_ASSERT(impl->columnNames().count() == (int)CatalogueEventsWidgetPrivate::Column::NbColumn);
                 ui->tableWidget->setColumnCount((int)CatalogueEventsWidgetPrivate::Column::NbColumn);
                 ui->tableWidget->setHorizontalHeaderLabels(impl->columnNames());
                 ui->tableWidget->horizontalHeader()->setSectionResizeMode(QHeaderView::ResizeToContents);
                 ui->tableWidget->horizontalHeader()->setSectionResizeMode(0, QHeaderView::Stretch);
                 ui->tableWidget->horizontalHeader()->setSortIndicatorShown(true);
             }
             CatalogueEventsWidget::~CatalogueEventsWidget()
             {
                 delete ui;
             }
             void CatalogueEventsWidget::populateWithCatalogue(const QString &catalogue)
             {
                 ui->tableWidget->clearContents();
                 ui->tableWidget->setRowCount(0);
                 // TODO
                 impl->addEventItem(
                     {catalogue + " - Event 1", "12/12/2012 12:12", "12/12/2042 12:52", "cloud", "mfi/b_gse42"},
                     ui->tableWidget);
                 impl->addEventItem(
                     {catalogue + " - Event 2", "12/12/2012 12:10", "12/12/2042 12:42", "Acloud", "mfi/b_gse1"},
                     ui->tableWidget);
                 impl->addEventItem(
                     {catalogue + " - Event 3", "12/12/2012 12:22", "12/12/2042 12:12", "Gcloud", "mfi/b_gse2"},
                     ui->tableWidget);
                 impl->addEventItem(
                     {catalogue + " - Event 4", "12/12/2012 12:00", "12/12/2042 12:62", "Bcloud", "mfi/b_gse3"},
                     ui->tableWidget);
             }
             void CatalogueEventsWidget::CatalogueEventsWidgetPrivate::addEventItem(const QStringList &data,
                                                                                    QTableWidget *tableWidget)
             {
                 tableWidget->setSortingEnabled(false);
                 auto row = tableWidget->rowCount();
                 tableWidget->setRowCount(row + 1);
                 for (auto i = 0; i < (int)Column::NbColumn; ++i) {
                     auto item = new QTableWidgetItem(data.value(i));
                     item->setFlags(Qt::ItemIsEnabled | Qt::ItemIsSelectable);
                     tableWidget->setItem(row, i, item);
                 }
                 tableWidget->setSortingEnabled(true);
             }

gui/src/Catalogue/CatalogueExplorer.cpp +2 -2

             #include "Catalogue/CatalogueExplorer.h"
             #include "ui_CatalogueExplorer.h"
             CatalogueExplorer::CatalogueExplorer(QWidget *parent)
                     : QDialog(parent, Qt::Dialog | Qt::WindowMinMaxButtonsHint | Qt::WindowCloseButtonHint),
                       ui(new Ui::CatalogueExplorer)
             {
                 ui->setupUi(this);
                 connect(ui->catalogues, &CatalogueSideBarWidget::catalogueSelected, [this](auto name) {
-                    ui->inspector->showPage(CatalogueInspectorWidget::Page::CatalogueProperties);
+                    ui->inspector->setEvent(name);
                     ui->events->populateWithCatalogue(name);
                 });
                 connect(ui->events, &CatalogueEventsWidget::eventSelected,
-                        [this]() { ui->inspector->showPage(CatalogueInspectorWidget::Page::EventProperties); });
+                        [this](auto name) { ui->inspector->setCatalogue(name); });
             }
             CatalogueExplorer::~CatalogueExplorer()
             {
                 delete ui;
             }

gui/src/Catalogue/CatalogueInspectorWidget.cpp +12 0

             #include "Catalogue/CatalogueInspectorWidget.h"
             #include "ui_CatalogueInspectorWidget.h"
             CatalogueInspectorWidget::CatalogueInspectorWidget(QWidget *parent)
                     : QWidget(parent), ui(new Ui::CatalogueInspectorWidget)
             {
                 ui->setupUi(this);
                 showPage(Page::Empty);
             }
             CatalogueInspectorWidget::~CatalogueInspectorWidget()
             {
                 delete ui;
             }
             void CatalogueInspectorWidget::showPage(CatalogueInspectorWidget::Page page)
             {
                 ui->stackedWidget->setCurrentIndex(static_cast<int>(page));
             }
             CatalogueInspectorWidget::Page CatalogueInspectorWidget::currentPage() const
             {
                 return static_cast<Page>(ui->stackedWidget->currentIndex());
             }
+            void CatalogueInspectorWidget::setEvent(const QString &event)
+            {
+                showPage(Page::EventProperties);
+                ui->leEventName->setText(event);
+            }
+            void CatalogueInspectorWidget::setCatalogue(const QString &catalogue)
+            {
+                showPage(Page::CatalogueProperties);
+                ui->leCatalogueName->setText(catalogue);
+            }

gui/src/Catalogue/CatalogueSideBarWidget.cpp +5 -2

             #include "Catalogue/CatalogueSideBarWidget.h"
             #include "ui_CatalogueSideBarWidget.h"
             constexpr auto ALL_EVENT_ITEM_TYPE = QTreeWidgetItem::UserType;
             constexpr auto TRASH_ITEM_TYPE = QTreeWidgetItem::UserType + 1;
             constexpr auto CATALOGUE_ITEM_TYPE = QTreeWidgetItem::UserType + 2;
             constexpr auto DATABASE_ITEM_TYPE = QTreeWidgetItem::UserType + 3;
             struct CatalogueSideBarWidget::CatalogueSideBarWidgetPrivate {
                 void configureTreeWidget(QTreeWidget *treeWidget);
                 QTreeWidgetItem *addDatabaseItem(const QString &name, QTreeWidget *treeWidget);
                 void addCatalogueItem(const QString &name, QTreeWidgetItem *parentDatabaseItem);
             };
             CatalogueSideBarWidget::CatalogueSideBarWidget(QWidget *parent)
                     : QWidget(parent),
                       ui(new Ui::CatalogueSideBarWidget),
                       impl{spimpl::make_unique_impl<CatalogueSideBarWidgetPrivate>()}
             {
                 ui->setupUi(this);
                 impl->configureTreeWidget(ui->treeWidget);
-                connect(ui->treeWidget, &QTreeWidget::itemClicked, [this](auto item) {
+                auto emitSelection = [this](auto item) {
                     switch (item->type()) {
                         case CATALOGUE_ITEM_TYPE:
                             emit this->catalogueSelected(item->text(0));
                             break;
                         case ALL_EVENT_ITEM_TYPE:
                             emit this->allEventsSelected();
                             break;
                         case TRASH_ITEM_TYPE:
                             emit this->trashSelected();
                             break;
                         case DATABASE_ITEM_TYPE:
                         default:
                             break;
                     }
-                });
+                };
+                connect(ui->treeWidget, &QTreeWidget::itemClicked, emitSelection);
+                connect(ui->treeWidget, &QTreeWidget::currentItemChanged, emitSelection);
             }
             CatalogueSideBarWidget::~CatalogueSideBarWidget()
             {
                 delete ui;
             }
             void CatalogueSideBarWidget::CatalogueSideBarWidgetPrivate::configureTreeWidget(
                 QTreeWidget *treeWidget)
             {
                 auto allEventsItem = new QTreeWidgetItem({"All Events"}, ALL_EVENT_ITEM_TYPE);
                 allEventsItem->setIcon(0, QIcon(":/icones/allEvents.png"));
                 treeWidget->addTopLevelItem(allEventsItem);
                 auto trashItem = new QTreeWidgetItem({"Trash"}, TRASH_ITEM_TYPE);
                 trashItem->setIcon(0, QIcon(":/icones/trash.png"));
                 treeWidget->addTopLevelItem(trashItem);
                 auto separator = new QFrame(treeWidget);
                 separator->setFrameShape(QFrame::HLine);
                 auto separatorItem = new QTreeWidgetItem();
                 separatorItem->setFlags(Qt::NoItemFlags);
                 treeWidget->addTopLevelItem(separatorItem);
                 treeWidget->setItemWidget(separatorItem, 0, separator);
                 // Test
                 auto db = addDatabaseItem("Database 1", treeWidget);
                 addCatalogueItem("Catalogue 1", db);
                 addCatalogueItem("Catalogue 2", db);
                 addCatalogueItem("Catalogue 3", db);
                 addCatalogueItem("Catalogue 4", db);
                 auto db2 = addDatabaseItem("Database 2", treeWidget);
                 addCatalogueItem("Catalogue A", db2);
                 addCatalogueItem("Catalogue B", db2);
                 addCatalogueItem("Catalogue C", db2);
                 treeWidget->expandAll();
             }
             QTreeWidgetItem *
             CatalogueSideBarWidget::CatalogueSideBarWidgetPrivate::addDatabaseItem(const QString &name,
                                                                                    QTreeWidget *treeWidget)
             {
                 auto databaseItem = new QTreeWidgetItem({name}, DATABASE_ITEM_TYPE);
                 databaseItem->setIcon(0, QIcon(":/icones/database.png"));
                 treeWidget->addTopLevelItem(databaseItem);
                 return databaseItem;
             }
             void CatalogueSideBarWidget::CatalogueSideBarWidgetPrivate::addCatalogueItem(
                 const QString &name, QTreeWidgetItem *parentDatabaseItem)
             {
                 auto catalogueItem = new QTreeWidgetItem({name}, CATALOGUE_ITEM_TYPE);
                 catalogueItem->setIcon(0, QIcon(":/icones/catalogue.png"));
                 parentDatabaseItem->addChild(catalogueItem);
             }

gui/ui/Catalogue/CatalogueInspectorWidget.ui +9 -9

             <?xml version="1.0" encoding="UTF-8"?>
             <ui version="4.0">
              <class>CatalogueInspectorWidget</class>
              <widget class="QWidget" name="CatalogueInspectorWidget">
               <property name="geometry">
                <rect>
                 <x>0</x>
                 <y>0</y>
                 <width>400</width>
                 <height>300</height>
                </rect>
               </property>
               <property name="windowTitle">
                <string>Form</string>
               </property>
               <layout class="QVBoxLayout" name="verticalLayout_2">
                <property name="leftMargin">
                 <number>0</number>
                </property>
                <property name="topMargin">
                 <number>0</number>
                </property>
                <property name="rightMargin">
                 <number>0</number>
                </property>
                <property name="bottomMargin">
                 <number>0</number>
                </property>
                <item>
                 <widget class="QFrame" name="frame">
                  <property name="frameShape">
                   <enum>QFrame::Box</enum>
                  </property>
                  <property name="frameShadow">
                   <enum>QFrame::Sunken</enum>
                  </property>
                  <property name="lineWidth">
                   <number>1</number>
                  </property>
                  <layout class="QVBoxLayout" name="verticalLayout">
                   <property name="leftMargin">
                    <number>0</number>
                   </property>
                   <property name="topMargin">
                    <number>0</number>
                   </property>
                   <property name="rightMargin">
                    <number>0</number>
                   </property>
                   <property name="bottomMargin">
                    <number>0</number>
                   </property>
                   <item>
                    <widget class="QStackedWidget" name="stackedWidget">
                     <property name="currentIndex">
-                     <number>2</number>
+                     <number>1</number>
                     </property>
                     <widget class="QWidget" name="emptyPage"/>
                     <widget class="QWidget" name="catalogueInspectorPage">
                      <layout class="QGridLayout" name="gridLayout_2">
                       <item row="1" column="0">
                        <widget class="QLabel" name="label_7">
                         <property name="text">
                          <string>Name</string>
                         </property>
                        </widget>
                       </item>
                       <item row="1" column="1">
-                       <widget class="QLineEdit" name="lineEdit_5"/>
+                       <widget class="QLineEdit" name="leCatalogueName"/>
                       </item>
                       <item row="2" column="0">
                        <widget class="QLabel" name="label_8">
                         <property name="text">
                          <string>Author</string>
                         </property>
                        </widget>
                       </item>
                       <item row="2" column="1">
-                       <widget class="QLineEdit" name="lineEdit_6">
+                       <widget class="QLineEdit" name="leCatalogueAuthor">
                         <property name="text">
                          <string/>
                         </property>
                        </widget>
                       </item>
                       <item row="3" column="1">
                        <spacer name="verticalSpacer_2">
                         <property name="orientation">
                          <enum>Qt::Vertical</enum>
                         </property>
                         <property name="sizeHint" stdset="0">
                          <size>
                           <width>20</width>
                           <height>40</height>
                          </size>
                         </property>
                        </spacer>
                       </item>
                       <item row="0" column="0" colspan="2">
                        <widget class="QLabel" name="label_9">
                         <property name="font">
                          <font>
                           <pointsize>10</pointsize>
                           <weight>75</weight>
                           <bold>true</bold>
                          </font>
                         </property>
                         <property name="text">
                          <string>Catalogue Properties</string>
                         </property>
                        </widget>
                       </item>
                      </layout>
                     </widget>
                     <widget class="QWidget" name="eventInspectorPage">
                      <layout class="QGridLayout" name="gridLayout">
                       <item row="5" column="1">
-                       <widget class="QDateTimeEdit" name="dateTimeEdit_2"/>
+                       <widget class="QDateTimeEdit" name="dateTimeEventTEnd"/>
                       </item>
                       <item row="4" column="0">
                        <widget class="QLabel" name="label_4">
                         <property name="text">
                          <string>TStart</string>
                         </property>
                        </widget>
                       </item>
                       <item row="6" column="0">
                        <widget class="QLabel" name="label_6">
                         <property name="text">
                          <string>Tags</string>
                         </property>
                        </widget>
                       </item>
                       <item row="3" column="0">
                        <widget class="QLabel" name="label_3">
                         <property name="text">
                          <string>Product</string>
                         </property>
                        </widget>
                       </item>
                       <item row="3" column="1">
-                       <widget class="QLineEdit" name="lineEdit_3"/>
+                       <widget class="QLineEdit" name="leEventProduct"/>
                       </item>
                       <item row="5" column="0">
                        <widget class="QLabel" name="label_5">
                         <property name="text">
                          <string>Tend</string>
                         </property>
                        </widget>
                       </item>
                       <item row="4" column="1">
-                       <widget class="QDateTimeEdit" name="dateTimeEdit"/>
+                       <widget class="QDateTimeEdit" name="dateTimeEventTStart"/>
                       </item>
                       <item row="2" column="0">
                        <widget class="QLabel" name="label_2">
                         <property name="text">
                          <string>Mission</string>
                         </property>
                        </widget>
                       </item>
                       <item row="1" column="1">
-                       <widget class="QLineEdit" name="lineEdit"/>
+                       <widget class="QLineEdit" name="leEventName"/>
                       </item>
                       <item row="1" column="0">
                        <widget class="QLabel" name="label">
                         <property name="text">
                          <string>Name</string>
                         </property>
                        </widget>
                       </item>
                       <item row="2" column="1">
-                       <widget class="QLineEdit" name="lineEdit_2"/>
+                       <widget class="QLineEdit" name="leEventMission"/>
                       </item>
                       <item row="6" column="1">
-                       <widget class="QLineEdit" name="lineEdit_4"/>
+                       <widget class="QLineEdit" name="leEventTags"/>
                       </item>
                       <item row="7" column="1">
                        <spacer name="verticalSpacer">
                         <property name="orientation">
                          <enum>Qt::Vertical</enum>
                         </property>
                         <property name="sizeHint" stdset="0">
                          <size>
                           <width>20</width>
                           <height>40</height>
                          </size>
                         </property>
                        </spacer>
                       </item>
                       <item row="0" column="0" colspan="2">
                        <widget class="QLabel" name="label_10">
                         <property name="font">
                          <font>
                           <pointsize>10</pointsize>
                           <weight>75</weight>
                           <bold>true</bold>
                          </font>
                         </property>
                         <property name="text">
                          <string>Event Properties</string>
                         </property>
                        </widget>
                       </item>
                      </layout>
                     </widget>
                    </widget>
                   </item>
                  </layout>
                 </widget>
                </item>
               </layout>
              </widget>
              <resources/>
              <connections/>
             </ui>

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