Changeset - e7c2c2273ed2
Parent rev.
Child rev.
[Not reviewed]
Merge scrollbar-exp
0 19 3
Hasan Yavuz ÖZDERYA - 8 years ago 2017-08-13 10:57:28
hy@ozderya.net
Merge with default
22 files changed with 415 insertions and 58 deletions:
.hgtags
1
CMakeLists.txt
19
29
Dockerfile
15
cmake/modules/BuildLinuxAppImage.cmake
36
cmake/modules/GetVersion.cmake
80
src/channelinfomodel.cpp
1
1
src/framebufferseries.cpp
24
2
src/framebufferseries.h
4
src/mainwindow.cpp
7
2
src/mainwindow.h
2
src/plot.cpp
32
3
src/plot.h
11
1
src/plotmanager.cpp
132
3
src/plotmanager.h
24
1
src/setting_defines.h
1
src/snapshot.cpp
3
2
src/snapshot.h
4
4
src/snapshotmanager.cpp
2
1
src/snapshotmanager.h
5
3
src/snapshotview.cpp
7
3
src/snapshotview.h
3
2
src/version.h
2
1
0 comments (0 inline, 0 general)
.hgtags
➞
Show inline comments
 
@@ -7,6 +7,7 @@ 878ad8de497561098a63a0d21d36b103cea0719c
 
e545d9bf398aa5728e0ae0236f6c014d9fe55320 v0.6
 
b4d0a38444d31872633e474d89ffc15cd0fe42f0 v0.7
 
27b0354ca2c5ea7b3870156417ce7e04e799bbf7 v0.7.1
 
fd5f1eb480ec372b49df58b497458de05c30057c v0.8.0
 
9c9a11cd15fd094e2b2b65dc51805fd8fd1d2460 v0.8.1
 
4cf9a1ee1f107a38e03dbe17c4f2882c43d827c9 v0.9.0
 
ef003f7af8f37f760c22dae776f5ff8e1b526deb v0.9.1
CMakeLists.txt
➞
Show inline comments
 
@@ -14,13 +14,13 @@
 
# 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)

			




	
	
	
		
 
cmake_minimum_required(VERSION 3.2.2)

			




	
	
	
		
 

			




	
	
	
		
 
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")

			




	
	
	
		
 

			




	
	
		
 
@@ -158,31 +158,20 @@ if(COMPILER_SUPPORTS_CXX11)

			




	
	
	
		
 
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()

			




	
	
	
		
 

			




	
	
	
		
 
# get revision number from mercurial

			




	
	
	
		
 
find_program(MERCURIAL hg)

			




	
	
	
		
 
# default version

			




	
	
	
		
 
set(VERSION_STRING "0.9.1")

			




	
	
	
		
 
set(VERSION_REVISION "0")

			




	
	
	
		
 

			




	
	
	
		
 
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)

			




	
	
	
		
 
# get revision number from mercurial and parse version string

			




	
	
	
		
 
include(GetVersion)

			




	
	
	
		
 

			




	
	
	
		
 
if (NOT VERSION_REVISION)

			




	
	
	
		
 
  set(VERSION_REVISION "0")

			




	
	
	
		
 
endif (NOT VERSION_REVISION)

			




	
	
	
		
 

			




	
	
	
		
 
message("SCM revision: ${VERSION_REVISION}")

			




	
	
	
		
 
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DVERSION_STRING=\\\"${VERSION_STRING}\\\" ")

			




	
	
	
		
 
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DVERSION_REVISION=\\\"${VERSION_REVISION}\\\" ")

			




	
	
	
		
 

			




	
	
	
		
 
# add make run target

			




	
	
	
		
 
add_custom_target(run

			




	
	
	
		
 
    COMMAND ${PROGRAM_NAME}

			




	
	
	
		
 
    DEPENDS ${PROGRAM_NAME}

			




	
	
		
 
@@ -196,26 +185,25 @@ install(TARGETS ${PROGRAM_NAME} DESTINAT

			




	
	
	
		
 
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

			




	
	
	
		
 
# prepare 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)

			




	
	
	
		
 

			




	
	
	
		
 
set(DESKTOP_FILE ${CMAKE_BINARY_DIR}/${PROGRAM_NAME}.desktop)

			




	
	
	
		
 
set(ICON_FILE ${CMAKE_BINARY_DIR}/${PROGRAM_NAME}.png)

			




	
	
	
		
 

			




	
	
	
		
 
# install menu item and icon

			




	
	
	
		
 
if (UNIX)

			




	
	
	
		
 
  # first copy files to share/serialplot/

			




	
	
	
		
 
  install(FILES

			




	
	
	
		
 
    ${CMAKE_BINARY_DIR}/${PROGRAM_NAME}.desktop

			




	
	
	
		
 
    DESTINATION share/applications/)

			




	
	
	
		
 
  install(FILES

			




	
	
	
		
 
    ${CMAKE_BINARY_DIR}/${PROGRAM_NAME}.png

			




	
	
	
		
 
	DESTINATION share/icons/hicolor/256x256/apps/)

			




	
	
	
		
 
  install(FILES ${DESKTOP_FILE} DESTINATION share/applications/)

			




	
	
	
		
 
  install(FILES ${ICON_FILE} DESTINATION share/icons/hicolor/256x256/apps/)

			




	
	
	
		
 
endif (UNIX)

			




	
	
	
		
 

			




	
	
	
		
 
# uninstalling

			




	
	
	
		
 
configure_file(

			




	
	
	
		
 
  "${CMAKE_CURRENT_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in"

			




	
	
	
		
 
  "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"

			




	
	
		
 
@@ -224,26 +212,28 @@ configure_file(

			




	
	
	
		
 
if (UNIX)

			




	
	
	
		
 
  add_custom_target(uninstall

			




	
	
	
		
 
    COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake)

			




	
	
	
		
 
endif (UNIX)

			




	
	
	
		
 

			




	
	
	
		
 
# packaging

			




	
	
	
		
 
include(BuildLinuxAppImage)

			




	
	
	
		
 

			




	
	
	
		
 
if (UNIX)

			




	
	
	
		
 
  set(CPACK_GENERATOR "DEB")

			




	
	
	
		
 
elseif (WIN32)

			




	
	
	
		
 
  set(CPACK_GENERATOR "NSIS")

			




	
	
	
		
 
endif (UNIX)

			




	
	
	
		
 

			




	
	
	
		
 
include(InstallRequiredSystemLibraries)

			




	
	
	
		
 

			




	
	
	
		
 
set(CPACK_PACKAGE_NAME "${PROGRAM_NAME}")

			




	
	
	
		
 
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Small and simple software for plotting data from serial port")

			




	
	
	
		
 
set(CPACK_PACKAGE_CONTACT "Hasan Yavuz Özderya <hy@ozderya.net>")

			




	
	
	
		
 
set(CPACK_PACKAGE_VERSION_MAJOR ${MAJOR_VERSION})

			




	
	
	
		
 
set(CPACK_PACKAGE_VERSION_MINOR ${MINOR_VERSION})

			




	
	
	
		
 
set(CPACK_PACKAGE_VERSION_PATCH ${PATCH_VERSION})

			




	
	
	
		
 
set(CPACK_PACKAGE_VERSION_MAJOR ${VERSION_MAJOR})

			




	
	
	
		
 
set(CPACK_PACKAGE_VERSION_MINOR ${VERSION_MINOR})

			




	
	
	
		
 
set(CPACK_PACKAGE_VERSION_PATCH ${VERSION_PATCH})

			




	
	
	
		
 
set(CPACK_STRIP_FILES TRUE)

			




	
	
	
		
 
set(CPACK_DEBIAN_PACKAGE_DEPENDS "libqt5widgets5 (>= 5.2.1), libqt5svg5 (>= 5.2.1), libqt5serialport5 (>= 5.2.1), libc6 (>= 2.19)")

			




	
	
	
		
 
set(CPACK_DEBIAN_PACKAGE_DESCRIPTION "Small and simple software for plotting data from serial port

			




	
	
	
		
 
 Supports binary data formats ([u]int8, [u]int16, [u]int32, float)

			




	
	
	
		
 
 and ASCII (as CSV). Captured waveforms can be exported in CSV format.

			




	
	
	
		
 
 Can also send simple user defined commands to serial port device.")

			




        

    


    
    

    

        

                

                    Dockerfile
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
new file 100644

			




	
	
	
		
 
FROM ubuntu:trusty

			




	
	
	
		
 

			




	
	
	
		
 
WORKDIR /serialplot

			




	
	
	
		
 
ADD . /serialplot

			




	
	
	
		
 

			




	
	
	
		
 
# Install build dependencies

			




	
	
	
		
 
RUN apt-get update

			




	
	
	
		
 
RUN apt-get -y install software-properties-common

			




	
	
	
		
 
RUN add-apt-repository -y ppa:beineri/opt-qt562-trusty

			




	
	
	
		
 
RUN add-apt-repository -y ppa:george-edison55/cmake-3.x

			




	
	
	
		
 
RUN apt-get update

			




	
	
	
		
 
RUN apt-get -y install build-essential mesa-common-dev qt56base qt56serialport cmake mercurial subversion git wget libfuse2

			




	
	
	
		
 

			




	
	
	
		
 
# Define environment variable

			




	
	
	
		
 
ENV PATH /opt/qt56/bin/:$PATH

			




        

    


    
    

    

        

                

                    cmake/modules/BuildLinuxAppImage.cmake
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
new file 100644

			




	
	
	
		
 
# Based on: https://github.com/mhoeher/opentodolist

			




	
	
	
		
 

			




	
	
	
		
 
set(LINUXDEPLOYQT_URL "https://github.com/probonopd/linuxdeployqt/releases/download/4/linuxdeployqt-4-x86_64.AppImage")

			




	
	
	
		
 
set(LINUXDEPLOYQT_TOOL ${CMAKE_CURRENT_BINARY_DIR}/linuxdeployqt-4-x86_64.AppImage)

			




	
	
	
		
 

			




	
	
	
		
 
set(APPIMAGE_DIR ${CMAKE_CURRENT_BINARY_DIR}/${PROGRAM_NAME}-${VERSION_STRING}-${CMAKE_HOST_SYSTEM_PROCESSOR})

			




	
	
	
		
 

			




	
	
	
		
 
add_custom_command(

			




	
	
	
		
 
    OUTPUT

			




	
	
	
		
 
        ${LINUXDEPLOYQT_TOOL}

			




	
	
	
		
 
    COMMAND

			




	
	
	
		
 
        wget ${LINUXDEPLOYQT_URL}

			




	
	
	
		
 
    COMMAND

			




	
	
	
		
 
        chmod a+x ${LINUXDEPLOYQT_TOOL})

			




	
	
	
		
 

			




	
	
	
		
 
add_custom_target(

			




	
	
	
		
 
    appimage

			




	
	
	
		
 

			




	
	
	
		
 
    DEPENDS ${LINUXDEPLOYQT_TOOL}

			




	
	
	
		
 

			




	
	
	
		
 
    COMMAND

			




	
	
	
		
 
        ${CMAKE_COMMAND} -E remove_directory ${APPIMAGE_DIR}

			




	
	
	
		
 
    COMMAND

			




	
	
	
		
 
        ${CMAKE_COMMAND} -E make_directory ${APPIMAGE_DIR}

			




	
	
	
		
 
    COMMAND

			




	
	
	
		
 
        ${CMAKE_COMMAND} -E copy $<TARGET_FILE:${PROGRAM_NAME}> ${APPIMAGE_DIR}

			




	
	
	
		
 
    COMMAND

			




	
	
	
		
 
        ${CMAKE_COMMAND} -E copy ${DESKTOP_FILE} ${APPIMAGE_DIR}

			




	
	
	
		
 
    COMMAND

			




	
	
	
		
 
        ${CMAKE_COMMAND} -E copy ${ICON_FILE} ${APPIMAGE_DIR}

			




	
	
	
		
 
    COMMAND

			




	
	
	
		
 
        ${CMAKE_COMMAND} -E env PATH=${QT_INSTALL_PREFIX}/bin:$ENV{PATH} ${LINUXDEPLOYQT_TOOL}

			




	
	
	
		
 
            ${APPIMAGE_DIR}/${PROGRAM_NAME} -appimage

			




	
	
	
		
 
            -always-overwrite -bundle-non-qt-libs -verbose=2

			




	
	
	
		
 
    WORKING_DIRECTORY

			




	
	
	
		
 
        ${CMAKE_CURRENT_BINARY_DIR})

			




        

    


    
    

    

        

                

                    cmake/modules/GetVersion.cmake
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
new file 100644

			




	
	
	
		
 
#

			




	
	
	
		
 
# Copyright © 2017 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/>.

			




	
	
	
		
 
#

			




	
	
	
		
 

			




	
	
	
		
 
# try to get latest version from mercurial

			




	
	
	
		
 
find_program(HG hg)

			




	
	
	
		
 

			




	
	
	
		
 
if (HG)

			




	
	
	
		
 
  # get latest tag

			




	
	
	
		
 
  execute_process(COMMAND ${HG} parents --template {latesttag}

			




	
	
	
		
 
    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}

			




	
	
	
		
 
    RESULT_VARIABLE HG_RESULT

			




	
	
	
		
 
    OUTPUT_VARIABLE HG_LATEST_TAG

			




	
	
	
		
 
    OUTPUT_STRIP_TRAILING_WHITESPACE)

			




	
	
	
		
 
  if(HG_RESULT EQUAL 0)

			




	
	
	
		
 
    if (NOT HG_LATEST_TAG MATCHES "v[0-9.]+")

			




	
	
	
		
 
      unset(HG_LATEST_TAG)

			




	
	
	
		
 
    endif()

			




	
	
	
		
 
  else()

			




	
	
	
		
 
    unset(HG_LATEST_TAG)

			




	
	
	
		
 
  endif()

			




	
	
	
		
 

			




	
	
	
		
 
  # get revision

			




	
	
	
		
 
  execute_process(COMMAND ${HG} id -i

			




	
	
	
		
 
    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}

			




	
	
	
		
 
    RESULT_VARIABLE HG_RESULT

			




	
	
	
		
 
    OUTPUT_VARIABLE HG_REVISION

			




	
	
	
		
 
    OUTPUT_STRIP_TRAILING_WHITESPACE)

			




	
	
	
		
 
  if(NOT HG_RESULT EQUAL 0)

			




	
	
	
		
 
    unset(HG_REVISION)

			




	
	
	
		
 
  endif(NOT HG_RESULT EQUAL 0)

			




	
	
	
		
 
endif (HG)

			




	
	
	
		
 

			




	
	
	
		
 
# Try to get version from .hg_archival file

			




	
	
	
		
 
if (NOT HG_LATEST_TAG)

			




	
	
	
		
 
  set(HG_ARCHIVAL_FILE ${CMAKE_CURRENT_SOURCE_DIR}/.hg_archival.txt)

			




	
	
	
		
 
  if (EXISTS ${HG_ARCHIVAL_FILE})

			




	
	
	
		
 
    # get latest tag

			




	
	
	
		
 
    file(STRINGS ${HG_ARCHIVAL_FILE} HG_ARCHIVAL_LATEST_TAG REGEX "^latesttag:.+")

			




	
	
	
		
 
    string(REGEX REPLACE "latesttag:[ \t]*(.+)" "\\1" HG_LATEST_TAG ${HG_ARCHIVAL_LATEST_TAG})

			




	
	
	
		
 

			




	
	
	
		
 
    # get latest revision

			




	
	
	
		
 
    file(STRINGS ${HG_ARCHIVAL_FILE} HG_ARCHIVAL_REV REGEX "^node:.+")

			




	
	
	
		
 
    string(REGEX REPLACE "node:[ \t]*([a-fA-F0-9]+)" "\\1" HG_ARCHIVAL_REV ${HG_ARCHIVAL_REV})

			




	
	
	
		
 
    string(SUBSTRING ${HG_ARCHIVAL_REV} 0 12 HG_REVISION)

			




	
	
	
		
 
  endif()

			




	
	
	
		
 
endif ()

			




	
	
	
		
 

			




	
	
	
		
 
# extract version information from tag (remove 'v' prefix)

			




	
	
	
		
 
if (HG_LATEST_TAG)

			




	
	
	
		
 
  string(REPLACE "v" "" HG_VERSION ${HG_LATEST_TAG})

			




	
	
	
		
 
  message("Version from mercurial: ${HG_VERSION} (${HG_REVISION})")

			




	
	
	
		
 

			




	
	
	
		
 
  # replace version string

			




	
	
	
		
 
  set(VERSION_STRING ${HG_VERSION})

			




	
	
	
		
 
  set(VERSION_REVISION ${HG_REVISION})

			




	
	
	
		
 
else ()

			




	
	
	
		
 
  message("Failed to find version information from mercurial.")

			




	
	
	
		
 
endif ()

			




	
	
	
		
 

			




	
	
	
		
 
# parse version numbers

			




	
	
	
		
 
string(REPLACE "." ";" VERSION_LIST ${VERSION_STRING})

			




	
	
	
		
 
list(GET VERSION_LIST 0 VERSION_MAJOR)

			




	
	
	
		
 
list(GET VERSION_LIST 1 VERSION_MINOR)

			




	
	
	
		
 
list(GET VERSION_LIST 2 VERSION_PATCH)

			




        

    


    
    

    

        

                

                    src/channelinfomodel.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -264,13 +264,13 @@ void ChannelInfoModel::setNumOfChannels(

			




	
	
	
		
 
    }

			




	
	
	
		
 

			




	
	
	
		
 
    // we create channel info but never remove channel info to

			




	
	
	
		
 
    // remember user entered info

			




	
	
	
		
 
    if ((int) number > infos.length())

			




	
	
	
		
 
    {

			




	
	
	
		
 
        for (unsigned ci = _numOfChannels; ci < number; ci++)

			




	
	
	
		
 
        for (unsigned ci = infos.length(); ci < number; ci++)

			




	
	
	
		
 
        {

			




	
	
	
		
 
            infos.append(ChannelInfo(ci));

			




	
	
	
		
 
        }

			




	
	
	
		
 
    }

			




	
	
	
		
 

			




	
	
	
		
 
    // make sure newly available channels are visible, we don't

			




        

    


    
    

    

        

                

                    src/framebufferseries.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -22,35 +22,38 @@

			




	
	
	
		
 
FrameBufferSeries::FrameBufferSeries(FrameBuffer* buffer)

			




	
	
	
		
 
{

			




	
	
	
		
 
    xAsIndex = true;

			




	
	
	
		
 
    _xmin = 0;

			




	
	
	
		
 
    _xmax = 1;

			




	
	
	
		
 
    _buffer = buffer;

			




	
	
	
		
 
    int_index_start = 0;

			




	
	
	
		
 
    int_index_end = 0;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void FrameBufferSeries::setXAxis(bool asIndex, double xmin, double xmax)

			




	
	
	
		
 
{

			




	
	
	
		
 
    xAsIndex = asIndex;

			




	
	
	
		
 
    _xmin = xmin;

			




	
	
	
		
 
    _xmax = xmax;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
size_t FrameBufferSeries::size() const

			




	
	
	
		
 
{

			




	
	
	
		
 
    return _buffer->size();

			




	
	
	
		
 
    return int_index_end - int_index_start;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
QPointF FrameBufferSeries::sample(size_t i) const

			




	
	
	
		
 
{

			




	
	
	
		
 
    i += int_index_start;

			




	
	
	
		
 
    if (xAsIndex)

			




	
	
	
		
 
    {

			




	
	
	
		
 
        return QPointF(i, _buffer->sample(i));

			




	
	
	
		
 
    }

			




	
	
	
		
 
    else

			




	
	
	
		
 
    {

			




	
	
	
		
 
        return QPointF(i * (_xmax - _xmin) / size() + _xmin, _buffer->sample(i));

			




	
	
	
		
 
        return QPointF(i * (_xmax - _xmin) / _buffer->size() + _xmin, _buffer->sample(i));

			




	
	
	
		
 
    }

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
QRectF FrameBufferSeries::boundingRect() const

			




	
	
	
		
 
{

			




	
	
	
		
 
    if (xAsIndex)

			




	
	
		
 
@@ -62,6 +65,25 @@ QRectF FrameBufferSeries::boundingRect()

			




	
	
	
		
 
        auto rect = _buffer->boundingRect();

			




	
	
	
		
 
        rect.setLeft(_xmin);

			




	
	
	
		
 
        rect.setRight(_xmax);

			




	
	
	
		
 
        return rect;

			




	
	
	
		
 
    }

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void FrameBufferSeries::setRectOfInterest(const QRectF& rect)

			




	
	
	
		
 
{

			




	
	
	
		
 
    if (xAsIndex)

			




	
	
	
		
 
    {

			




	
	
	
		
 
        int_index_start = rect.left();

			




	
	
	
		
 
        int_index_end = rect.right();

			




	
	
	
		
 
    }

			




	
	
	
		
 
    else

			




	
	
	
		
 
    {

			




	
	
	
		
 
        double xsize = _xmax - _xmin;

			




	
	
	
		
 
        size_t bsize = _buffer->size();

			




	
	
	
		
 
        int_index_start =  bsize * (rect.left()-_xmin) / xsize;

			




	
	
	
		
 
        int_index_end = bsize * (rect.right()-_xmin) / xsize;

			




	
	
	
		
 
    }

			




	
	
	
		
 

			




	
	
	
		
 
    int_index_start = std::max(int_index_start, (size_t) 0);

			




	
	
	
		
 
    int_index_end = std::min(_buffer->size(), int_index_end);

			




	
	
	
		
 
}

			




        

    


    
    

    

        

                

                    src/framebufferseries.h
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -41,15 +41,19 @@ public:

			




	
	
	
		
 
    void setXAxis(bool asIndex, double xmin, double xmax);

			




	
	
	
		
 

			




	
	
	
		
 
    // QwtSeriesData implementations

			




	
	
	
		
 
    size_t size() const;

			




	
	
	
		
 
    QPointF sample(size_t i) const;

			




	
	
	
		
 
    QRectF boundingRect() const;

			




	
	
	
		
 
    void setRectOfInterest(const QRectF& rect);

			




	
	
	
		
 

			




	
	
	
		
 
private:

			




	
	
	
		
 
    FrameBuffer* _buffer;

			




	
	
	
		
 
    bool xAsIndex;

			




	
	
	
		
 
    double _xmin;

			




	
	
	
		
 
    double _xmax;

			




	
	
	
		
 

			




	
	
	
		
 
    size_t int_index_start; ///< starting index of "rectangle of interest"

			




	
	
	
		
 
    size_t int_index_end;   ///< ending index of "rectangle of interest"

			




	
	
	
		
 
};

			




	
	
	
		
 

			




	
	
	
		
 
#endif // FRAMEBUFFERSERIES_H

			




        

    


    
    

    

        

                

                    src/mainwindow.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -136,13 +136,13 @@ MainWindow::MainWindow(QWidget *parent) 

			




	
	
	
		
 

			




	
	
	
		
 
    // plot control signals

			




	
	
	
		
 
    connect(&plotControlPanel, &PlotControlPanel::numOfSamplesChanged,

			




	
	
	
		
 
            this, &MainWindow::onNumOfSamplesChanged);

			




	
	
	
		
 

			




	
	
	
		
 
    connect(&plotControlPanel, &PlotControlPanel::numOfSamplesChanged,

			




	
	
	
		
 
            plotMan, &PlotManager::onNumOfSamplesChanged);

			




	
	
	
		
 
            plotMan, &PlotManager::setNumOfSamples);

			




	
	
	
		
 

			




	
	
	
		
 
    connect(&plotControlPanel, &PlotControlPanel::yScaleChanged,

			




	
	
	
		
 
            plotMan, &PlotManager::setYAxis);

			




	
	
	
		
 

			




	
	
	
		
 
    connect(&plotControlPanel, &PlotControlPanel::xScaleChanged,

			




	
	
	
		
 
            plotMan, &PlotManager::setXAxis);

			




	
	
		
 
@@ -218,13 +218,13 @@ MainWindow::MainWindow(QWidget *parent) 

			




	
	
	
		
 

			




	
	
	
		
 
    // init scales

			




	
	
	
		
 
    plotMan->setYAxis(plotControlPanel.autoScale(),

			




	
	
	
		
 
                      plotControlPanel.yMin(), plotControlPanel.yMax());

			




	
	
	
		
 
    plotMan->setXAxis(plotControlPanel.xAxisAsIndex(),

			




	
	
	
		
 
                      plotControlPanel.xMin(), plotControlPanel.xMax());

			




	
	
	
		
 
    plotMan->onNumOfSamplesChanged(numOfSamples);

			




	
	
	
		
 
    plotMan->setNumOfSamples(numOfSamples);

			




	
	
	
		
 

			




	
	
	
		
 
    // Init sps (sample per second) counter

			




	
	
	
		
 
    spsLabel.setText("0sps");

			




	
	
	
		
 
    spsLabel.setToolTip("samples per second (per channel)");

			




	
	
	
		
 
    ui->statusBar->addPermanentWidget(&spsLabel);

			




	
	
	
		
 
    QObject::connect(&dataFormatPanel,

			




	
	
		
 
@@ -487,12 +487,17 @@ void MainWindow::onExportCsv()

			




	
	
	
		
 
        Snapshot* snapshot = snapshotMan.makeSnapshot();

			




	
	
	
		
 
        snapshot->save(fileName);

			




	
	
	
		
 
        delete snapshot;

			




	
	
	
		
 
    }

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
PlotViewSettings MainWindow::viewSettings() const

			




	
	
	
		
 
{

			




	
	
	
		
 
    return plotMan->viewSettings();

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void MainWindow::messageHandler(QtMsgType type,

			




	
	
	
		
 
                                const QMessageLogContext &context,

			




	
	
	
		
 
                                const QString &msg)

			




	
	
	
		
 
{

			




	
	
	
		
 
    QString logString;

			




	
	
	
		
 

			




        

    


    
    

    

        

                

                    src/mainwindow.h
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -55,12 +55,14 @@ class MainWindow : public QMainWindow

			




	
	
	
		
 
    Q_OBJECT

			




	
	
	
		
 

			




	
	
	
		
 
public:

			




	
	
	
		
 
    explicit MainWindow(QWidget *parent = 0);

			




	
	
	
		
 
    ~MainWindow();

			




	
	
	
		
 

			




	
	
	
		
 
    PlotViewSettings viewSettings() const;

			




	
	
	
		
 

			




	
	
	
		
 
    void messageHandler(QtMsgType type, const QMessageLogContext &context,

			




	
	
	
		
 
                        const QString &msg);

			




	
	
	
		
 

			




	
	
	
		
 
private:

			




	
	
	
		
 
    Ui::MainWindow *ui;

			




	
	
	
		
 

			




        

    


    
    

    

        

                

                    src/plot.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -36,12 +36,13 @@ Plot::Plot(QWidget* parent) :

			




	
	
	
		
 
    zoomer(this->canvas(), false),

			




	
	
	
		
 
    sZoomer(this, &zoomer)

			




	
	
	
		
 
{

			




	
	
	
		
 
    isAutoScaled = true;

			




	
	
	
		
 
    symbolSize = 0;

			




	
	
	
		
 
    numOfSamples = 1;

			




	
	
	
		
 
    showSymbols = Plot::ShowSymbolsAuto;

			




	
	
	
		
 

			




	
	
	
		
 
    QObject::connect(&zoomer, &Zoomer::unzoomed, this, &Plot::unzoomed);

			




	
	
	
		
 

			




	
	
	
		
 
    zoomer.setZoomBase();

			




	
	
	
		
 
    grid.attach(this);

			




	
	
	
		
 
    legend.attach(this);

			




	
	
		
 
@@ -244,14 +245,44 @@ void Plot::flashSnapshotOverlay(bool lig

			




	
	
	
		
 
            {

			




	
	
	
		
 
                delete snapshotOverlay;

			




	
	
	
		
 
                snapshotOverlay = NULL;

			




	
	
	
		
 
            });

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void Plot::setSymbols(ShowSymbols shown)

			




	
	
	
		
 
{

			




	
	
	
		
 
    showSymbols = shown;

			




	
	
	
		
 

			




	
	
	
		
 
    if (showSymbols == Plot::ShowSymbolsAuto)

			




	
	
	
		
 
    {

			




	
	
	
		
 
        calcSymbolSize();

			




	
	
	
		
 
    }

			




	
	
	
		
 
    else if (showSymbols == Plot::ShowSymbolsShow)

			




	
	
	
		
 
    {

			




	
	
	
		
 
        symbolSize = SYMBOL_SIZE_MAX;

			




	
	
	
		
 
    }

			




	
	
	
		
 
    else

			




	
	
	
		
 
    {

			




	
	
	
		
 
        symbolSize = 0;

			




	
	
	
		
 
    }

			




	
	
	
		
 

			




	
	
	
		
 
    updateSymbols();

			




	
	
	
		
 
    replot();

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void Plot::onXScaleChanged()

			




	
	
	
		
 
{

			




	
	
	
		
 
    if (showSymbols == Plot::ShowSymbolsAuto)

			




	
	
	
		
 
    {

			




	
	
	
		
 
        calcSymbolSize();

			




	
	
	
		
 
        updateSymbols();

			




	
	
	
		
 
    }

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void Plot::calcSymbolSize()

			




	
	
	
		
 
{

			




	
	
	
		
 
    auto sw = axisWidget(QwtPlot::xBottom);

			




	
	
	
		
 
    auto paintDist = sw->scaleDraw()->scaleMap().pDist();

			




	
	
	
		
 
    auto scaleDist = sw->scaleDraw()->scaleMap().sDist();

			




	
	
	
		
 
    auto fullScaleDist = zoomer.zoomBase().width();

			




	
	
	
		
 
    auto zoomRate = fullScaleDist / scaleDist;

			




	
	
	
		
 
    float samplesInView = numOfSamples / zoomRate;

			




	
	
		
 
@@ -262,14 +293,12 @@ void Plot::onXScaleChanged()

			




	
	
	
		
 
        symbolSize = 0;

			




	
	
	
		
 
    }

			




	
	
	
		
 
    else

			




	
	
	
		
 
    {

			




	
	
	
		
 
        symbolSize = std::min(SYMBOL_SIZE_MAX, symDisPx-SYMBOL_SHOW_AT_WIDTH+1);

			




	
	
	
		
 
    }

			




	
	
	
		
 

			




	
	
	
		
 
    updateSymbols();

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void Plot::updateSymbols()

			




	
	
	
		
 
{

			




	
	
	
		
 
    const QwtPlotItemList curves = itemList( QwtPlotItem::Rtti_PlotCurve );

			




	
	
	
		
 

			




	
	
		
 
@@ -294,11 +323,11 @@ void Plot::updateSymbols()

			




	
	
	
		
 
void Plot::resizeEvent(QResizeEvent * event)

			




	
	
	
		
 
{

			




	
	
	
		
 
    QwtPlot::resizeEvent(event);

			




	
	
	
		
 
    onXScaleChanged();

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void Plot::onNumOfSamplesChanged(unsigned value)

			




	
	
	
		
 
void Plot::setNumOfSamples(unsigned value)

			




	
	
	
		
 
{

			




	
	
	
		
 
    numOfSamples = value;

			




	
	
	
		
 
    onXScaleChanged();

			




	
	
	
		
 
}

			




        

    


    
    

    

        

                

                    src/plot.h
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -37,12 +37,19 @@ class Plot : public QwtPlot

			




	
	
	
		
 
{

			




	
	
	
		
 
    Q_OBJECT

			




	
	
	
		
 

			




	
	
	
		
 
    friend class PlotManager;

			




	
	
	
		
 

			




	
	
	
		
 
public:

			




	
	
	
		
 
    enum ShowSymbols

			




	
	
	
		
 
    {

			




	
	
	
		
 
        ShowSymbolsAuto,

			




	
	
	
		
 
        ShowSymbolsShow,

			




	
	
	
		
 
        ShowSymbolsHide

			




	
	
	
		
 
    };

			




	
	
	
		
 

			




	
	
	
		
 
    Plot(QWidget* parent = 0);

			




	
	
	
		
 
    ~Plot();

			




	
	
	
		
 

			




	
	
	
		
 
    static QColor makeColor(unsigned int channelIndex);

			




	
	
	
		
 

			




	
	
	
		
 
public slots:

			




	
	
		
 
@@ -51,21 +58,22 @@ public slots:

			




	
	
	
		
 
    void showLegend(bool show = true);

			




	
	
	
		
 
    void showDemoIndicator(bool show = true);

			




	
	
	
		
 
    void unzoom();

			




	
	
	
		
 
    void darkBackground(bool enabled = true);

			




	
	
	
		
 
    void setYAxis(bool autoScaled, double yMin = 0, double yMax = 1);

			




	
	
	
		
 
    void setXAxis(double xMin, double xMax);

			




	
	
	
		
 
    void setSymbols(ShowSymbols shown);

			




	
	
	
		
 

			




	
	
	
		
 
    /**

			




	
	
	
		
 
     * Displays an animation for snapshot.

			




	
	
	
		
 
     *

			




	
	
	
		
 
     * @param light show a light colored (white) animation or the opposite

			




	
	
	
		
 
     */

			




	
	
	
		
 
    void flashSnapshotOverlay(bool light);

			




	
	
	
		
 

			




	
	
	
		
 
    void onNumOfSamplesChanged(unsigned value);

			




	
	
	
		
 
    void setNumOfSamples(unsigned value);

			




	
	
	
		
 

			




	
	
	
		
 
protected:

			




	
	
	
		
 
    /// update the display of symbols depending on `symbolSize`

			




	
	
	
		
 
    void updateSymbols();

			




	
	
	
		
 

			




	
	
	
		
 
private:

			




	
	
		
 
@@ -77,15 +85,17 @@ private:

			




	
	
	
		
 
    Zoomer zoomer;

			




	
	
	
		
 
    ScaleZoomer sZoomer;

			




	
	
	
		
 
    QwtPlotGrid grid;

			




	
	
	
		
 
    PlotSnapshotOverlay* snapshotOverlay;

			




	
	
	
		
 
    QwtPlotLegendItem legend;

			




	
	
	
		
 
    QwtPlotTextLabel demoIndicator;

			




	
	
	
		
 
    ShowSymbols showSymbols;

			




	
	
	
		
 

			




	
	
	
		
 
    void resetAxes();

			




	
	
	
		
 
    void resizeEvent(QResizeEvent * event);

			




	
	
	
		
 
    void calcSymbolSize();

			




	
	
	
		
 

			




	
	
	
		
 
private slots:

			




	
	
	
		
 
    void unzoomed();

			




	
	
	
		
 
    void onXScaleChanged();

			




	
	
	
		
 
};

			




	
	
	
		
 

			




        

    


    
    

    

        

                

                    src/plotmanager.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -14,12 +14,15 @@

			




	
	
	
		
 
  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/>.

			




	
	
	
		
 
*/

			




	
	
	
		
 

			




	
	
	
		
 
#include <QActionGroup>

			




	
	
	
		
 
#include <QMetaEnum>

			




	
	
	
		
 
#include <QtDebug>

			




	
	
	
		
 
#include "qwt_symbol.h"

			




	
	
	
		
 

			




	
	
	
		
 
#include "plot.h"

			




	
	
	
		
 
#include "plotmanager.h"

			




	
	
	
		
 
#include "utils.h"

			




	
	
	
		
 
#include "setting_defines.h"

			




	
	
		
 
@@ -29,20 +32,23 @@ PlotManager::PlotManager(QWidget* plotAr

			




	
	
	
		
 
    _plotArea(plotArea),

			




	
	
	
		
 
    showGridAction("&Grid", this),

			




	
	
	
		
 
    showMinorGridAction("&Minor Grid", this),

			




	
	
	
		
 
    unzoomAction("&Unzoom", this),

			




	
	
	
		
 
    darkBackgroundAction("&Dark Background", this),

			




	
	
	
		
 
    showLegendAction("&Legend", this),

			




	
	
	
		
 
    showMultiAction("Multi &Plot", this)

			




	
	
	
		
 
    showMultiAction("Multi &Plot", this),

			




	
	
	
		
 
    setSymbolsAction("Symbols", this)

			




	
	
	
		
 
{

			




	
	
	
		
 
    _autoScaled = true;

			




	
	
	
		
 
    _yMin = 0;

			




	
	
	
		
 
    _yMax = 1;

			




	
	
	
		
 
    _xAxisAsIndex = true;

			




	
	
	
		
 
    isDemoShown = false;

			




	
	
	
		
 
    _infoModel = infoModel;

			




	
	
	
		
 
    _numOfSamples = 1;

			




	
	
	
		
 
    showSymbols = Plot::ShowSymbolsAuto;

			




	
	
	
		
 

			




	
	
	
		
 
    // initalize layout and single widget

			




	
	
	
		
 
    isMulti = false;

			




	
	
	
		
 
    scrollArea = NULL;

			




	
	
	
		
 
    setupLayout(isMulti);

			




	
	
	
		
 
    addPlotWidget();

			




	
	
		
 
@@ -51,12 +57,13 @@ PlotManager::PlotManager(QWidget* plotAr

			




	
	
	
		
 
    showGridAction.setToolTip("Show Grid");

			




	
	
	
		
 
    showMinorGridAction.setToolTip("Show Minor Grid");

			




	
	
	
		
 
    unzoomAction.setToolTip("Unzoom the Plot");

			




	
	
	
		
 
    darkBackgroundAction.setToolTip("Enable Dark Plot Background");

			




	
	
	
		
 
    showLegendAction.setToolTip("Display the Legend on Plot");

			




	
	
	
		
 
    showMultiAction.setToolTip("Display All Channels Separately");

			




	
	
	
		
 
    setSymbolsAction.setToolTip("Show/Hide symbols");

			




	
	
	
		
 

			




	
	
	
		
 
    showGridAction.setShortcut(QKeySequence("G"));

			




	
	
	
		
 
    showMinorGridAction.setShortcut(QKeySequence("M"));

			




	
	
	
		
 

			




	
	
	
		
 
    showGridAction.setCheckable(true);

			




	
	
	
		
 
    showMinorGridAction.setCheckable(true);

			




	
	
		
 
@@ -69,12 +76,43 @@ PlotManager::PlotManager(QWidget* plotAr

			




	
	
	
		
 
    darkBackgroundAction.setChecked(false);

			




	
	
	
		
 
    showLegendAction.setChecked(true);

			




	
	
	
		
 
    showMultiAction.setChecked(false);

			




	
	
	
		
 

			




	
	
	
		
 
    showMinorGridAction.setEnabled(false);

			




	
	
	
		
 

			




	
	
	
		
 
    // setup symbols menu

			




	
	
	
		
 
    setSymbolsAutoAct = setSymbolsMenu.addAction("Show When Zoomed");

			




	
	
	
		
 
    setSymbolsAutoAct->setCheckable(true);

			




	
	
	
		
 
    setSymbolsAutoAct->setChecked(true);

			




	
	
	
		
 
    connect(setSymbolsAutoAct, SELECT<bool>::OVERLOAD_OF(&QAction::triggered),

			




	
	
	
		
 
            [this](bool checked)

			




	
	
	
		
 
            {

			




	
	
	
		
 
                if (checked) setSymbols(Plot::ShowSymbolsAuto);

			




	
	
	
		
 
            });

			




	
	
	
		
 
    setSymbolsShowAct = setSymbolsMenu.addAction("Always Show");

			




	
	
	
		
 
    setSymbolsShowAct->setCheckable(true);

			




	
	
	
		
 
    connect(setSymbolsShowAct, SELECT<bool>::OVERLOAD_OF(&QAction::triggered),

			




	
	
	
		
 
            [this](bool checked)

			




	
	
	
		
 
            {

			




	
	
	
		
 
                if (checked) setSymbols(Plot::ShowSymbolsShow);

			




	
	
	
		
 
            });

			




	
	
	
		
 
    setSymbolsHideAct = setSymbolsMenu.addAction("Always Hide");

			




	
	
	
		
 
    setSymbolsHideAct->setCheckable(true);

			




	
	
	
		
 
    connect(setSymbolsHideAct, SELECT<bool>::OVERLOAD_OF(&QAction::triggered),

			




	
	
	
		
 
            [this](bool checked)

			




	
	
	
		
 
            {

			




	
	
	
		
 
                if (checked) setSymbols(Plot::ShowSymbolsHide);

			




	
	
	
		
 
            });

			




	
	
	
		
 
    setSymbolsAction.setMenu(&setSymbolsMenu);

			




	
	
	
		
 

			




	
	
	
		
 
    // add symbol actions to same group so that they appear as radio buttons

			




	
	
	
		
 
    auto group = new QActionGroup(this);

			




	
	
	
		
 
    group->addAction(setSymbolsAutoAct);

			




	
	
	
		
 
    group->addAction(setSymbolsShowAct);

			




	
	
	
		
 
    group->addAction(setSymbolsHideAct);

			




	
	
	
		
 

			




	
	
	
		
 
    connect(&showGridAction, SELECT<bool>::OVERLOAD_OF(&QAction::triggered),

			




	
	
	
		
 
            this, &PlotManager::showGrid);

			




	
	
	
		
 
    connect(&showGridAction, SELECT<bool>::OVERLOAD_OF(&QAction::triggered),

			




	
	
	
		
 
            &showMinorGridAction, &QAction::setEnabled);

			




	
	
	
		
 
    connect(&showMinorGridAction, SELECT<bool>::OVERLOAD_OF(&QAction::triggered),

			




	
	
	
		
 
            this, &PlotManager::showMinorGrid);

			




	
	
		
 
@@ -249,12 +287,14 @@ Plot* PlotManager::addPlotWidget()

			




	
	
	
		
 
    plot->darkBackground(darkBackgroundAction.isChecked());

			




	
	
	
		
 
    plot->showGrid(showGridAction.isChecked());

			




	
	
	
		
 
    plot->showMinorGrid(showMinorGridAction.isChecked());

			




	
	
	
		
 
    plot->showLegend(showLegendAction.isChecked());

			




	
	
	
		
 
    plot->showDemoIndicator(isDemoShown);

			




	
	
	
		
 
    plot->setYAxis(_autoScaled, _yMin, _yMax);

			




	
	
	
		
 
    plot->setNumOfSamples(_numOfSamples);

			




	
	
	
		
 
    plot->setSymbols(showSymbols);

			




	
	
	
		
 

			




	
	
	
		
 
    if (_xAxisAsIndex)

			




	
	
	
		
 
    {

			




	
	
	
		
 
        plot->setXAxis(0, _numOfSamples);

			




	
	
	
		
 
    }

			




	
	
	
		
 
    else

			




	
	
		
 
@@ -360,12 +400,13 @@ QList<QAction*> PlotManager::menuActions

			




	
	
	
		
 
    actions << &showGridAction;

			




	
	
	
		
 
    actions << &showMinorGridAction;

			




	
	
	
		
 
    actions << &unzoomAction;

			




	
	
	
		
 
    actions << &darkBackgroundAction;

			




	
	
	
		
 
    actions << &showLegendAction;

			




	
	
	
		
 
    actions << &showMultiAction;

			




	
	
	
		
 
    actions << &setSymbolsAction;

			




	
	
	
		
 
    return actions;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void PlotManager::showGrid(bool show)

			




	
	
	
		
 
{

			




	
	
	
		
 
    for (auto plot : plotWidgets)

			




	
	
		
 
@@ -412,12 +453,21 @@ void PlotManager::darkBackground(bool en

			




	
	
	
		
 
    for (auto plot : plotWidgets)

			




	
	
	
		
 
    {

			




	
	
	
		
 
        plot->darkBackground(enabled);

			




	
	
	
		
 
    }

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void PlotManager::setSymbols(Plot::ShowSymbols shown)

			




	
	
	
		
 
{

			




	
	
	
		
 
    showSymbols = shown;

			




	
	
	
		
 
    for (auto plot : plotWidgets)

			




	
	
	
		
 
    {

			




	
	
	
		
 
        plot->setSymbols(shown);

			




	
	
	
		
 
    }

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void PlotManager::setYAxis(bool autoScaled, double yAxisMin, double yAxisMax)

			




	
	
	
		
 
{

			




	
	
	
		
 
    _autoScaled = autoScaled;

			




	
	
	
		
 
    _yMin = yAxisMin;

			




	
	
	
		
 
    _yMax = yAxisMax;

			




	
	
	
		
 
    for (auto plot : plotWidgets)

			




	
	
		
 
@@ -456,30 +506,87 @@ void PlotManager::flashSnapshotOverlay()

			




	
	
	
		
 
    for (auto plot : plotWidgets)

			




	
	
	
		
 
    {

			




	
	
	
		
 
        plot->flashSnapshotOverlay(darkBackgroundAction.isChecked());

			




	
	
	
		
 
    }

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void PlotManager::onNumOfSamplesChanged(unsigned value)

			




	
	
	
		
 
void PlotManager::setNumOfSamples(unsigned value)

			




	
	
	
		
 
{

			




	
	
	
		
 
    _numOfSamples = value;

			




	
	
	
		
 
    for (auto plot : plotWidgets)

			




	
	
	
		
 
    {

			




	
	
	
		
 
        plot->onNumOfSamplesChanged(value);

			




	
	
	
		
 
        plot->setNumOfSamples(value);

			




	
	
	
		
 
        if (_xAxisAsIndex) plot->setXAxis(0, value);

			




	
	
	
		
 
    }

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
PlotViewSettings PlotManager::viewSettings() const

			




	
	
	
		
 
{

			




	
	
	
		
 
    return PlotViewSettings(

			




	
	
	
		
 
        {

			




	
	
	
		
 
            showGridAction.isChecked(),

			




	
	
	
		
 
            showMinorGridAction.isChecked(),

			




	
	
	
		
 
            darkBackgroundAction.isChecked(),

			




	
	
	
		
 
            showLegendAction.isChecked(),

			




	
	
	
		
 
            showMultiAction.isChecked(),

			




	
	
	
		
 
            showSymbols

			




	
	
	
		
 
        });

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void PlotManager::setViewSettings(const PlotViewSettings& settings)

			




	
	
	
		
 
{

			




	
	
	
		
 
    showGridAction.setChecked(settings.showGrid);

			




	
	
	
		
 
    showGrid(settings.showGrid);

			




	
	
	
		
 
    showMinorGridAction.setChecked(settings.showMinorGrid);

			




	
	
	
		
 
    showMinorGrid(settings.showMinorGrid);

			




	
	
	
		
 
    darkBackgroundAction.setChecked(settings.darkBackground);

			




	
	
	
		
 
    darkBackground(settings.darkBackground);

			




	
	
	
		
 
    showLegendAction.setChecked(settings.showLegend);

			




	
	
	
		
 
    showLegend(settings.showLegend);

			




	
	
	
		
 
    showMultiAction.setChecked(settings.showMulti);

			




	
	
	
		
 
    setMulti(settings.showMulti);

			




	
	
	
		
 

			




	
	
	
		
 
    setSymbols(settings.showSymbols);

			




	
	
	
		
 
    if (showSymbols == Plot::ShowSymbolsAuto)

			




	
	
	
		
 
    {

			




	
	
	
		
 
        setSymbolsAutoAct->setChecked(true);

			




	
	
	
		
 
    }

			




	
	
	
		
 
    else if (showSymbols == Plot::ShowSymbolsShow)

			




	
	
	
		
 
    {

			




	
	
	
		
 
        setSymbolsShowAct->setChecked(true);

			




	
	
	
		
 
    }

			




	
	
	
		
 
    else

			




	
	
	
		
 
    {

			




	
	
	
		
 
        setSymbolsHideAct->setChecked(true);

			




	
	
	
		
 
    }

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void PlotManager::saveSettings(QSettings* settings)

			




	
	
	
		
 
{

			




	
	
	
		
 
    settings->beginGroup(SettingGroup_Plot);

			




	
	
	
		
 
    settings->setValue(SG_Plot_DarkBackground, darkBackgroundAction.isChecked());

			




	
	
	
		
 
    settings->setValue(SG_Plot_Grid, showGridAction.isChecked());

			




	
	
	
		
 
    settings->setValue(SG_Plot_MinorGrid, showMinorGridAction.isChecked());

			




	
	
	
		
 
    settings->setValue(SG_Plot_Legend, showLegendAction.isChecked());

			




	
	
	
		
 
    settings->setValue(SG_Plot_MultiPlot, showMultiAction.isChecked());

			




	
	
	
		
 

			




	
	
	
		
 
    QString showSymbolsStr;

			




	
	
	
		
 
    if (showSymbols == Plot::ShowSymbolsAuto)

			




	
	
	
		
 
    {

			




	
	
	
		
 
        showSymbolsStr = "auto";

			




	
	
	
		
 
    }

			




	
	
	
		
 
    else if (showSymbols == Plot::ShowSymbolsShow)

			




	
	
	
		
 
    {

			




	
	
	
		
 
        showSymbolsStr = "show";

			




	
	
	
		
 
    }

			




	
	
	
		
 
    else

			




	
	
	
		
 
    {

			




	
	
	
		
 
        showSymbolsStr = "hide";

			




	
	
	
		
 
    }

			




	
	
	
		
 
    settings->setValue(SG_Plot_Symbols, showSymbolsStr);

			




	
	
	
		
 

			




	
	
	
		
 
    settings->endGroup();

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void PlotManager::loadSettings(QSettings* settings)

			




	
	
	
		
 
{

			




	
	
	
		
 
    settings->beginGroup(SettingGroup_Plot);

			




	
	
		
 
@@ -496,8 +603,30 @@ void PlotManager::loadSettings(QSettings

			




	
	
	
		
 
    showLegendAction.setChecked(

			




	
	
	
		
 
        settings->value(SG_Plot_Legend, showLegendAction.isChecked()).toBool());

			




	
	
	
		
 
    showLegend(showLegendAction.isChecked());

			




	
	
	
		
 
    showMultiAction.setChecked(

			




	
	
	
		
 
        settings->value(SG_Plot_MultiPlot, showMultiAction.isChecked()).toBool());

			




	
	
	
		
 
    setMulti(showMultiAction.isChecked());

			




	
	
	
		
 

			




	
	
	
		
 
    QString showSymbolsStr = settings->value(SG_Plot_Symbols, QString()).toString();

			




	
	
	
		
 
    if (showSymbolsStr == "auto")

			




	
	
	
		
 
    {

			




	
	
	
		
 
        setSymbols(Plot::ShowSymbolsAuto);

			




	
	
	
		
 
        setSymbolsAutoAct->setChecked(true);

			




	
	
	
		
 
    }

			




	
	
	
		
 
    else if (showSymbolsStr == "show")

			




	
	
	
		
 
    {

			




	
	
	
		
 
        setSymbols(Plot::ShowSymbolsShow);

			




	
	
	
		
 
        setSymbolsShowAct->setChecked(true);

			




	
	
	
		
 
    }

			




	
	
	
		
 
    else if (showSymbolsStr == "hide")

			




	
	
	
		
 
    {

			




	
	
	
		
 
        setSymbols(Plot::ShowSymbolsHide);

			




	
	
	
		
 
        setSymbolsHideAct->setChecked(true);

			




	
	
	
		
 
    }

			




	
	
	
		
 
    else

			




	
	
	
		
 
    {

			




	
	
	
		
 
        qCritical() << "Invalid symbol setting:" << showSymbolsStr;

			




	
	
	
		
 
    }

			




	
	
	
		
 

			




	
	
	
		
 
    settings->endGroup();

			




	
	
	
		
 
}

			




        

    


    
    

    

        

                

                    src/plotmanager.h
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -23,18 +23,30 @@

			




	
	
	
		
 
#include <QObject>

			




	
	
	
		
 
#include <QWidget>

			




	
	
	
		
 
#include <QScrollArea>

			




	
	
	
		
 
#include <QVBoxLayout>

			




	
	
	
		
 
#include <QList>

			




	
	
	
		
 
#include <QSettings>

			




	
	
	
		
 
#include <QAction>

			




	
	
	
		
 
#include <QMenu>

			




	
	
	
		
 

			




	
	
	
		
 
#include <qwt_plot_curve.h>

			




	
	
	
		
 
#include "plot.h"

			




	
	
	
		
 
#include "framebufferseries.h"

			




	
	
	
		
 
#include "channelinfomodel.h"

			




	
	
	
		
 

			




	
	
	
		
 
struct PlotViewSettings

			




	
	
	
		
 
{

			




	
	
	
		
 
    bool showGrid;

			




	
	
	
		
 
    bool showMinorGrid;

			




	
	
	
		
 
    bool darkBackground;

			




	
	
	
		
 
    bool showLegend;

			




	
	
	
		
 
    bool showMulti;

			




	
	
	
		
 
    Plot::ShowSymbols showSymbols;

			




	
	
	
		
 
};

			




	
	
	
		
 

			




	
	
	
		
 
class PlotManager : public QObject

			




	
	
	
		
 
{

			




	
	
	
		
 
    Q_OBJECT

			




	
	
	
		
 

			




	
	
	
		
 
public:

			




	
	
	
		
 
    explicit PlotManager(QWidget* plotArea, ChannelInfoModel* infoModel = NULL, QObject *parent = 0);

			




	
	
		
 
@@ -49,12 +61,16 @@ public:

			




	
	
	
		
 
    /// Removes curves from the end

			




	
	
	
		
 
    void removeCurves(unsigned number);

			




	
	
	
		
 
    /// Returns current number of curves known by plot manager

			




	
	
	
		
 
    unsigned numOfCurves();

			




	
	
	
		
 
    /// Returns the list of actions to be inserted into the `View` menu

			




	
	
	
		
 
    QList<QAction*> menuActions();

			




	
	
	
		
 
    /// Returns current status of menu actions

			




	
	
	
		
 
    PlotViewSettings viewSettings() const;

			




	
	
	
		
 
    /// Set the current state of view

			




	
	
	
		
 
    void setViewSettings(const PlotViewSettings& settings);

			




	
	
	
		
 
    /// Stores plot settings into a `QSettings`.

			




	
	
	
		
 
    void saveSettings(QSettings* settings);

			




	
	
	
		
 
    /// Loads plot settings from a `QSettings`.

			




	
	
	
		
 
    void loadSettings(QSettings* settings);

			




	
	
	
		
 

			




	
	
	
		
 
public slots:

			




	
	
		
 
@@ -68,13 +84,13 @@ public slots:

			




	
	
	
		
 
    void setYAxis(bool autoScaled, double yMin = 0, double yMax = 1);

			




	
	
	
		
 
    /// Set the X axis

			




	
	
	
		
 
    void setXAxis(bool asIndex, double xMin = 0 , double xMax = 1);

			




	
	
	
		
 
    /// Display an animation for snapshot

			




	
	
	
		
 
    void flashSnapshotOverlay();

			




	
	
	
		
 
    /// Should be called to update zoom base

			




	
	
	
		
 
    void onNumOfSamplesChanged(unsigned value);

			




	
	
	
		
 
    void setNumOfSamples(unsigned value);

			




	
	
	
		
 

			




	
	
	
		
 
private:

			




	
	
	
		
 
    bool isMulti;

			




	
	
	
		
 
    QWidget* _plotArea;

			




	
	
	
		
 
    QVBoxLayout* layout; ///< layout of the `plotArea`

			




	
	
	
		
 
    QScrollArea* scrollArea;

			




	
	
		
 
@@ -86,28 +102,35 @@ private:

			




	
	
	
		
 
    double _yMin;

			




	
	
	
		
 
    double _yMax;

			




	
	
	
		
 
    bool _xAxisAsIndex;

			




	
	
	
		
 
    double _xMin;

			




	
	
	
		
 
    double _xMax;

			




	
	
	
		
 
    unsigned _numOfSamples;

			




	
	
	
		
 
    Plot::ShowSymbols showSymbols;

			




	
	
	
		
 

			




	
	
	
		
 
    // menu actions

			




	
	
	
		
 
    QAction showGridAction;

			




	
	
	
		
 
    QAction showMinorGridAction;

			




	
	
	
		
 
    QAction unzoomAction;

			




	
	
	
		
 
    QAction darkBackgroundAction;

			




	
	
	
		
 
    QAction showLegendAction;

			




	
	
	
		
 
    QAction showMultiAction;

			




	
	
	
		
 
    QAction setSymbolsAction;

			




	
	
	
		
 
    QMenu setSymbolsMenu;

			




	
	
	
		
 
    QAction* setSymbolsAutoAct;

			




	
	
	
		
 
    QAction* setSymbolsShowAct;

			




	
	
	
		
 
    QAction* setSymbolsHideAct;

			




	
	
	
		
 

			




	
	
	
		
 
    void setupLayout(bool multiPlot);

			




	
	
	
		
 
    /// Inserts a new plot widget to the current layout.

			




	
	
	
		
 
    Plot* addPlotWidget();

			




	
	
	
		
 
    /// Returns the plot widget that given curve is attached to

			




	
	
	
		
 
    Plot* plotWidget(unsigned curveIndex);

			




	
	
	
		
 
    /// Common part of overloaded `addCurve` functions

			




	
	
	
		
 
    void _addCurve(QwtPlotCurve* curve);

			




	
	
	
		
 
    void setSymbols(Plot::ShowSymbols shown);

			




	
	
	
		
 

			




	
	
	
		
 
private slots:

			




	
	
	
		
 
    void showGrid(bool show = true);

			




	
	
	
		
 
    void showMinorGrid(bool show = true);

			




	
	
	
		
 
    void showLegend(bool show = true);

			




	
	
	
		
 
    void unzoom();

			




        

    


    
    

    

        

                

                    src/setting_defines.h
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -84,12 +84,13 @@ const char SG_Plot_YMax[] = "yMax";

			




	
	
	
		
 
const char SG_Plot_YMin[] = "yMin";

			




	
	
	
		
 
const char SG_Plot_DarkBackground[] = "darkBackground";

			




	
	
	
		
 
const char SG_Plot_Grid[] = "grid";

			




	
	
	
		
 
const char SG_Plot_MinorGrid[] = "minorGrid";

			




	
	
	
		
 
const char SG_Plot_Legend[] = "legend";

			




	
	
	
		
 
const char SG_Plot_MultiPlot[] = "multiPlot";

			




	
	
	
		
 
const char SG_Plot_Symbols[] = "symbols";

			




	
	
	
		
 

			




	
	
	
		
 
// command setting keys

			




	
	
	
		
 
const char SG_Commands_Command[] = "command";

			




	
	
	
		
 
const char SG_Commands_Name[] = "name";

			




	
	
	
		
 
const char SG_Commands_Type[] = "type";

			




	
	
	
		
 
const char SG_Commands_Data[] = "data";

			




        

    


    
    

    

        

                

                    src/snapshot.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
	
		
 
/*

			




	
	
	
		
 
  Copyright © 2015 Hasan Yavuz Özderya

			




	
	
	
		
 
  Copyright © 2017 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

			




	
	
		
 
@@ -18,16 +18,17 @@

			




	
	
	
		
 
*/

			




	
	
	
		
 

			




	
	
	
		
 
#include <stddef.h>

			




	
	
	
		
 
#include <QSaveFile>

			




	
	
	
		
 
#include <QTextStream>

			




	
	
	
		
 

			




	
	
	
		
 
#include "mainwindow.h"

			




	
	
	
		
 
#include "snapshot.h"

			




	
	
	
		
 
#include "snapshotview.h"

			




	
	
	
		
 

			




	
	
	
		
 
Snapshot::Snapshot(QMainWindow* parent, QString name, ChannelInfoModel infoModel) :

			




	
	
	
		
 
Snapshot::Snapshot(MainWindow* parent, QString name, ChannelInfoModel infoModel) :

			




	
	
	
		
 
    QObject(parent),

			




	
	
	
		
 
    cInfoModel(infoModel),

			




	
	
	
		
 
    _showAction(this),

			




	
	
	
		
 
    _deleteAction("&Delete", this)

			




	
	
	
		
 
{

			




	
	
	
		
 
    _name = name;

			




        

    


    
    

    

        

                

                    src/snapshot.h
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
	
		
 
/*

			




	
	
	
		
 
  Copyright © 2015 Hasan Yavuz Özderya

			




	
	
	
		
 
  Copyright © 2017 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

			




	
	
		
 
@@ -18,28 +18,28 @@

			




	
	
	
		
 
*/

			




	
	
	
		
 

			




	
	
	
		
 
#ifndef SNAPSHOT_H

			




	
	
	
		
 
#define SNAPSHOT_H

			




	
	
	
		
 

			




	
	
	
		
 
#include <QObject>

			




	
	
	
		
 
#include <QMainWindow>

			




	
	
	
		
 
#include <QAction>

			




	
	
	
		
 
#include <QVector>

			




	
	
	
		
 
#include <QString>

			




	
	
	
		
 
#include <QStringList>

			




	
	
	
		
 

			




	
	
	
		
 
#include "channelinfomodel.h"

			




	
	
	
		
 

			




	
	
	
		
 
class SnapshotView;

			




	
	
	
		
 
class MainWindow;

			




	
	
	
		
 

			




	
	
	
		
 
class Snapshot : public QObject

			




	
	
	
		
 
{

			




	
	
	
		
 
    Q_OBJECT

			




	
	
	
		
 

			




	
	
	
		
 
public:

			




	
	
	
		
 
    Snapshot(QMainWindow* parent, QString name, ChannelInfoModel infoModel);

			




	
	
	
		
 
    Snapshot(MainWindow* parent, QString name, ChannelInfoModel infoModel);

			




	
	
	
		
 
    ~Snapshot();

			




	
	
	
		
 

			




	
	
	
		
 
    QVector<QVector<QPointF>> data;

			




	
	
	
		
 
    QAction* showAction();

			




	
	
	
		
 
    QAction* deleteAction();

			




	
	
	
		
 

			




	
	
		
 
@@ -58,13 +58,13 @@ signals:

			




	
	
	
		
 

			




	
	
	
		
 
private:

			




	
	
	
		
 
    QString _name;

			




	
	
	
		
 
    ChannelInfoModel cInfoModel;

			




	
	
	
		
 
    QAction _showAction;

			




	
	
	
		
 
    QAction _deleteAction;

			




	
	
	
		
 
    QMainWindow* mainWindow;

			




	
	
	
		
 
    MainWindow* mainWindow;

			




	
	
	
		
 
    SnapshotView* view;

			




	
	
	
		
 
    bool _saved;

			




	
	
	
		
 

			




	
	
	
		
 
private slots:

			




	
	
	
		
 
    void show();

			




	
	
	
		
 
    void viewClosed();

			




        

    


    
    

    

        

                

                    src/snapshotmanager.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -24,15 +24,16 @@

			




	
	
	
		
 
#include <QFile>

			




	
	
	
		
 
#include <QVector>

			




	
	
	
		
 
#include <QPointF>

			




	
	
	
		
 
#include <QIcon>

			




	
	
	
		
 
#include <QtDebug>

			




	
	
	
		
 

			




	
	
	
		
 
#include "mainwindow.h"

			




	
	
	
		
 
#include "snapshotmanager.h"

			




	
	
	
		
 

			




	
	
	
		
 
SnapshotManager::SnapshotManager(QMainWindow* mainWindow,

			




	
	
	
		
 
SnapshotManager::SnapshotManager(MainWindow* mainWindow,

			




	
	
	
		
 
                                 ChannelManager* channelMan) :

			




	
	
	
		
 
    _menu("&Snapshots"),

			




	
	
	
		
 
    _takeSnapshotAction("&Take Snapshot", this),

			




	
	
	
		
 
    loadSnapshotAction("&Load Snapshots", this),

			




	
	
	
		
 
    clearAction("&Clear Snapshots", this)

			




	
	
	
		
 
{

			




        

    


    
    

    

        

                

                    src/snapshotmanager.h
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
	
		
 
/*

			




	
	
	
		
 
  Copyright © 2015 Hasan Yavuz Özderya

			




	
	
	
		
 
  Copyright © 2017 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

			




	
	
		
 
@@ -25,31 +25,33 @@

			




	
	
	
		
 
#include <QMenu>

			




	
	
	
		
 

			




	
	
	
		
 
#include "framebuffer.h"

			




	
	
	
		
 
#include "channelmanager.h"

			




	
	
	
		
 
#include "snapshot.h"

			




	
	
	
		
 

			




	
	
	
		
 
class MainWindow;

			




	
	
	
		
 

			




	
	
	
		
 
class SnapshotManager : public QObject

			




	
	
	
		
 
{

			




	
	
	
		
 
    Q_OBJECT

			




	
	
	
		
 

			




	
	
	
		
 
public:

			




	
	
	
		
 
    SnapshotManager(QMainWindow* mainWindow, ChannelManager* channelMan);

			




	
	
	
		
 
    SnapshotManager(MainWindow* mainWindow, ChannelManager* channelMan);

			




	
	
	
		
 
    ~SnapshotManager();

			




	
	
	
		
 

			




	
	
	
		
 
    QMenu* menu();

			




	
	
	
		
 
    QAction* takeSnapshotAction();

			




	
	
	
		
 

			




	
	
	
		
 
    /// Creates a dynamically allocated snapshot object but doesn't record it in snapshots list.

			




	
	
	
		
 
    /// @note Caller is responsible for deletion of the returned `Snapshot` object.

			




	
	
	
		
 
    Snapshot* makeSnapshot();

			




	
	
	
		
 

			




	
	
	
		
 
    bool isAllSaved(); ///< returns `true` if all snapshots are saved to a file

			




	
	
	
		
 

			




	
	
	
		
 
private:

			




	
	
	
		
 
    QMainWindow* _mainWindow;

			




	
	
	
		
 
    MainWindow* _mainWindow;

			




	
	
	
		
 
    ChannelManager* _channelMan;

			




	
	
	
		
 

			




	
	
	
		
 
    QList<Snapshot*> snapshots;

			




	
	
	
		
 

			




	
	
	
		
 
    QMenu _menu;

			




	
	
	
		
 
    QAction _takeSnapshotAction;

			




        

    


    
    

    

        

                

                    src/snapshotview.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
	
		
 
/*

			




	
	
	
		
 
  Copyright © 2015 Hasan Yavuz Özderya

			




	
	
	
		
 
  Copyright © 2017 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

			




	
	
		
 
@@ -17,32 +17,35 @@

			




	
	
	
		
 
  along with serialplot.  If not, see <http://www.gnu.org/licenses/>.

			




	
	
	
		
 
*/

			




	
	
	
		
 

			




	
	
	
		
 
#include "snapshotview.h"

			




	
	
	
		
 
#include "ui_snapshotview.h"

			




	
	
	
		
 

			




	
	
	
		
 
SnapshotView::SnapshotView(QWidget *parent, Snapshot* snapshot) :

			




	
	
	
		
 
SnapshotView::SnapshotView(MainWindow* parent, Snapshot* snapshot) :

			




	
	
	
		
 
    QMainWindow(parent),

			




	
	
	
		
 
    ui(new Ui::SnapshotView),

			




	
	
	
		
 
    renameDialog(this)

			




	
	
	
		
 
{

			




	
	
	
		
 
    _snapshot = snapshot;

			




	
	
	
		
 

			




	
	
	
		
 
    ui->setupUi(this);

			




	
	
	
		
 

			




	
	
	
		
 
    plotMan = new PlotManager(ui->plotArea, snapshot->infoModel());

			




	
	
	
		
 
    plotMan = new PlotManager(ui->plotArea, snapshot->infoModel(), this);

			




	
	
	
		
 
    plotMan->setViewSettings(parent->viewSettings());

			




	
	
	
		
 

			




	
	
	
		
 
    ui->menuSnapshot->insertAction(ui->actionClose, snapshot->deleteAction());

			




	
	
	
		
 
    this->setWindowTitle(snapshot->displayName());

			




	
	
	
		
 

			




	
	
	
		
 
    // initialize curves

			




	
	
	
		
 
    unsigned numOfChannels = snapshot->data.size();

			




	
	
	
		
 
    unsigned numOfSamples = snapshot->data[0].size();

			




	
	
	
		
 
    for (unsigned ci = 0; ci < numOfChannels; ci++)

			




	
	
	
		
 
    {

			




	
	
	
		
 
        plotMan->addCurve(snapshot->channelName(ci), snapshot->data[ci]);

			




	
	
	
		
 
    }

			




	
	
	
		
 
    plotMan->setNumOfSamples(numOfSamples);

			




	
	
	
		
 

			




	
	
	
		
 
    renameDialog.setWindowTitle("Rename Snapshot");

			




	
	
	
		
 
    renameDialog.setLabelText("Enter new name:");

			




	
	
	
		
 
    connect(ui->actionRename, &QAction::triggered,

			




	
	
	
		
 
            this, &SnapshotView::showRenameDialog);

			




	
	
	
		
 

			




	
	
		
 
@@ -59,12 +62,13 @@ SnapshotView::SnapshotView(QWidget *pare

			




	
	
	
		
 
SnapshotView::~SnapshotView()

			




	
	
	
		
 
{

			




	
	
	
		
 
    for (auto curve : curves)

			




	
	
	
		
 
    {

			




	
	
	
		
 
        delete curve;

			




	
	
	
		
 
    }

			




	
	
	
		
 
    delete plotMan;

			




	
	
	
		
 
    delete ui;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void SnapshotView::closeEvent(QCloseEvent *event)

			




	
	
	
		
 
{

			




	
	
	
		
 
    QMainWindow::closeEvent(event);

			




        

    


    
    

    

        

                

                    src/snapshotview.h
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
	
		
 
/*

			




	
	
	
		
 
  Copyright © 2015 Hasan Yavuz Özderya

			




	
	
	
		
 
  Copyright © 2017 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

			




	
	
		
 
@@ -26,25 +26,26 @@

			




	
	
	
		
 
#include <QVector>

			




	
	
	
		
 
#include <QPointF>

			




	
	
	
		
 
#include <QPen>

			




	
	
	
		
 
#include <QCloseEvent>

			




	
	
	
		
 
#include <qwt_plot_curve.h>

			




	
	
	
		
 

			




	
	
	
		
 
#include "mainwindow.h"

			




	
	
	
		
 
#include "plotmanager.h"

			




	
	
	
		
 
#include "snapshot.h"

			




	
	
	
		
 

			




	
	
	
		
 
namespace Ui {

			




	
	
	
		
 
class SnapshotView;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
class SnapshotView : public QMainWindow

			




	
	
	
		
 
{

			




	
	
	
		
 
    Q_OBJECT

			




	
	
	
		
 

			




	
	
	
		
 
public:

			




	
	
	
		
 
    explicit SnapshotView(QWidget *parent, Snapshot* snapshot);

			




	
	
	
		
 
    explicit SnapshotView(MainWindow* parent, Snapshot* snapshot);

			




	
	
	
		
 
    ~SnapshotView();

			




	
	
	
		
 

			




	
	
	
		
 
signals:

			




	
	
	
		
 
    void closed();

			




	
	
	
		
 

			




	
	
	
		
 
private:

			




        

    


    
    

    

        

                

                    src/version.h
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -18,13 +18,14 @@

			




	
	
	
		
 
*/

			




	
	
	
		
 

			




	
	
	
		
 
#ifndef VERSION_H

			




	
	
	
		
 
#define VERSION_H

			




	
	
	
		
 

			




	
	
	
		
 
#ifndef VERSION_STRING

			




	
	
	
		
 
#define VERSION_STRING   "0.9.0"

			




	
	
	
		
 
#warning VERSION_STRING not defined!

			




	
	
	
		
 
#define VERSION_STRING   "0.0.0"

			




	
	
	
		
 
#endif

			




	
	
	
		
 

			




	
	
	
		
 
#ifndef VERSION_REVISION

			




	
	
	
		
 
#define VERSION_REVISION ""

			




	
	
	
		
 
#endif

			




	
	
	
		
 

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        Server instance: zserverv-307515
    
    
        This site is powered by
            Kallithea,
        which is
        © 2010–2021 by various authors & licensed under GPLv3.
            – Support