@@ -46,13 +46,15 class MainWindow : public QMainWindow { | |||||
46 | Q_OBJECT |
|
46 | Q_OBJECT | |
47 |
|
47 | |||
48 | public: |
|
48 | public: | |
49 |
explicit MainWindow(QWidget *parent = |
|
49 | explicit MainWindow(QWidget *parent = nullptr); | |
50 | virtual ~MainWindow(); |
|
50 | virtual ~MainWindow() override; | |
51 | public slots: |
|
51 | public slots: | |
52 |
|
52 | |||
53 | protected: |
|
53 | protected: | |
54 | void changeEvent(QEvent *e); |
|
54 | void changeEvent(QEvent *e) override; | |
55 | void closeEvent(QCloseEvent *event); |
|
55 | void closeEvent(QCloseEvent *event) override; | |
|
56 | ||||
|
57 | void keyPressEvent(QKeyEvent *event) override; | |||
56 |
|
58 | |||
57 | private: |
|
59 | private: | |
58 | std::unique_ptr<Ui::MainWindow> m_Ui; |
|
60 | std::unique_ptr<Ui::MainWindow> m_Ui; |
@@ -350,6 +350,25 void MainWindow::closeEvent(QCloseEvent *event) | |||||
350 | } |
|
350 | } | |
351 | } |
|
351 | } | |
352 |
|
352 | |||
|
353 | void MainWindow::keyPressEvent(QKeyEvent *event) | |||
|
354 | { | |||
|
355 | switch (event->key()) | |||
|
356 | { | |||
|
357 | case Qt::Key_F11: | |||
|
358 | if(this->isFullScreen()) | |||
|
359 | { | |||
|
360 | this->showNormal(); | |||
|
361 | } | |||
|
362 | else | |||
|
363 | { | |||
|
364 | this->showFullScreen(); | |||
|
365 | } | |||
|
366 | break; | |||
|
367 | default: | |||
|
368 | break; | |||
|
369 | } | |||
|
370 | } | |||
|
371 | ||||
353 | bool MainWindow::MainWindowPrivate::checkDataToSave(QWidget *parentWidget) |
|
372 | bool MainWindow::MainWindowPrivate::checkDataToSave(QWidget *parentWidget) | |
354 | { |
|
373 | { | |
355 | auto hasChanges = sqpApp->catalogueController().hasChanges(); |
|
374 | auto hasChanges = sqpApp->catalogueController().hasChanges(); |
@@ -863,7 +863,8 void VisualizationGraphWidget::mouseMoveEvent(QMouseEvent *event) | |||||
863 | { |
|
863 | { | |
864 | impl->m_RenderingDelegate->updateTooltip(event); |
|
864 | impl->m_RenderingDelegate->updateTooltip(event); | |
865 | } |
|
865 | } | |
866 | event->accept(); |
|
866 | //event->accept(); | |
|
867 | QWidget::mouseMoveEvent(event); | |||
867 | } |
|
868 | } | |
868 |
|
869 | |||
869 | void VisualizationGraphWidget::mouseReleaseEvent(QMouseEvent *event) |
|
870 | void VisualizationGraphWidget::mouseReleaseEvent(QMouseEvent *event) | |
@@ -923,7 +924,8 void VisualizationGraphWidget::mousePressEvent(QMouseEvent *event) | |||||
923 | impl->enterPlotDrag(event->pos()); |
|
924 | impl->enterPlotDrag(event->pos()); | |
924 | } |
|
925 | } | |
925 | } |
|
926 | } | |
926 | event->accept(); |
|
927 | //event->accept(); | |
|
928 | QWidget::mousePressEvent(event); | |||
927 | } |
|
929 | } | |
928 |
|
930 | |||
929 | void VisualizationGraphWidget::mouseDoubleClickEvent(QMouseEvent *event) |
|
931 | void VisualizationGraphWidget::mouseDoubleClickEvent(QMouseEvent *event) | |
@@ -945,7 +947,7 void VisualizationGraphWidget::keyReleaseEvent(QKeyEvent *event) | |||||
945 | break; |
|
947 | break; | |
946 | } |
|
948 | } | |
947 | setCursor(Qt::ArrowCursor); |
|
949 | setCursor(Qt::ArrowCursor); | |
948 | event->accept(); |
|
950 | //event->accept(); | |
949 | } |
|
951 | } | |
950 |
|
952 | |||
951 | void VisualizationGraphWidget::keyPressEvent(QKeyEvent *event) |
|
953 | void VisualizationGraphWidget::keyPressEvent(QKeyEvent *event) |
General Comments 0
You need to be logged in to leave comments.
Login now