diff --git a/software/mainwindow.cpp b/software/mainwindow.cpp index 9a15080..bacd193 100644 --- a/software/mainwindow.cpp +++ b/software/mainwindow.cpp @@ -1,8 +1,10 @@ #include "mainwindow.h" #include "ui_mainwindow.h" +#include "microview.h" #include #include #include +#include MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), @@ -43,3 +45,65 @@ void MainWindow::on_pushAbout_clicked() aboutBox.setIconPixmap(QPixmap(":/icons/icon.png")); aboutBox.exec(); } + +void MainWindow::on_pushL_clicked() +{ + qDebug() << MSG_LEFT; +} + +void MainWindow::on_pushR_clicked() +{ + qDebug() << MSG_RIGHT; +} + +void MainWindow::on_pushU_clicked() +{ + qDebug() << MSG_UP; +} + +void MainWindow::on_pushD_clicked() +{ + qDebug() << MSG_DOWN; +} + +void MainWindow::on_pushZoomIn_clicked() +{ + qDebug() << MSG_PLUS; +} + +void MainWindow::on_pushZoomOut_clicked() +{ + qDebug() << MSG_MINUS; +} + +void MainWindow::on_pushSnap_clicked() +{ + qDebug() << MSG_SNAP; +} + +void MainWindow::keyPressEvent(QKeyEvent *e) +{ + switch (e->key()) { + case Qt::Key_A: + on_pushL_clicked(); + break; + case Qt::Key_S: + on_pushD_clicked(); + break; + case Qt::Key_D: + on_pushR_clicked(); + break; + case Qt::Key_W: + on_pushU_clicked(); + break; + case Qt::Key_O: + on_pushZoomIn_clicked(); + break; + case Qt::Key_L: + on_pushZoomOut_clicked(); + break; + case Qt::Key_Y: + on_pushSnap_clicked(); + break; + } +} diff --git a/software/mainwindow.h b/software/mainwindow.h index 1799310..d400189 100644 --- a/software/mainwindow.h +++ b/software/mainwindow.h @@ -19,6 +19,14 @@ private slots: void on_pushExit_clicked(); void on_pushAbout_clicked(); + void on_pushL_clicked(); + void on_pushR_clicked(); + void on_pushU_clicked(); + void on_pushD_clicked(); + void on_pushZoomIn_clicked(); + void on_pushZoomOut_clicked(); + void on_pushSnap_clicked(); + void keyPressEvent(QKeyEvent *e); private: Ui::MainWindow *ui; diff --git a/software/mainwindow.ui b/software/mainwindow.ui index 99c572e..fd18657 100644 --- a/software/mainwindow.ui +++ b/software/mainwindow.ui @@ -83,7 +83,7 @@ - 660 + 740 160 51 31 @@ -96,7 +96,7 @@ - 740 + 660 160 51 31 diff --git a/software/microview.h b/software/microview.h new file mode 100644 index 0000000..82426c5 --- /dev/null +++ b/software/microview.h @@ -0,0 +1,12 @@ +#ifndef MICROVIEW_H +#define MICROVIEW_H + +#define MSG_LEFT "X-10" +#define MSG_RIGHT "X+10" +#define MSG_UP "Y-10" +#define MSG_DOWN "Y+10" +#define MSG_MINUS "Z-10" +#define MSG_PLUS "Z+10" +#define MSG_SNAP "SNAP" + +#endif // MICROVIEW_H diff --git a/software/microview.pro b/software/microview.pro index 25758eb..2f036ce 100644 --- a/software/microview.pro +++ b/software/microview.pro @@ -15,7 +15,8 @@ SOURCES += main.cpp\ videoview.cpp HEADERS += mainwindow.h \ - videoview.h + videoview.h \ + microview.h FORMS += mainwindow.ui diff --git a/software/videoview.cpp b/software/videoview.cpp index 1884f30..6e74e53 100644 --- a/software/videoview.cpp +++ b/software/videoview.cpp @@ -1,4 +1,5 @@ #include "videoview.h" +#include "microview.h" #include VideoView::VideoView(QWidget *parent) : @@ -8,12 +9,15 @@ VideoView::VideoView(QWidget *parent) : void VideoView::mouseMoveEvent(QMouseEvent *event) { - // TODO: process position qDebug() << event->pos(); } void VideoView::wheelEvent(QWheelEvent *event) { - // TODO: process delta - qDebug() << event->delta(); + if (event->delta() > 0) { + qDebug() << MSG_PLUS; + } else + if (event->delta() < 0) { + qDebug() << MSG_MINUS; + } }