Changeset - 6a726832c333
Parent rev.
Child rev.
[Not reviewed]
default
0 3 1
Hasan Yavuz ÖZDERYA - 10 years ago 2015-05-07 16:02:18
hy@ozderya.net
added version number configuration
4 files changed with 41 insertions and 5 deletions:
CMakeLists.txt
11
3
about_dialog.ui
2
2
mainwindow.cpp
5
version.h.in
23
0 comments (0 inline, 0 general)
CMakeLists.txt
➞
Show inline comments
 
@@ -18,12 +18,17 @@
 
#
 

			




	
	
	
		
 
cmake_minimum_required(VERSION 2.8.11)

			




	
	
	
		
 

			




	
	
	
		
 
project(serialplot)

			




	
	
	
		
 

			




	
	
	
		
 
set(MAJOR_VERSION 0)

			




	
	
	
		
 
set(MINOR_VERSION 1)

			




	
	
	
		
 
set(PATCH_VERSION 0)

			




	
	
	
		
 
set(VERSION_STRING "${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}")

			




	
	
	
		
 

			




	
	
	
		
 
# Find includes in corresponding build directories

			




	
	
	
		
 
set(CMAKE_INCLUDE_CURRENT_DIR ON)

			




	
	
	
		
 

			




	
	
	
		
 
# Instruct CMake to run moc automatically when needed.

			




	
	
	
		
 
set(CMAKE_AUTOMOC ON)

			




	
	
	
		
 

			




	
	
		
 
@@ -67,12 +72,15 @@ 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()

			




	
	
	
		
 

			




	
	
	
		
 
# 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 serialplot

			




	
	
	
		
 
    DEPENDS serialplot

			




	
	
	
		
 
    WORKING_DIRECTORY ${CMAKE_PROJECT_DIR}

			




	
	
	
		
 
)

			




	
	
		
 
@@ -111,15 +119,15 @@ set(CPACK_GENERATOR "DEB")

			




	
	
	
		
 

			




	
	
	
		
 
include(InstallRequiredSystemLibraries)

			




	
	
	
		
 

			




	
	
	
		
 
set(CPACK_PACKAGE_NAME "serialplot")

			




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

			




	
	
	
		
 
set(CPACK_PACKAGE_VERSION_MINOR "1")

			




	
	
	
		
 
set(CPACK_PACKAGE_VERSION_PATCH "0")

			




	
	
	
		
 
set(CPACK_PACKAGE_VERSION_MAJOR ${MAJOR_VERSION})

			




	
	
	
		
 
set(CPACK_PACKAGE_VERSION_MINOR ${MINOR_VERSION})

			




	
	
	
		
 
set(CPACK_PACKAGE_VERSION_PATCH ${PATCH_VERSION})

			




	
	
	
		
 
set(CPACK_STRIP_FILES TRUE)

			




	
	
	
		
 
set(CPACK_PACKAGE_EXECUTABLES "serialplot")

			




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

			




	
	
	
		
 
if (NOT QWT_USE_STATIC)

			




	
	
	
		
 
  set(CPACK_DEBIAN_PACKAGE_DEPENDS "${CPACK_DEBIAN_PACKAGE_DEPENDS}, libqwt6-qt5 (>= 6.1.1)")

			




	
	
	
		
 
endif (NOT QWT_USE_STATIC)

			




        

    


    
    

    

        

                

                    about_dialog.ui
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



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

			




	
	
	
		
 
  </property>

			




	
	
	
		
 
  <property name="windowTitle">

			




	
	
	
		
 
   <string>About</string>

			




	
	
	
		
 
  </property>

			




	
	
	
		
 
  <layout class="QVBoxLayout" name="verticalLayout">

			




	
	
	
		
 
   <item>

			




	
	
	
		
 
    <widget class="QLabel" name="label">

			




	
	
	
		
 
    <widget class="QLabel" name="lbAbout">

			




	
	
	
		
 
     <property name="text">

			




	
	
	
		
 
      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:14pt;&quot;&gt;SerialPlot&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;v0.1&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;Developed by Hasan Yavuz Özderya&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;Using Qt and Qwt (&lt;a href=&quot;http://qwt.sf.net&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;http://qwt.sf.net&lt;/span&gt;&lt;/a&gt;)&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;br/&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;This software is GPL licensed. You can obtain source code from &lt;a href=&quot;https://bitbucket.org/hyOzd/serialplot&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;https://bitbucket.org/hyOzd/serialplot&lt;/span&gt;&lt;/a&gt;.&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>

			




	
	
	
		
 
      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:14pt;&quot;&gt;SerialPlot&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;$VERSION_STRING$&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;Developed by Hasan Yavuz Özderya&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;Using Qt and Qwt (&lt;a href=&quot;http://qwt.sf.net&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;http://qwt.sf.net&lt;/span&gt;&lt;/a&gt;)&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;br/&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;This software is GPL licensed. You can obtain source code from &lt;a href=&quot;https://bitbucket.org/hyOzd/serialplot&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;https://bitbucket.org/hyOzd/serialplot&lt;/span&gt;&lt;/a&gt;.&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>

			




	
	
	
		
 
     </property>

			




	
	
	
		
 
     <property name="wordWrap">

			




	
	
	
		
 
      <bool>true</bool>

			




	
	
	
		
 
     </property>

			




	
	
	
		
 
     <property name="openExternalLinks">

			




	
	
	
		
 
      <bool>true</bool>

			




        

    


    
    

    

        

                

                    mainwindow.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -23,12 +23,13 @@

			




	
	
	
		
 
#include <QApplication>

			




	
	
	
		
 
#include <QtDebug>

			




	
	
	
		
 
#include <qwt_plot.h>

			




	
	
	
		
 
#include <limits.h>

			




	
	
	
		
 
#include <cmath>

			




	
	
	
		
 
#include "utils.h"

			




	
	
	
		
 
#include "version.h"

			




	
	
	
		
 

			




	
	
	
		
 
MainWindow::MainWindow(QWidget *parent) :

			




	
	
	
		
 
    QMainWindow(parent),

			




	
	
	
		
 
    ui(new Ui::MainWindow)

			




	
	
	
		
 
{

			




	
	
	
		
 
    ui->setupUi(this);

			




	
	
		
 
@@ -209,12 +210,16 @@ void MainWindow::setupAboutDialog()

			




	
	
	
		
 
{

			




	
	
	
		
 
    Ui_AboutDialog uiAboutDialog;

			




	
	
	
		
 
    uiAboutDialog.setupUi(&aboutDialog);

			




	
	
	
		
 

			




	
	
	
		
 
    QObject::connect(uiAboutDialog.pbAboutQt, &QPushButton::clicked,

			




	
	
	
		
 
                     [](){ QApplication::aboutQt();});

			




	
	
	
		
 

			




	
	
	
		
 
    QString aboutText = uiAboutDialog.lbAbout->text();

			




	
	
	
		
 
    aboutText.replace("$VERSION_STRING$", VERSION_STRING);

			




	
	
	
		
 
    uiAboutDialog.lbAbout->setText(aboutText);

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void MainWindow::loadPortList()

			




	
	
	
		
 
{

			




	
	
	
		
 
    QString currentSelection = ui->cbPortList->currentText();

			




	
	
	
		
 

			




        

    


    
    

    

        

                

                    version.h.in
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
new file 100644

			




	
	
	
		
 
/*

			




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

			




	
	
	
		
 
*/

			




	
	
	
		
 

			




	
	
	
		
 
#define MAJOR_VERSION    @MAJOR_VERSION@

			




	
	
	
		
 
#define MINOR_VERSION    @MINOR_VERSION@

			




	
	
	
		
 
#define PATCH_VERSION    @PATCH_VERSION@

			




	
	
	
		
 
#define VERSION_STRING   "@VERSION_STRING@"

			




        

    



    


    



    



      

      





    
    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