GIT_REPOSITORIES/LPP/Users/mperrinel/SciQLop-fork Commit - r970:63eae7d6c90b

temp commit

Alexandre Leroux -

r970:63eae7d6c90b

parent child

Context file:

r970:63eae7d6c90b

Collapse all files

gui/src/DataSource/DataSourceWidget.cpp +1 0

             #include <DataSource/DataSourceWidget.h>
             #include <ui_DataSourceWidget.h>
             #include <DataSource/DataSourceItem.h>
             #include <DataSource/DataSourceTreeWidgetHelper.h>
             #include <DataSource/DataSourceTreeWidgetItem.h>
             #include <QMenu>
             namespace {
             /// Number of columns displayed in the tree
             const auto TREE_NB_COLUMNS = 1;
             /// Header labels for the tree
             const auto TREE_HEADER_LABELS = QStringList{QObject::tr("Name")};
             /**
              * Creates the item associated to a data source
              * @param dataSource the data source for which to create the item
              * @return the new item
              */
             DataSourceTreeWidgetItem *createTreeWidgetItem(DataSourceItem *dataSource)
             {
                 // Creates item for the data source
                 auto item = new DataSourceTreeWidgetItem{dataSource};
                 // Generates items for the children of the data source
                 for (auto i = 0; i < dataSource->childCount(); ++i) {
                     item->addChild(createTreeWidgetItem(dataSource->child(i)));
                 }
                 return item;
             }
             } // namespace
             DataSourceWidget::DataSourceWidget(QWidget *parent) : QWidget{parent}, ui{new Ui::DataSourceWidget}
             {
                 ui->setupUi(this);
                 // Set tree properties
                 ui->treeWidget->setColumnCount(TREE_NB_COLUMNS);
                 ui->treeWidget->setHeaderLabels(TREE_HEADER_LABELS);
                 ui->treeWidget->setContextMenuPolicy(Qt::CustomContextMenu);
                 // Connection to show a menu when right clicking on the tree
                 connect(ui->treeWidget, &QTreeWidget::customContextMenuRequested, this,
                         &DataSourceWidget::onTreeMenuRequested);
                 // Connection to filter tree
                 connect(ui->filterLineEdit, &QLineEdit::textChanged, this, &DataSourceWidget::filterChanged);
+                ui->filterLineEdit->setText("tha_ion_s");
             }
             DataSourceWidget::~DataSourceWidget() noexcept
             {
                 delete ui;
             }
             void DataSourceWidget::addDataSource(DataSourceItem *dataSource) noexcept
             {
                 // Creates the item associated to the source and adds it to the tree widget. The tree widget
                 // takes the ownership of the item
                 if (dataSource) {
                     ui->treeWidget->addTopLevelItem(createTreeWidgetItem(dataSource));
                 }
             }
             void DataSourceWidget::filterChanged(const QString &text) noexcept
             {
                 auto validateItem = [&text](const DataSourceTreeWidgetItem &item) {
                     auto regExp = QRegExp{text, Qt::CaseInsensitive, QRegExp::Wildcard};
                     // An item is valid if any of its metadata validates the text filter
                     auto itemMetadata = item.data()->data();
                     auto itemMetadataEnd = itemMetadata.cend();
                     auto acceptFilter
                         = [&regExp](const auto &variant) { return variant.toString().contains(regExp); };
                     return std::find_if(itemMetadata.cbegin(), itemMetadataEnd, acceptFilter)
                            != itemMetadataEnd;
                 };
                 // Applies filter on tree widget
                 DataSourceTreeWidgetHelper::filter(*ui->treeWidget, validateItem);
             }
             void DataSourceWidget::onTreeMenuRequested(const QPoint &pos) noexcept
             {
                 // Retrieves the selected item in the tree, and build the menu from its actions
                 if (auto selectedItem = dynamic_cast<DataSourceTreeWidgetItem *>(ui->treeWidget->itemAt(pos))) {
                     QMenu treeMenu{};
                     treeMenu.addActions(selectedItem->actions());
                     if (!treeMenu.isEmpty()) {
                         treeMenu.exec(QCursor::pos());
                     }
                 }
             }

gui/src/TimeWidget/TimeWidget.cpp +2 -2

             #include "TimeWidget/TimeWidget.h"
             #include "ui_TimeWidget.h"
             #include <Common/DateUtils.h>
             #include <Common/MimeTypesDef.h>
             #include <DragAndDrop/DragDropHelper.h>
             #include <SqpApplication.h>
             #include <Time/TimeController.h>
             #include <QDrag>
             #include <QDragEnterEvent>
             #include <QDropEvent>
             #include <QMimeData>
             struct TimeWidget::TimeWidgetPrivate {
                 explicit TimeWidgetPrivate() {}
                 QPoint m_DragStartPosition;
             };
             TimeWidget::TimeWidget(QWidget *parent)
                     : QWidget{parent},
                       ui{new Ui::TimeWidget},
                       impl{spimpl::make_unique_impl<TimeWidgetPrivate>()}
             {
                 ui->setupUi(this);
                 ui->applyToolButton->setIcon(sqpApp->style()->standardIcon(QStyle::SP_DialogApplyButton));
                 // Connection
                 connect(ui->startDateTimeEdit, &QDateTimeEdit::dateTimeChanged, this,
                         &TimeWidget::onTimeUpdateRequested);
                 connect(ui->endDateTimeEdit, &QDateTimeEdit::dateTimeChanged, this,
                         &TimeWidget::onTimeUpdateRequested);
                 connect(ui->applyToolButton, &QToolButton::clicked, &sqpApp->timeController(),
                         &TimeController::onTimeNotify);
                 // Initialisation
-                auto endDateTime = QDateTime::currentDateTimeUtc();
+                auto endDateTime = QDateTime{QDate{2012, 12, 11}, QTime{0, 0}, Qt::UTC};
-                auto startDateTime = endDateTime.addSecs(-3600); // one hour before
+                auto startDateTime = QDateTime{QDate{2012, 12, 10}, QTime{0, 0}, Qt::UTC}; // one hour before
                 ui->startDateTimeEdit->setDateTime(startDateTime);
                 ui->endDateTimeEdit->setDateTime(endDateTime);
                 auto dateTime = SqpRange{DateUtils::secondsSinceEpoch(startDateTime),
                                          DateUtils::secondsSinceEpoch(endDateTime)};
                 sqpApp->timeController().onTimeToUpdate(dateTime);
             }
             TimeWidget::~TimeWidget()
             {
                 delete ui;
             }
             void TimeWidget::setTimeRange(SqpRange time)
             {
                 auto startDateTime = DateUtils::dateTime(time.m_TStart);
                 auto endDateTime = DateUtils::dateTime(time.m_TEnd);
                 ui->startDateTimeEdit->setDateTime(startDateTime);
                 ui->endDateTimeEdit->setDateTime(endDateTime);
             }
             SqpRange TimeWidget::timeRange() const
             {
                 return SqpRange{DateUtils::secondsSinceEpoch(ui->startDateTimeEdit->dateTime()),
                                 DateUtils::secondsSinceEpoch(ui->endDateTimeEdit->dateTime())};
             }
             void TimeWidget::onTimeUpdateRequested()
             {
                 auto dateTime = timeRange();
                 emit timeUpdated(std::move(dateTime));
             }
             void TimeWidget::dragEnterEvent(QDragEnterEvent *event)
             {
                 if (event->mimeData()->hasFormat(MIME_TYPE_TIME_RANGE)) {
                     event->acceptProposedAction();
                     setStyleSheet("QDateTimeEdit{background-color: #BBD5EE; border:2px solid #2A7FD4}");
                 }
                 else {
                     event->ignore();
                 }
             }
             void TimeWidget::dragLeaveEvent(QDragLeaveEvent *event)
             {
                 setStyleSheet(QString());
             }
             void TimeWidget::dropEvent(QDropEvent *event)
             {
                 if (event->mimeData()->hasFormat(MIME_TYPE_TIME_RANGE)) {
                     auto mimeData = event->mimeData()->data(MIME_TYPE_TIME_RANGE);
                     auto timeRange = TimeController::timeRangeForMimeData(mimeData);
                     setTimeRange(timeRange);
                 }
                 else {
                     event->ignore();
                 }
                 setStyleSheet(QString());
             }
             void TimeWidget::mousePressEvent(QMouseEvent *event)
             {
                 if (event->button() == Qt::LeftButton) {
                     impl->m_DragStartPosition = event->pos();
                 }
                 QWidget::mousePressEvent(event);
             }
             void TimeWidget::mouseMoveEvent(QMouseEvent *event)
             {
                 if (!(event->buttons() & Qt::LeftButton)) {
                     return;
                 }
                 if ((event->pos() - impl->m_DragStartPosition).manhattanLength()
                     < QApplication::startDragDistance()) {
                     return;
                 }
                 // Note: The management of the drag object is done by Qt
                 auto drag = new QDrag{this};
                 auto mimeData = new QMimeData;
                 auto timeData = TimeController::mimeDataForTimeRange(timeRange());
                 mimeData->setData(MIME_TYPE_TIME_RANGE, timeData);
                 drag->setMimeData(mimeData);
                 auto pixmap = QPixmap(size());
                 render(&pixmap);
                 drag->setPixmap(pixmap);
                 drag->setHotSpot(impl->m_DragStartPosition);
                 sqpApp->dragDropHelper().resetDragAndDrop();
                 // Note: The exec() is blocking on windows but not on linux and macOS
                 drag->exec(Qt::MoveAction | Qt::CopyAction);
                 QWidget::mouseMoveEvent(event);
             }

General Comments 0

Write
Preview

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

No TODOs yet

	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