chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-08 04:00:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into translations

Browse Source
This commit is contained in:
ArieKlerk 2020-03-11 21:07:07 +01:00
commit 05c2590f8f
5 changed files with 39 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
Building/Linux/mkDebian9.sh
View File

@ -1,18 +1,22 @@
#! /bin/bash #! /bin/bash
# First parameter is version number - (ex: 1.0.0) # First parameter is optional
# Second parametr is build or release status - (ex: test, beta, or release)
# Third parameter is optional
# #
if [ -z "$1" ]; then ITERATION=$1
echo "1st parameter must be the version number (x.y.z)" if [ -z ${ITERATION} ]; then
exit ITERATION="1"
fi fi
if [ "$2" != "test" ] && [ "$2" != "beta" ] && [ "$2" != "release" ]; then SRC=/home/$USER/OSCAR/OSCAR-code/oscar
echo "2nd parameter must be 'test' or 'beta' or 'release'."
exit VERSION=`awk '/#define VERSION / { gsub(/"/, "", $3); print $3 }' ${SRC}/VERSION`
if [[ ${VERSION} == *-* ]]; then
# Use ~ for prerelease information so that it sorts correctly compared to release
# versions. See https://www.debian.org/doc/debian-policy/ch-controlfields.html#version
IFS="-" read -r VERSION PRERELEASE <<< ${VERSION}
VERSION="${VERSION}~${PRERELEASE}"
fi fi
GIT_REVISION=`awk '/#define GIT_REVISION / { gsub(/"/, "", $3); print $3 }' ${SRC}/git_info.h`
# application name # application name
appli_name="OSCAR" appli_name="OSCAR"
@ -20,18 +24,13 @@ pre_inst="tst_user.sh"
post_inst="ln_usrbin.sh" post_inst="ln_usrbin.sh"
pre_rem="rm_usrbin.sh" pre_rem="rm_usrbin.sh"
post_rem="clean_rm.sh" post_rem="clean_rm.sh"
iter=""
# build folder (absolute path is better) # build folder (absolute path is better)
build_folder="/home/$USER/OSCAR/build" build_folder="/home/$USER/OSCAR/build"
if [ "$2" != "release" ]; then if [ -n ${PRERELEASE} ]; then
appli_name=${appli_name}-test appli_name=${appli_name}-test
post_inst="ln_usrbin-test.sh" post_inst="ln_usrbin-test.sh"
pre_rem="rm_usrbin-test.sh" pre_rem="rm_usrbin-test.sh"
post_rem="clean_rm-test.sh" post_rem="clean_rm-test.sh"
iter="$2"
fi
if [ -n "$3" ]; then
iter="$iter"~"$3"
fi fi
# temporary folder (absolute path is better) # temporary folder (absolute path is better)
@ -47,7 +46,7 @@ if [ "$archi_tmp" = "x86_64" ];then
else else
archi="unknown" archi="unknown"
fi fi
deb_file="${appli_name}_$1-$2_$archi.deb" deb_file="${appli_name}_${VERSION}-${ITERATION}_$archi.deb"
# if deb file exists, fatal error # if deb file exists, fatal error
if [ -f "./$deb_file" ]; then if [ -f "./$deb_file" ]; then
@ -104,7 +103,7 @@ changelog_file="$share_doc_folder/changelog"
# it seems that it needs both of them... # it seems that it needs both of them...
# creation of the changelog.Debian.gz # creation of the changelog.Debian.gz
echo "$appli_name ($1-$2) whatever; urgency=medium" > $changelog_file echo "$appli_name (${VERSION}-${ITERATION}) whatever; urgency=medium" > $changelog_file
echo "" >> $changelog_file echo "" >> $changelog_file
echo " * Package created with FPM." >> $changelog_file echo " * Package created with FPM." >> $changelog_file
echo "" >> $changelog_file echo "" >> $changelog_file
@ -124,10 +123,10 @@ fpm --input-type dir --output-type deb \
--after-install ${post_inst} \ --after-install ${post_inst} \
--before-remove ${pre_rem} \ --before-remove ${pre_rem} \
--after-remove ${post_rem} \ --after-remove ${post_rem} \
--name ${appli_name} --version $1 --iteration $iter \ --name ${appli_name} --version ${VERSION} --iteration ${ITERATION} \
--category misc \ --category misc \
--deb-priority optional \ --deb-priority optional \
--maintainer " -- oscar-team.org <oscar@oscar-team.orga>" \ --maintainer " -- oscar-team.org <oscar@oscar-team.org>" \
--license GPL-v3 \ --license GPL-v3 \
--vendor oscar-team.org \ --vendor oscar-team.org \
--description "$description" \ --description "$description" \

36
Building/Linux/mkUbuntu.sh
View File

@ -1,18 +1,22 @@
#! /bin/bash #! /bin/bash
# First parameter is version number - (ex: 1.0.0) # First parameter is optional
# Second parametr is build or release status - (ex: test, beta, or release)
# Third parameter is optional
# #
if [ -z "$1" ]; then ITERATION=$1
echo "1st parameter must be the version number (x.y.z)" if [ -z ${ITERATION} ]; then
exit ITERATION="1"
fi fi
if [ "$2" != "test" ] && [ "$2" != "beta" ] && [ "$2" != "release" ]; then SRC=/home/$USER/OSCAR/OSCAR-code/oscar
echo "2nd parameter must be 'test' or 'beta' or 'release'."
exit VERSION=`awk '/#define VERSION / { gsub(/"/, "", $3); print $3 }' ${SRC}/VERSION`
if [[ ${VERSION} == *-* ]]; then
# Use ~ for prerelease information so that it sorts correctly compared to release
# versions. See https://www.debian.org/doc/debian-policy/ch-controlfields.html#version
IFS="-" read -r VERSION PRERELEASE <<< ${VERSION}
VERSION="${VERSION}~${PRERELEASE}"
fi fi
GIT_REVISION=`awk '/#define GIT_REVISION / { gsub(/"/, "", $3); print $3 }' ${SRC}/git_info.h`
# application name # application name
appli_name="OSCAR" appli_name="OSCAR"
@ -20,19 +24,15 @@ pre_inst="tst_user.sh"
post_inst="ln_usrbin.sh" post_inst="ln_usrbin.sh"
pre_rem="rm_usrbin.sh" pre_rem="rm_usrbin.sh"
post_rem="clean_rm.sh" post_rem="clean_rm.sh"
iter=""
# build folder (absolute path is better) # build folder (absolute path is better)
build_folder="/home/$USER/OSCAR/build" build_folder="/home/$USER/OSCAR/build"
if [ "$2" != "release" ]; then if [ -n ${PRERELEASE} ]; then
appli_name=${appli_name}-test appli_name=${appli_name}-test
post_inst="ln_usrbin-test.sh" post_inst="ln_usrbin-test.sh"
pre_rem="rm_usrbin-test.sh" pre_rem="rm_usrbin-test.sh"
post_rem="clean_rm-test.sh" post_rem="clean_rm-test.sh"
iter="$2"
fi
if [ -n "$3" ]; then
iter="$iter"~"$3"
fi fi
# temporary folder (absolute path is better) # temporary folder (absolute path is better)
temp_folder="/home/$USER/tmp_Ubu_${appli_name}/" temp_folder="/home/$USER/tmp_Ubu_${appli_name}/"
@ -46,7 +46,7 @@ if [ "$archi_tmp" = "x86_64" ];then
else else
archi="unknown" archi="unknown"
fi fi
deb_file="${appli_name}_$1-$2_$archi.deb" deb_file="${appli_name}_${VERSION}-${ITERATION}_$archi.deb"
# if deb file exists, fatal error # if deb file exists, fatal error
if [ -f "./$deb_file" ]; then if [ -f "./$deb_file" ]; then
@ -103,7 +103,7 @@ changelog_file="$share_doc_folder/changelog"
# it seems that it needs both of them... # it seems that it needs both of them...
# creation of the changelog.Debian.gz # creation of the changelog.Debian.gz
echo "$appli_name ($1-$2) whatever; urgency=medium" > $changelog_file echo "$appli_name (${VERSION}-${ITERATION}) whatever; urgency=medium" > $changelog_file
echo "" >> $changelog_file echo "" >> $changelog_file
echo " * Package created with FPM." >> $changelog_file echo " * Package created with FPM." >> $changelog_file
echo "" >> $changelog_file echo "" >> $changelog_file
@ -123,7 +123,7 @@ fpm --input-type dir --output-type deb \
--after-install ${post_inst} \ --after-install ${post_inst} \
--before-remove ${pre_rem} \ --before-remove ${pre_rem} \
--after-remove ${post_rem} \ --after-remove ${post_rem} \
--name ${appli_name} --version $1 --iteration $iter \ --name ${appli_name} --version ${VERSION} --iteration ${ITERATION} \
--category misc \ --category misc \
--deb-priority optional \ --deb-priority optional \
--maintainer " -- oscar-team.org <oscar@oscar-team.org>" \ --maintainer " -- oscar-team.org <oscar@oscar-team.org>" \

2
oscar/SleepLib/common.cpp
View File

@ -732,7 +732,7 @@ void initializeStrings()
// STR_TR_SAI = QObject::tr("SAI"); // Short form of SleepAwake Index // STR_TR_SAI = QObject::tr("SAI"); // Short form of SleepAwake Index
STR_TR_REI = QObject::tr("REI"); // Short form of RERA Index STR_TR_REI = QObject::tr("REI"); // Short form of RERA Index
STR_TR_EPI = QObject::tr("EPI"); // Short form of Expiratory Puff Index STR_TR_EPI = QObject::tr("EPI"); // Short form of Expiratory Puff Index
STR_TR_CSR = QObject::tr("ÇSR"); // Short form of Cheyne Stokes Respiration STR_TR_CSR = QObject::tr("CSR"); // Short form of Cheyne Stokes Respiration
STR_TR_PB = QObject::tr("PB"); // Short form of Periodic Breathing STR_TR_PB = QObject::tr("PB"); // Short form of Periodic Breathing

2
oscar/VERSION
View File

@ -1,4 +1,4 @@
// Update the string below to set OSCAR's version and release status. // Update the string below to set OSCAR's version and release status.
// See https://semver.org/spec/v2.0.0.html for details on format. // See https://semver.org/spec/v2.0.0.html for details on format.
#define VERSION "1.1.0-beta-1" #define VERSION "1.1.0-beta-2"

2
oscar/statistics.cpp
View File

@ -1497,7 +1497,7 @@ QString Statistics::UpdateRecordsBox()
///////////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////////
/// ÇSR Records /// CSR Records
///////////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////////
cnt = 0; cnt = 0;