Changeset - bdc33b5c53c6
[Not reviewed]
default
! ! !
Hasan Yavuz Ă–ZDERYA - 10 years ago 2016-02-28 13:53:11
hy@ozderya.net
moved all source files (.h, .cpp, .ui) to src/ directory
51 files changed with 82 insertions and 80 deletions:
0 comments (0 inline, 0 general)
CMakeLists.txt
Show inline comments
 
@@ -40,67 +40,67 @@ find_package(Qt5Widgets)
 
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})
 
include_directories("./src" ${QWT_INCLUDE_DIR})
 

	
 
# wrap UI and resource files
 
qt5_wrap_ui(UI_FILES
 
  mainwindow.ui
 
  portcontrol.ui
 
  about_dialog.ui
 
  snapshotview.ui
 
  commandpanel.ui
 
  commandwidget.ui
 
  dataformatpanel.ui
 
  src/mainwindow.ui
 
  src/portcontrol.ui
 
  src/about_dialog.ui
 
  src/snapshotview.ui
 
  src/commandpanel.ui
 
  src/commandwidget.ui
 
  src/dataformatpanel.ui
 
  )
 

	
 
if (WIN32)
 
  qt5_add_resources(RES_FILES misc/icons.qrc misc/winicons.qrc)
 
else (WIN32)
 
  qt5_add_resources(RES_FILES misc/icons.qrc)
 
endif (WIN32)
 

	
 
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
 
  snapshotmanager.cpp
 
  plotsnapshotoverlay.cpp
 
  commandpanel.cpp
 
  commandwidget.cpp
 
  commandedit.cpp
 
  dataformatpanel.cpp
 
  tooltipfilter.cpp
 
  sneakylineedit.cpp
 
  src/main.cpp
 
  src/mainwindow.cpp
 
  src/portcontrol.cpp
 
  src/plot.cpp
 
  src/zoomer.cpp
 
  src/hidabletabwidget.cpp
 
  src/framebuffer.cpp
 
  src/scalepicker.cpp
 
  src/scalezoomer.cpp
 
  src/portlist.cpp
 
  src/snapshot.cpp
 
  src/snapshotview.cpp
 
  src/snapshotmanager.cpp
 
  src/plotsnapshotoverlay.cpp
 
  src/commandpanel.cpp
 
  src/commandwidget.cpp
 
  src/commandedit.cpp
 
  src/dataformatpanel.cpp
 
  src/tooltipfilter.cpp
 
  src/sneakylineedit.cpp
 
  misc/windows_icon.rc
 
  ${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)
 
@@ -131,25 +131,25 @@ if (MERCURIAL)
 
  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")
 
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/src/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
serialplot.pro
Show inline comments
 
@@ -23,73 +23,75 @@
 
#
 
#-------------------------------------------------
 

	
 
QT       += core gui serialport
 

	
 
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 

	
 
TARGET = serialplot
 
TEMPLATE = app
 

	
 
CONFIG += qwt
 

	
 

	
 
SOURCES += main.cpp\
 
        mainwindow.cpp \
 
    portcontrol.cpp \
 
    plot.cpp \
 
    zoomer.cpp \
 
    hidabletabwidget.cpp \
 
    framebuffer.cpp \
 
    scalepicker.cpp \
 
    scalezoomer.cpp \
 
    portlist.cpp \
 
    snapshotview.cpp \
 
    snapshotmanager.cpp \
 
    snapshot.cpp \
 
    plotsnapshotoverlay.cpp \
 
    commandpanel.cpp \
 
    commandwidget.cpp \
 
    commandedit.cpp \
 
    dataformatpanel.cpp \
 
    tooltipfilter.cpp \
 
    sneakylineedit.cpp
 
SOURCES += \
 
    src/main.cpp\
 
    src/mainwindow.cpp \
 
    src/portcontrol.cpp \
 
    src/plot.cpp \
 
    src/zoomer.cpp \
 
    src/hidabletabwidget.cpp \
 
    src/framebuffer.cpp \
 
    src/scalepicker.cpp \
 
    src/scalezoomer.cpp \
 
    src/portlist.cpp \
 
    src/snapshotview.cpp \
 
    src/snapshotmanager.cpp \
 
    src/snapshot.cpp \
 
    src/plotsnapshotoverlay.cpp \
 
    src/commandpanel.cpp \
 
    src/commandwidget.cpp \
 
    src/commandedit.cpp \
 
    src/dataformatpanel.cpp \
 
    src/tooltipfilter.cpp \
 
    src/sneakylineedit.cpp
 

	
 
HEADERS  += mainwindow.h \
 
    utils.h \
 
    portcontrol.h \
 
    floatswap.h \
 
    plot.h \
 
    zoomer.h \
 
    hidabletabwidget.h \
 
    framebuffer.h \
 
    scalepicker.h \
 
    scalezoomer.h \
 
    portlist.h \
 
    snapshotview.h \
 
    snapshotmanager.h \
 
    snapshot.h \
 
    plotsnapshotoverlay.h \
 
    commandpanel.h \
 
    commandwidget.h \
 
    commandedit.h \
 
    dataformatpanel.h \
 
    tooltipfilter.h \
 
    sneakylineedit.h
 
HEADERS += \
 
    src/mainwindow.h \
 
    src/utils.h \
 
    src/portcontrol.h \
 
    src/floatswap.h \
 
    src/plot.h \
 
    src/zoomer.h \
 
    src/hidabletabwidget.h \
 
    src/framebuffer.h \
 
    src/scalepicker.h \
 
    src/scalezoomer.h \
 
    src/portlist.h \
 
    src/snapshotview.h \
 
    src/snapshotmanager.h \
 
    src/snapshot.h \
 
    src/plotsnapshotoverlay.h \
 
    src/commandpanel.h \
 
    src/commandwidget.h \
 
    src/commandedit.h \
 
    src/dataformatpanel.h \
 
    src/tooltipfilter.h \
 
    src/sneakylineedit.h
 

	
 
FORMS    += mainwindow.ui \
 
    about_dialog.ui \
 
    portcontrol.ui \
 
    snapshotview.ui \
 
    commandpanel.ui \
 
    commandwidget.ui \
 
    dataformatpanel.ui
 
FORMS += \
 
    src/mainwindow.ui \
 
    src/about_dialog.ui \
 
    src/portcontrol.ui \
 
    src/snapshotview.ui \
 
    src/commandpanel.ui \
 
    src/commandwidget.ui \
 
    src/dataformatpanel.ui
 

	
 
INCLUDEPATH += qmake/
 
INCLUDEPATH += qmake/ src/
 

	
 
CONFIG += c++11
 

	
 
RESOURCES += misc/icons.qrc
 

	
 
win32 {
 
    RESOURCES += misc/winicons.qrc
 
}
src/about_dialog.ui
Show inline comments
 
file renamed from about_dialog.ui to src/about_dialog.ui
src/commandedit.cpp
Show inline comments
 
file renamed from commandedit.cpp to src/commandedit.cpp
src/commandedit.h
Show inline comments
 
file renamed from commandedit.h to src/commandedit.h
src/commandpanel.cpp
Show inline comments
 
file renamed from commandpanel.cpp to src/commandpanel.cpp
src/commandpanel.h
Show inline comments
 
file renamed from commandpanel.h to src/commandpanel.h
src/commandpanel.ui
Show inline comments
 
file renamed from commandpanel.ui to src/commandpanel.ui
src/commandwidget.cpp
Show inline comments
 
file renamed from commandwidget.cpp to src/commandwidget.cpp
src/commandwidget.h
Show inline comments
 
file renamed from commandwidget.h to src/commandwidget.h
src/commandwidget.ui
Show inline comments
 
file renamed from commandwidget.ui to src/commandwidget.ui
src/dataformatpanel.cpp
Show inline comments
 
file renamed from dataformatpanel.cpp to src/dataformatpanel.cpp
src/dataformatpanel.h
Show inline comments
 
file renamed from dataformatpanel.h to src/dataformatpanel.h
src/dataformatpanel.ui
Show inline comments
 
file renamed from dataformatpanel.ui to src/dataformatpanel.ui
src/floatswap.h
Show inline comments
 
file renamed from floatswap.h to src/floatswap.h
src/framebuffer.cpp
Show inline comments
 
file renamed from framebuffer.cpp to src/framebuffer.cpp
src/framebuffer.h
Show inline comments
 
file renamed from framebuffer.h to src/framebuffer.h
src/hidabletabwidget.cpp
Show inline comments
 
file renamed from hidabletabwidget.cpp to src/hidabletabwidget.cpp
src/hidabletabwidget.h
Show inline comments
 
file renamed from hidabletabwidget.h to src/hidabletabwidget.h
src/main.cpp
Show inline comments
 
file renamed from main.cpp to src/main.cpp
src/mainwindow.cpp
Show inline comments
 
file renamed from mainwindow.cpp to src/mainwindow.cpp
src/mainwindow.h
Show inline comments
 
file renamed from mainwindow.h to src/mainwindow.h
src/mainwindow.ui
Show inline comments
 
file renamed from mainwindow.ui to src/mainwindow.ui
src/plot.cpp
Show inline comments
 
file renamed from plot.cpp to src/plot.cpp
src/plot.h
Show inline comments
 
file renamed from plot.h to src/plot.h
src/plotsnapshotoverlay.cpp
Show inline comments
 
file renamed from plotsnapshotoverlay.cpp to src/plotsnapshotoverlay.cpp
src/plotsnapshotoverlay.h
Show inline comments
 
file renamed from plotsnapshotoverlay.h to src/plotsnapshotoverlay.h
src/portcontrol.cpp
Show inline comments
 
file renamed from portcontrol.cpp to src/portcontrol.cpp
src/portcontrol.h
Show inline comments
 
file renamed from portcontrol.h to src/portcontrol.h
src/portcontrol.ui
Show inline comments
 
file renamed from portcontrol.ui to src/portcontrol.ui
src/portlist.cpp
Show inline comments
 
file renamed from portlist.cpp to src/portlist.cpp
src/portlist.h
Show inline comments
 
file renamed from portlist.h to src/portlist.h
src/scalepicker.cpp
Show inline comments
 
file renamed from scalepicker.cpp to src/scalepicker.cpp
src/scalepicker.h
Show inline comments
 
file renamed from scalepicker.h to src/scalepicker.h
src/scalezoomer.cpp
Show inline comments
 
file renamed from scalezoomer.cpp to src/scalezoomer.cpp
src/scalezoomer.h
Show inline comments
 
file renamed from scalezoomer.h to src/scalezoomer.h
src/snapshot.cpp
Show inline comments
 
file renamed from snapshot.cpp to src/snapshot.cpp
src/snapshot.h
Show inline comments
 
file renamed from snapshot.h to src/snapshot.h
src/snapshotmanager.cpp
Show inline comments
 
file renamed from snapshotmanager.cpp to src/snapshotmanager.cpp
src/snapshotmanager.h
Show inline comments
 
file renamed from snapshotmanager.h to src/snapshotmanager.h
src/snapshotview.cpp
Show inline comments
 
file renamed from snapshotview.cpp to src/snapshotview.cpp
src/snapshotview.h
Show inline comments
 
file renamed from snapshotview.h to src/snapshotview.h
src/snapshotview.ui
Show inline comments
 
file renamed from snapshotview.ui to src/snapshotview.ui
src/sneakylineedit.cpp
Show inline comments
 
file renamed from sneakylineedit.cpp to src/sneakylineedit.cpp
src/sneakylineedit.h
Show inline comments
 
file renamed from sneakylineedit.h to src/sneakylineedit.h
src/tooltipfilter.cpp
Show inline comments
 
file renamed from tooltipfilter.cpp to src/tooltipfilter.cpp
src/tooltipfilter.h
Show inline comments
 
file renamed from tooltipfilter.h to src/tooltipfilter.h
src/utils.h
Show inline comments
 
file renamed from utils.h to src/utils.h
src/version.h.in
Show inline comments
 
file renamed from version.h.in to src/version.h.in
src/zoomer.cpp
Show inline comments
 
file renamed from zoomer.cpp to src/zoomer.cpp
src/zoomer.h
Show inline comments
 
file renamed from zoomer.h to src/zoomer.h
0 comments (0 inline, 0 general)