Changeset - 5dbb6d93dfe1
Parent rev.
Child rev.
[Not reviewed]
update-checker
0 1 2
Hasan Yavuz ÖZDERYA - 8 years ago 2017-08-19 09:13:05
hy@ozderya.net
version number helper class
3 files changed with 151 insertions and 0 deletions:
CMakeLists.txt
4
src/versionnumber.cpp
103
src/versionnumber.h
44
0 comments (0 inline, 0 general)
CMakeLists.txt
➞
Show inline comments
 
@@ -82,139 +82,143 @@ qt5_wrap_ui(UI_FILES
 
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

			




	
	
	
		
 
  src/main.cpp

			




	
	
	
		
 
  src/mainwindow.cpp

			




	
	
	
		
 
  src/portcontrol.cpp

			




	
	
	
		
 
  src/plot.cpp

			




	
	
	
		
 
  src/zoomer.cpp

			




	
	
	
		
 
  src/scrollzoomer.cpp

			




	
	
	
		
 
  src/scrollbar.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/plotcontrolpanel.cpp

			




	
	
	
		
 
  src/recordpanel.cpp

			




	
	
	
		
 
  src/datarecorder.cpp

			




	
	
	
		
 
  src/tooltipfilter.cpp

			




	
	
	
		
 
  src/sneakylineedit.cpp

			




	
	
	
		
 
  src/channelmanager.cpp

			




	
	
	
		
 
  src/channelinfomodel.cpp

			




	
	
	
		
 
  src/framebufferseries.cpp

			




	
	
	
		
 
  src/numberformatbox.cpp

			




	
	
	
		
 
  src/endiannessbox.cpp

			




	
	
	
		
 
  src/abstractreader.cpp

			




	
	
	
		
 
  src/binarystreamreader.cpp

			




	
	
	
		
 
  src/binarystreamreadersettings.cpp

			




	
	
	
		
 
  src/asciireader.cpp

			




	
	
	
		
 
  src/asciireadersettings.cpp

			




	
	
	
		
 
  src/demoreader.cpp

			




	
	
	
		
 
  src/framedreader.cpp

			




	
	
	
		
 
  src/framedreadersettings.cpp

			




	
	
	
		
 
  src/plotmanager.cpp

			




	
	
	
		
 
  src/numberformat.cpp

			




	
	
	
		
 
  src/updatechecker.cpp

			




	
	
	
		
 
  src/versionnumber.cpp

			




	
	
	
		
 
  misc/windows_icon.rc

			




	
	
	
		
 
  ${UI_FILES}

			




	
	
	
		
 
  ${RES_FILES}

			




	
	
	
		
 
  )

			




	
	
	
		
 

			




	
	
	
		
 
# Use the Widgets module from Qt 5.

			




	
	
	
		
 
target_link_libraries(${PROGRAM_NAME}

			




	
	
	
		
 
  ${QWT_LIBRARY}

			




	
	
	
		
 
  ${QTCOLORWIDGETS_LIBRARIES}

			




	
	
	
		
 
  )

			




	
	
	
		
 
qt5_use_modules(${PROGRAM_NAME} Widgets SerialPort Network)

			




	
	
	
		
 

			




	
	
	
		
 
if (BUILD_QWT)

			




	
	
	
		
 
  add_dependencies(${PROGRAM_NAME} QWT)

			




	
	
	
		
 
endif ()

			




	
	
	
		
 

			




	
	
	
		
 
if (BUILD_QTCOLORWIDGETS)

			




	
	
	
		
 
  add_dependencies(${PROGRAM_NAME} QCW)

			




	
	
	
		
 
endif ()

			




	
	
	
		
 

			




	
	
	
		
 
# set compiler flags

			




	
	
	
		
 
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")

			




	
	
	
		
 

			




	
	
	
		
 
# Enable C++11 support, fail if not supported

			




	
	
	
		
 
include(CheckCXXCompilerFlag)

			




	
	
	
		
 
CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11)

			




	
	
	
		
 
CHECK_CXX_COMPILER_FLAG("-std=c++0x" COMPILER_SUPPORTS_CXX0X)

			




	
	
	
		
 
if(COMPILER_SUPPORTS_CXX11)

			




	
	
	
		
 
  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")

			




	
	
	
		
 
elseif(COMPILER_SUPPORTS_CXX0X)

			




	
	
	
		
 
  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")

			




	
	
	
		
 
else()

			




	
	
	
		
 
  message(STATUS "The compiler ${CMAKE_CXX_COMPILER} has no C++11 support. Please use a different C++ compiler.")

			




	
	
	
		
 
endif()

			




	
	
	
		
 

			




	
	
	
		
 
# default version

			




	
	
	
		
 
set(VERSION_STRING "0.9.1")

			




	
	
	
		
 
set(VERSION_REVISION "0")

			




	
	
	
		
 

			




	
	
	
		
 
# get revision number from mercurial and parse version string

			




	
	
	
		
 
include(GetVersion)

			




	
	
	
		
 

			




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

			




	
	
	
		
 
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DVERSION_MAJOR=${VERSION_MAJOR} ")

			




	
	
	
		
 
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DVERSION_MINOR=${VERSION_MINOR} ")

			




	
	
	
		
 
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DVERSION_PATCH=${VERSION_PATCH} ")

			




	
	
	
		
 
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}

			




	
	
	
		
 
    WORKING_DIRECTORY ${CMAKE_PROJECT_DIR}

			




	
	
	
		
 
)

			




	
	
	
		
 

			




	
	
	
		
 
# installing

			




	
	
	
		
 
install(TARGETS ${PROGRAM_NAME} DESTINATION bin)

			




	
	
	
		
 

			




	
	
	
		
 
# for windows put libraries to install directory

			




	
	
	
		
 
if (WIN32)

			




	
	
	
		
 
  file(GLOB WINDOWS_INSTALL_LIBRARIES

			




	
	
	
		
 
    "${CMAKE_BINARY_DIR}/windows_install_libraries/*.*")

			




	
	
	
		
 
  install(FILES ${WINDOWS_INSTALL_LIBRARIES} DESTINATION bin)

			




	
	
	
		
 
endif (WIN32)

			




	
	
	
		
 

			




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

			




	
	
	
		
 
  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"

			




	
	
	
		
 
  @ONLY)

			




	
	
	
		
 

			




	
	
	
		
 
if (UNIX)

			




	
	
	
		
 
  add_custom_target(uninstall

			




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

			




	
	
	
		
 
endif (UNIX)

			




	
	
	
		
 

			




	
	
	
		
 
# packaging

			




	
	
	
		
 
include(BuildLinuxAppImage)

			




	
	
	
		
 

			




        

    


    
    

    

        

                

                    src/versionnumber.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

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

			




	
	
	
		
 
*/

			




	
	
	
		
 

			




	
	
	
		
 
#include <QRegularExpression>

			




	
	
	
		
 

			




	
	
	
		
 
#include "versionnumber.h"

			




	
	
	
		
 

			




	
	
	
		
 
VersionNumber::VersionNumber(unsigned mj, unsigned mn, unsigned pt)

			




	
	
	
		
 
{

			




	
	
	
		
 
    major = mj;

			




	
	
	
		
 
    minor = mn;

			




	
	
	
		
 
    patch = pt;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
QString VersionNumber::toString() const

			




	
	
	
		
 
{

			




	
	
	
		
 
    return QString("%1.%2.%3").arg(major).arg(minor).arg(patch);

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
bool VersionNumber::extract(const QString& str, VersionNumber& number)

			




	
	
	
		
 
{

			




	
	
	
		
 
    QRegularExpression regexp("(?:[-_vV \\t]|^)(?<major>\\d+)"

			




	
	
	
		
 
                              "(?:\\.(?<minor>\\d+))?(?:\\.(?<patch>\\d+))?[-_ \\t]?");

			




	
	
	
		
 
    auto match = regexp.match(str, 0, QRegularExpression::PartialPreferCompleteMatch);

			




	
	
	
		
 

			




	
	
	
		
 
    if (!(match.hasMatch() || match.hasPartialMatch())) return false;

			




	
	
	
		
 

			




	
	
	
		
 
    number.major = match.captured("major").toUInt();

			




	
	
	
		
 

			




	
	
	
		
 
    auto zeroIfNull = [](QString str) -> unsigned

			




	
	
	
		
 
        {

			




	
	
	
		
 
            if (str.isNull()) return 0;

			




	
	
	
		
 
            return str.toUInt();

			




	
	
	
		
 
        };

			




	
	
	
		
 

			




	
	
	
		
 
    number.minor = zeroIfNull(match.captured("minor"));

			




	
	
	
		
 
    number.patch = zeroIfNull(match.captured("patch"));

			




	
	
	
		
 

			




	
	
	
		
 
    return true;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
bool operator==(const VersionNumber& lhs, const VersionNumber& rhs)

			




	
	
	
		
 
{

			




	
	
	
		
 
    return lhs.major == rhs.major &&

			




	
	
	
		
 
           lhs.minor == rhs.minor &&

			




	
	
	
		
 
           lhs.patch == rhs.patch;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
bool operator<(const VersionNumber& lhs, const VersionNumber& rhs)

			




	
	
	
		
 
{

			




	
	
	
		
 
    if (lhs.major < rhs.major)

			




	
	
	
		
 
    {

			




	
	
	
		
 
        return true;

			




	
	
	
		
 
    }

			




	
	
	
		
 
    else if (lhs.major == rhs.major)

			




	
	
	
		
 
    {

			




	
	
	
		
 
        if (lhs.minor < rhs.minor)

			




	
	
	
		
 
        {

			




	
	
	
		
 
             return true;

			




	
	
	
		
 
        }

			




	
	
	
		
 
        else if (lhs.minor == rhs.minor)

			




	
	
	
		
 
        {

			




	
	
	
		
 
            if (lhs.patch < rhs.patch) return true;

			




	
	
	
		
 
        }

			




	
	
	
		
 
    }

			




	
	
	
		
 
    return false;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
bool operator>(const VersionNumber& lhs, const VersionNumber& rhs)

			




	
	
	
		
 
{

			




	
	
	
		
 
    if (lhs.major > rhs.major)

			




	
	
	
		
 
    {

			




	
	
	
		
 
        return true;

			




	
	
	
		
 
    }

			




	
	
	
		
 
    else if (lhs.major == rhs.major)

			




	
	
	
		
 
    {

			




	
	
	
		
 
        if (lhs.minor > rhs.minor)

			




	
	
	
		
 
        {

			




	
	
	
		
 
             return true;

			




	
	
	
		
 
        }

			




	
	
	
		
 
        else if (lhs.minor == rhs.minor)

			




	
	
	
		
 
        {

			




	
	
	
		
 
            if (lhs.patch > rhs.patch) return true;

			




	
	
	
		
 
        }

			




	
	
	
		
 
    }

			




	
	
	
		
 
    return false;

			




	
	
	
		
 
}

			




        

    


    
    

    

        

                

                    src/versionnumber.h
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

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

			




	
	
	
		
 
*/

			




	
	
	
		
 

			




	
	
	
		
 
#ifndef VERSIONNUMBER_H

			




	
	
	
		
 
#define VERSIONNUMBER_H

			




	
	
	
		
 

			




	
	
	
		
 
#include <QString>

			




	
	
	
		
 

			




	
	
	
		
 
struct VersionNumber

			




	
	
	
		
 
{

			




	
	
	
		
 
    unsigned major = 0;

			




	
	
	
		
 
    unsigned minor = 0;

			




	
	
	
		
 
    unsigned patch = 0;

			




	
	
	
		
 

			




	
	
	
		
 
    VersionNumber(unsigned mj=0, unsigned mn=0, unsigned pt=0);

			




	
	
	
		
 

			




	
	
	
		
 
    /// Convert version number to string.

			




	
	
	
		
 
    QString toString() const;

			




	
	
	
		
 

			




	
	
	
		
 
    /// Extracts the version number from given string.

			




	
	
	
		
 
    static bool extract(const QString& str, VersionNumber& number);

			




	
	
	
		
 
};

			




	
	
	
		
 

			




	
	
	
		
 
bool operator==(const VersionNumber& lhs, const VersionNumber& rhs);

			




	
	
	
		
 
bool operator<(const VersionNumber& lhs, const VersionNumber& rhs);

			




	
	
	
		
 
bool operator>(const VersionNumber& lhs, const VersionNumber& rhs);

			




	
	
	
		
 

			




	
	
	
		
 
#endif // VERSIONNUMBER_H

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








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