diff --git a/CMakeLists.txt b/CMakeLists.txt index 9f645ab6..8aa2ae2b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,20 @@ cmake_minimum_required (VERSION 2.8) +SET(CUBICSDR_VERSION_MAJOR "0") +SET(CUBICSDR_VERSION_MINOR "1") +SET(CUBICSDR_VERSION_PATCH "0") +SET(CUBICSDR_VERSION_REL "beta") +SET(CUBICSDR_VERSION "${CUBICSDR_VERSION_MAJOR}.${CUBICSDR_VERSION_MINOR}.${CUBICSDR_VERSION_PATCH}-${CUBICSDR_VERSION_REL}") + +SET(CPACK_PACKAGE_VERSION ${CUBICSDR_VERSION}) +SET(CPACK_PACKAGE_VERSION_MAJOR ${CUBICSDR_VERSION_MAJOR}) +SET(CPACK_PACKAGE_VERSION_MINOR ${CUBICSDR_VERSION_MINOR}) +SET(CPACK_PACKAGE_VERSION_PATCH ${CUBICSDR_VERSION_PATCH}) + +ADD_DEFINITIONS( + -DCUBICSDR_VERSION="${CUBICSDR_VERSION}" +) + IF (NOT APPLE) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/") ENDIF(NOT APPLE) diff --git a/src/CubicSDRDefs.h b/src/CubicSDRDefs.h index 729d09fd..8b09aa1d 100644 --- a/src/CubicSDRDefs.h +++ b/src/CubicSDRDefs.h @@ -1,6 +1,5 @@ #pragma once -#define CUBICSDR_VERSION "v0.01a" #define CUBICSDR_TITLE "CubicSDR " CUBICSDR_VERSION " by Charles J. Cliffe (@ccliffe)" #ifndef __BYTE_ORDER diff --git a/src/visual/TuningCanvas.cpp b/src/visual/TuningCanvas.cpp index 8a2574fd..2b16016d 100644 --- a/src/visual/TuningCanvas.cpp +++ b/src/visual/TuningCanvas.cpp @@ -82,7 +82,9 @@ void TuningCanvas::OnIdle(wxIdleEvent &event) { } else if (fabs(moveVal) >= 1.0) { if (uxDown < -0.275) { if (activeDemod != NULL) { - activeDemod->setFrequency(activeDemod->getFrequency() + (int) (moveVal * fabs(moveVal) * fabs(moveVal) * fabs(moveVal))); + long long freq = activeDemod->getFrequency() + (int) (moveVal * fabs(moveVal) * fabs(moveVal) * fabs(moveVal)); + activeDemod->setFrequency(freq); + activeDemod->updateLabel(freq); } } else { int amt = (int) (moveVal * fabs(moveVal) * fabs(moveVal) * fabs(moveVal));