tempo-plotter Changeset - 77513ca7b1d4 · protofusion repositories

Changeset - 77513ca7b1d4

Parent rev.

Child rev.

[Not reviewed]

snapshots

0 3 2

Hasan Yavuz ÖZDERYA - 10 years ago 2015-09-20 07:53:03
hy@ozderya.net

made SnapShot a class, clicking its action opens snapshot view

5 files changed with 72 insertions and 14 deletions:

CMakeLists.txt

mainwindow.cpp

snapshot.cpp

snapshot.h

snapshotview.h

0 comments (0 inline, 0 general)

CMakeLists.txt

➞

Show inline comments

+#
 # Copyright © 2015 Hasan Yavuz Özderya
+#
 # This file is part of serialplot.
+#
 # serialplot is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
+#
 # serialplot is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with serialplot.  If not, see <http://www.gnu.org/licenses/>.
+#
 cmake_minimum_required(VERSION 2.8.11)
 project(serialplot)
 set(PROGRAM_NAME ${CMAKE_PROJECT_NAME} CACHE STRING "Output program name")
 set(PROGRAM_DISPLAY_NAME "SerialPlot" CACHE STRING "Display name (menus etc) of the program")
 # Find includes in corresponding build directories
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 # Instruct CMake to run moc automatically when needed.
 set(CMAKE_AUTOMOC ON)
 # add local path for cmake modules
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/modules/")
 # Find the QtWidgets library
 find_package(Qt5Widgets)
 # Find QWT or use static
 set(QWT_USE_STATIC false CACHE BOOL "Use a static version of Qwt provided by user.")
 set(QWT_STATIC_LIBRARY "" CACHE FILEPATH "Path to the static Qwt library, libqwt.a.")
 set(QWT_STATIC_INCLUDE "" CACHE PATH "Path to the Qwt include directory when building Qwt static.")
 if (QWT_USE_STATIC)
   set(QWT_LIBRARY ${QWT_STATIC_LIBRARY})
   set(QWT_INCLUDE_DIR ${QWT_STATIC_INCLUDE})
 else (QWT_USE_STATIC)
   find_package(Qwt 6.1 REQUIRED)
 endif (QWT_USE_STATIC)
 # includes
 include_directories(${QWT_INCLUDE_DIR})
 # wrap UI and resource files
 qt5_wrap_ui(UI_FILES
   mainwindow.ui
   portcontrol.ui
   about_dialog.ui
   snapshotview.ui
+  )
 qt5_add_resources(RES_FILES misc/icons.qrc)
 add_executable(${PROGRAM_NAME} WIN32
   main.cpp
   mainwindow.cpp
   portcontrol.cpp
   plot.cpp
   zoomer.cpp
   hidabletabwidget.cpp
   framebuffer.cpp
   scalepicker.cpp
   scalezoomer.cpp
   portlist.cpp
   snapshot.cpp
   snapshotview.cpp
   ${UI_FILES}
   ${RES_FILES}
   misc/windows_icon.rc
+  )
 # Use the Widgets module from Qt 5.
 target_link_libraries(${PROGRAM_NAME} ${QWT_LIBRARY})
 qt5_use_modules(${PROGRAM_NAME} Widgets SerialPort Svg)
 # set compiler flags
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
 # Enable C++11 support, fail if not supported
 include(CheckCXXCompilerFlag)
 CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11)
 CHECK_CXX_COMPILER_FLAG("-std=c++0x" COMPILER_SUPPORTS_CXX0X)
 if(COMPILER_SUPPORTS_CXX11)
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
 elseif(COMPILER_SUPPORTS_CXX0X)
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
 else()
   message(STATUS "The compiler ${CMAKE_CXX_COMPILER} has no C++11 support. Please use a different C++ compiler.")
 endif()
 # version number
 set(MAJOR_VERSION 0 CACHE INT "Program major version number.")
 set(MINOR_VERSION 5 CACHE INT "Program minor version number.")
 set(PATCH_VERSION 0 CACHE INT "Program patch version number.")
 set(VERSION_STRING "${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}")
 # get revision number from mercurial
 find_program(MERCURIAL hg)
 if (MERCURIAL)
   execute_process(COMMAND ${MERCURIAL} id -i
     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
     RESULT_VARIABLE MERCURIAL_RESULT
     OUTPUT_VARIABLE VERSION_REVISION
     OUTPUT_STRIP_TRAILING_WHITESPACE)
   if(NOT MERCURIAL_RESULT EQUAL 0)
     set(VERSION_SCM_REVISION false)
   endif(NOT MERCURIAL_RESULT EQUAL 0)
 endif (MERCURIAL)
 if (NOT VERSION_REVISION)
   set(VERSION_REVISION "0")
 endif (NOT VERSION_REVISION)
 message("SCM revision: ${VERSION_REVISION}")
 # configure version file
 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/version.h.in" "${CMAKE_CURRENT_BINARY_DIR}/version.h")
 # add make run target
 add_custom_target(run
     COMMAND ${PROGRAM_NAME}
     DEPENDS ${PROGRAM_NAME}
     WORKING_DIRECTORY ${CMAKE_PROJECT_DIR}
+)
 # installing
 install(TARGETS ${PROGRAM_NAME} DESTINATION bin)
 # for windows put libraries to install directory
 if (WIN32)
   file(GLOB WINDOWS_INSTALL_LIBRARIES
     "${CMAKE_BINARY_DIR}/windows_install_libraries/*.*")
   install(FILES ${WINDOWS_INSTALL_LIBRARIES} DESTINATION bin)
 endif (WIN32)
 # install menu item and icon
 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/misc/program_name.desktop.in"
   "${CMAKE_BINARY_DIR}/${PROGRAM_NAME}.desktop")
 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/misc/program_name.png"
   "${CMAKE_BINARY_DIR}/${PROGRAM_NAME}.png" COPYONLY)
 find_program(XDG-DESKTOP-MENU xdg-desktop-menu)
 find_program(XDG-ICON-RESOURCE xdg-icon-resource)
 if (UNIX)
   # first copy files to share/serialplot/
   install(FILES
     ${CMAKE_BINARY_DIR}/${PROGRAM_NAME}.desktop
     ${CMAKE_BINARY_DIR}/${PROGRAM_NAME}.png
     DESTINATION share/${PROGRAM_NAME})
   # install copyright file (in debian format)
   install(FILES
     ${CMAKE_SOURCE_DIR}/debian/copyright
     DESTINATION share/doc/${PROGRAM_NAME}/)
   install(CODE "
   execute_process(COMMAND ${XDG-DESKTOP-MENU} install --novendor ${CMAKE_INSTALL_PREFIX}/share/${PROGRAM_NAME}/${PROGRAM_NAME}.desktop)
   execute_process(COMMAND ${XDG-ICON-RESOURCE} install --novendor --size 256 ${CMAKE_INSTALL_PREFIX}/share/${PROGRAM_NAME}/${PROGRAM_NAME}.png)
 ")

mainwindow.cpp

➞

Show inline comments

@@ @@ -637,130 +637,126 @@ void MainWindow::enableDemo(bool enabled @@
+        {
             demoTimer.start();
             ui->actionDemoMode->setChecked(true);
             demoIndicator.show();
             ui->plot->replot();
+        }
         else
+        {
             ui->actionDemoMode->setChecked(false);
+        }
+    }
     else
+    {
         demoTimer.stop();
         ui->actionDemoMode->setChecked(false);
         demoIndicator.hide();
         ui->plot->replot();
+    }
+}
 void MainWindow::onExportCsv()
+{
     bool wasPaused = ui->actionPause->isChecked();
     ui->actionPause->setChecked(true); // pause plotting
     QString fileName = QFileDialog::getSaveFileName(this, tr("Export CSV File"));
     if (fileName.isNull())  // user canceled export
+    {
         ui->actionPause->setChecked(wasPaused);
+    }
     else
+    {
         QFile file(fileName);
         if (file.open(QIODevice::WriteOnly | QIODevice::Text))
+        {
             QTextStream fileStream(&file);
             for (unsigned int ci = 0; ci < numOfChannels; ci++)
+            {
                 fileStream << "Channel " << ci;
                 if (ci != numOfChannels-1) fileStream << ",";
+            }
             fileStream << '\n';
             for (unsigned int i = 0; i < numOfSamples; i++)
+            {
                 for (unsigned int ci = 0; ci < numOfChannels; ci++)
+                {
                     fileStream << channelBuffers[ci]->sample(i).y();
                     if (ci != numOfChannels-1) fileStream << ",";
+                }
                 fileStream << '\n';
+            }
+        }
         else
+        {
             qCritical() << "File open error during export: " << file.error();
+        }
+    }
+}
 void MainWindow::messageHandler(QtMsgType type,
                                 const QMessageLogContext &context,
                                 const QString &msg)
+{
     QString logString;
     switch (type)
+    {
         case QtDebugMsg:
             logString = "[Debug] " + msg;
             break;
         case QtWarningMsg:
             logString = "[Warning] " + msg;
             break;
         case QtCriticalMsg:
             logString = "[Error] " + msg;
             break;
         case QtFatalMsg:
             logString = "[Fatal] " + msg;
             break;
+    }
     if (ui != NULL) ui->ptLog->appendPlainText(logString);
     std::cerr << logString.toStdString() << std::endl;
     if (type != QtDebugMsg && ui != NULL)
+    {
         ui->statusBar->showMessage(msg, 5000);
+    }
+}
 void MainWindow::takeSnapShot()
+{
     qDebug() << "taking a snopshot yay!";
     auto snapShot = new SnapShot();
     snapShot->name = QString("SnapShot");
     auto snapShot = new SnapShot(this, "New Snapshot");
     for (unsigned ci = 0; ci < numOfChannels; ci++)
+    {
         snapShot->data.append(QVector<QPointF>(numOfSamples));
         for (unsigned i = 0; i < numOfSamples; i++)
+        {
             snapShot->data[ci][i] = channelBuffers[ci]->sample(i);
+        }
+    }
     snapshots.append(snapShot);
     updateSnapShotMenu();
     auto sv = new SnapShotView(this, snapShot);
     sv->show();
+}
 void MainWindow::updateSnapShotMenu()
+{
     ui->menuSnapShots->clear();
     ui->menuSnapShots->addAction(ui->actionSnapShot);
     if (snapshots.size())
+    {
         ui->menuSnapShots->addSeparator();
         for (auto ss : snapshots)
+        {
-            ui->menuSnapShots->addAction(ss->name);
+            ui->menuSnapShots->addAction(ss->menuAction());
+        }
         ui->menuSnapShots->addSeparator();
         ui->menuSnapShots->addAction(ui->actionClearSnapShots);
+    }
+}

snapshot.cpp

➞

Show inline comments

@@ new file 100644 @@
 #include <stddef.h>
 #include "snapshot.h"
 #include "snapshotview.h"
 #include <QtDebug>
 SnapShot::SnapShot(QMainWindow* parent, QString name) :
     QObject(parent),
     _menuAction(name, this)
+{
     view = NULL;
     mainWindow = parent;
     connect(&_menuAction, &QAction::triggered, this, &SnapShot::show);
+}
 QAction* SnapShot::menuAction()
+{
     return &_menuAction;
+}
 void SnapShot::show()
+{
     if (view == NULL)
+    {
         qDebug() << "view == NULL";
         view = new SnapShotView(mainWindow, this);
+    }
     view->show();
+}
 void SnapShot::hide()
+{
+}

snapshot.h

➞

Show inline comments

@@ new file 100644 @@
 #ifndef SNAPSHOT_H
 #define SNAPSHOT_H
 #include <QObject>
 #include <QMainWindow>
 #include <QAction>
 #include <QVector>
 class SnapShotView;
 class SnapShot : public QObject
+{
     Q_OBJECT
 public:
     SnapShot(QMainWindow* parent, QString name);
     // QString _name;
     QVector<QVector<QPointF>> data;
     QAction* menuAction();
 public slots:
     void show();
     void hide();
 private:
     QAction _menuAction;
     QMainWindow* mainWindow;
     SnapShotView* view;
 };
 #endif /* SNAPSHOT_H */

snapshotview.h

➞

Show inline comments

 #ifndef SNAPSHOTVIEW_H
 #define SNAPSHOTVIEW_H
 #include <QMainWindow>
 #include <QVector>
 #include <QPointF>
 #include <QPen>
 #include <qwt_plot_curve.h>
 #include "plot.h"
 class SnapShotView;
 struct SnapShot
+{
     QString name;
     QVector<QVector<QPointF>> data;
     SnapShotView* view;
 };
 #include "snapshot.h"
 namespace Ui {
 class SnapShotView;
+}
 class SnapShotView : public QMainWindow
+{
     Q_OBJECT
 public:
     explicit SnapShotView(QWidget *parent, SnapShot* snapShot);
     ~SnapShotView();
 private:
     Ui::SnapShotView *ui;
     QList<QwtPlotCurve*> curves;
     SnapShot* _snapShot;
 };
 #endif // SNAPSHOTVIEW_H

0 comments (0 inline, 0 general)