GIT_REPOSITORIES/LPP/Users/mperrinel/SciQLop-fork Commit - r1181:ac6f44836b9a

Edition of events from the inspector

trabillard -

r1181:ac6f44836b9a

parent child

Context file:

r1181:ac6f44836b9a

gui/include/Catalogue/CatalogueEventsTableModel.h +4 -2

                 void setEvents(const QVector<std::shared_ptr<DBEvent> > &events);
                 std::shared_ptr<DBEvent> getEvent(int row) const;
-                void addEvent(const std::shared_ptr<DBEvent> &events);
+                void addEvent(const std::shared_ptr<DBEvent> &event);
-                void removeEvent(const std::shared_ptr<DBEvent> &events);
+                void removeEvent(const std::shared_ptr<DBEvent> &event);
+                void refreshEvent(const std::shared_ptr<DBEvent> &event);
                 // Model
                 int rowCount(const QModelIndex &parent = QModelIndex()) const override;

gui/include/Catalogue/CatalogueEventsWidget.h +2 0

                 void setVisualizationWidget(VisualizationWidget *visualization);
+                void setEventChanges(const std::shared_ptr<DBEvent> &event, bool hasChanges);
             public slots:
                 void populateWithCatalogues(const QVector<std::shared_ptr<DBCatalogue> > &catalogues);

gui/src/Catalogue/CatalogueEventsTableModel.cpp +13 -7

                 return impl->m_Events.value(row);
             }
-            void CatalogueEventsTableModel::addEvent(const std::shared_ptr<DBEvent> &events)
+            void CatalogueEventsTableModel::addEvent(const std::shared_ptr<DBEvent> &event)
             {
                 beginInsertRows(QModelIndex(), impl->m_Events.count() - 1, impl->m_Events.count() - 1);
-                // impl->m_Events.append(event); TODO
+                impl->m_Events.append(event);
                 endInsertRows();
             }
-            void CatalogueEventsTableModel::removeEvent(const std::shared_ptr<DBEvent> &events)
+            void CatalogueEventsTableModel::removeEvent(const std::shared_ptr<DBEvent> &event)
             {
-                // TODO
+                auto index = impl->m_Events.indexOf(event);
-                auto index = -1; // impl->m_Events.indexOf(event);
                 if (index >= 0) {
                     beginRemoveRows(QModelIndex(), index, index);
                     impl->m_Events.removeAt(index);
                 }
             }
+            void CatalogueEventsTableModel::refreshEvent(const std::shared_ptr<DBEvent> &event)
+            {
+                auto eventIndex = impl->m_Events.indexOf(event);
+                if (eventIndex >= 0) {
+                    emit dataChanged(index(eventIndex, 0), index(eventIndex, columnCount()));
+                }
+            }
             int CatalogueEventsTableModel::rowCount(const QModelIndex &parent) const
             {
                 int r = impl->m_Events.count();
             int CatalogueEventsTableModel::columnCount(const QModelIndex &parent) const
             {
-                int c = static_cast<int>(CatalogueEventsTableModelPrivate::Column::NbColumn);
+                return static_cast<int>(CatalogueEventsTableModelPrivate::Column::NbColumn);
-                return c;
             }
             Qt::ItemFlags CatalogueEventsTableModel::flags(const QModelIndex &index) const

gui/src/Catalogue/CatalogueEventsWidget.cpp +5 0

                 impl->m_VisualizationWidget = visualization;
             }
+            void CatalogueEventsWidget::setEventChanges(const std::shared_ptr<DBEvent> &event, bool hasChanges)
+            {
+                impl->m_Model->refreshEvent(event);
+            }
             void CatalogueEventsWidget::populateWithCatalogues(
                 const QVector<std::shared_ptr<DBCatalogue> > &catalogues)
             {

gui/src/Catalogue/CatalogueExplorer.cpp +3 0

                 connect(ui->inspector, &CatalogueInspectorWidget::catalogueUpdated,
                         [this](auto catalogue) { ui->catalogues->setCatalogueChanges(catalogue, true); });
+                connect(ui->inspector, &CatalogueInspectorWidget::eventUpdated,
+                        [this](auto event) { ui->events->setEventChanges(event, true); });
             }
             CatalogueExplorer::~CatalogueExplorer()

gui/src/Catalogue/CatalogueInspectorWidget.cpp +67 -10

@@ -9,6 +9,11
9	struct CatalogueInspectorWidget::CatalogueInspectorWidgetPrivate {	9	struct CatalogueInspectorWidget::CatalogueInspectorWidgetPrivate {
10	std::shared_ptr<DBCatalogue> m_DisplayedCatalogue = nullptr;	10	std::shared_ptr<DBCatalogue> m_DisplayedCatalogue = nullptr;
11	std::shared_ptr<DBEvent> m_DisplayedEvent = nullptr;	11	std::shared_ptr<DBEvent> m_DisplayedEvent = nullptr;
		12
		13	void connectCatalogueUpdateSignals(CatalogueInspectorWidget *inspector,
		14	Ui::CatalogueInspectorWidget *ui);
		15	void connectEventUpdateSignals(CatalogueInspectorWidget *inspector,
		16	Ui::CatalogueInspectorWidget *ui);
12	};	17	};
13		18
14	CatalogueInspectorWidget::CatalogueInspectorWidget(QWidget *parent)	19	CatalogueInspectorWidget::CatalogueInspectorWidget(QWidget *parent)
@@ -19,24 +24,76 CatalogueInspectorWidget::CatalogueInspectorWidget(QWidget *parent)
19	ui->setupUi(this);	24	ui->setupUi(this);
20	showPage(Page::Empty);	25	showPage(Page::Empty);
21		26
22	connect(ui->leCatalogueName, &QLineEdit::editingFinished, [this]() {	27	impl->connectCatalogueUpdateSignals(this, ui);
23	if (ui->leCatalogueName->text() != impl->m_DisplayedCatalogue->getName()) {	28	impl->connectEventUpdateSignals(this, ui);
24	impl->m_DisplayedCatalogue->setName(ui->leCatalogueName->text());	29	}
25	emit this->catalogueUpdated(impl->m_DisplayedCatalogue);	30
		31	CatalogueInspectorWidget::~CatalogueInspectorWidget()
		32	{
		33	delete ui;
		34	}
		35
		36	void CatalogueInspectorWidget::CatalogueInspectorWidgetPrivate::connectCatalogueUpdateSignals(
		37	CatalogueInspectorWidget inspector, Ui::CatalogueInspectorWidget ui)
		38	{
		39	connect(ui->leCatalogueName, &QLineEdit::editingFinished, [ui, inspector, this]() {
		40	if (ui->leCatalogueName->text() != m_DisplayedCatalogue->getName()) {
		41	m_DisplayedCatalogue->setName(ui->leCatalogueName->text());
		42	emit inspector->catalogueUpdated(m_DisplayedCatalogue);
26	}	43	}
27	});	44	});
28		45
29	connect(ui->leCatalogueAuthor, &QLineEdit::editingFinished, [this]() {	46	connect(ui->leCatalogueAuthor, &QLineEdit::editingFinished, [ui, inspector, this]() {
30	if (ui->leCatalogueAuthor->text() != ~~impl~~->m_DisplayedCatalogue->getAuthor()) {	47	if (ui->leCatalogueAuthor->text() != m_DisplayedCatalogue->getAuthor()) {
31	~~impl~~->m_DisplayedCatalogue->setAuthor(ui->leCatalogueAuthor->text());	48	m_DisplayedCatalogue->setAuthor(ui->leCatalogueAuthor->text());
32	emit this->catalogueUpdated(~~impl~~->m_DisplayedCatalogue);	49	emit inspector->catalogueUpdated(m_DisplayedCatalogue);
33	}	50	}
34	});	51	});
35	}	52	}
36		53
37	CatalogueInspectorWidget::~CatalogueInspectorWidget()	54	void CatalogueInspectorWidget::CatalogueInspectorWidgetPrivate::connectEventUpdateSignals(
		55	CatalogueInspectorWidget inspector, Ui::CatalogueInspectorWidget ui)
38	{	56	{
39	delete ui;	57	connect(ui->leEventName, &QLineEdit::editingFinished, [ui, inspector, this]() {
		58	if (ui->leEventName->text() != m_DisplayedEvent->getName()) {
		59	m_DisplayedEvent->setName(ui->leEventName->text());
		60	emit inspector->eventUpdated(m_DisplayedEvent);
		61	}
		62	});
		63
		64	connect(ui->leEventMission, &QLineEdit::editingFinished, [ui, inspector, this]() {
		65	if (ui->leEventMission->text() != m_DisplayedEvent->getMission()) {
		66	m_DisplayedEvent->setMission(ui->leEventMission->text());
		67	emit inspector->eventUpdated(m_DisplayedEvent);
		68	}
		69	});
		70
		71	connect(ui->leEventProduct, &QLineEdit::editingFinished, [ui, inspector, this]() {
		72	if (ui->leEventProduct->text() != m_DisplayedEvent->getProduct()) {
		73	m_DisplayedEvent->setProduct(ui->leEventProduct->text());
		74	emit inspector->eventUpdated(m_DisplayedEvent);
		75	}
		76	});
		77
		78	connect(ui->leEventTags, &QLineEdit::editingFinished, [ui, inspector, this]() {
		79	// TODO
		80	});
		81
		82	connect(ui->dateTimeEventTStart, &QDateTimeEdit::editingFinished, [ui, inspector, this]() {
		83	auto time = DateUtils::secondsSinceEpoch(ui->dateTimeEventTStart->dateTime());
		84	if (time != m_DisplayedEvent->getTStart()) {
		85	m_DisplayedEvent->setTStart(time);
		86	emit inspector->eventUpdated(m_DisplayedEvent);
		87	}
		88	});
		89
		90	connect(ui->dateTimeEventTEnd, &QDateTimeEdit::editingFinished, [ui, inspector, this]() {
		91	auto time = DateUtils::secondsSinceEpoch(ui->dateTimeEventTEnd->dateTime());
		92	if (time != m_DisplayedEvent->getTEnd()) {
		93	m_DisplayedEvent->setTEnd(time);
		94	emit inspector->eventUpdated(m_DisplayedEvent);
		95	}
		96	});
40	}	97	}
41		98
42	void CatalogueInspectorWidget::showPage(CatalogueInspectorWidget::Page page)	99	void CatalogueInspectorWidget::showPage(CatalogueInspectorWidget::Page page)

gui/ui/Catalogue/CatalogueInspectorWidget.ui +10 -2

                     <widget class="QWidget" name="eventInspectorPage">
                      <layout class="QGridLayout" name="gridLayout">
                       <item row="5" column="1">
-                       <widget class="QDateTimeEdit" name="dateTimeEventTEnd"/>
+                       <widget class="QDateTimeEdit" name="dateTimeEventTEnd">
+                        <property name="timeSpec">
+                         <enum>Qt::UTC</enum>
+                        </property>
+                       </widget>
                       </item>
                       <item row="4" column="0">
                        <widget class="QLabel" name="label_4">
                        </widget>
                       </item>
                       <item row="4" column="1">
-                       <widget class="QDateTimeEdit" name="dateTimeEventTStart"/>
+                       <widget class="QDateTimeEdit" name="dateTimeEventTStart">
+                        <property name="timeSpec">
+                         <enum>Qt::UTC</enum>
+                        </property>
+                       </widget>
                       </item>
                       <item row="2" column="0">
                        <widget class="QLabel" name="label_2">

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