Skip to content

Commit 55ef391

Browse files
jirispilkajirispilka
committed
new version 0.3.30
1 parent 4e14e9a commit 55ef391

11 files changed

+54
-51
lines changed

‎copy_to_web.sh

+33-33
Original file line numberDiff line numberDiff line change
@@ -2,54 +2,54 @@
22

33
# copy all for publishing at web page
44

5-
echo OBSOLETE
6-
echo OBSOLETE -- need to check the paths and modify
5+
#echo "OBSOLETE"
6+
#echo "OBSOLETE -- need to check the paths and modify"
77

8-
echo pack source code and copy them to local web site
9-
echo running ...
8+
#echo "Pack source code and copy them to local web site"
9+
#echo "Running ..."
1010

11-
VERSION="0.3.20"
11+
VERSION="0.3.30"
1212

1313
# build html
14-
echo copy documentation
14+
echo "Copy documentation"
1515
make html -C doc
1616
cp -r doc/_build/html/* ~/dokumenty/web/spilkaj2015ciirc/software/CTGViewer/
1717

18-
echo Pack and copy source files and documentation
19-
FILE="CTGViewer-$VERSION.zip"
20-
DIR="CTGViewer-$VERSION"
21-
echo $FILE
18+
#echo "Pack and copy source files and documentation"
19+
#FILE="CTGViewer-$VERSION.zip"
20+
#DIR="CTGViewer-$VERSION"
21+
#echo $FILE
2222

2323
# remove existing
24-
rm $FILE
24+
#rm $FILE
2525

2626
# new dir
27-
mkdir $DIR
28-
29-
echo Copy documentation
30-
echo "$DIR/doc"
31-
mkdir "$DIR/doc"
32-
cp -r doc/_build/html/* "$DIR/doc"
33-
34-
echo Copy source file
35-
cp *.py $DIR
36-
cp *.ui $DIR
37-
cp *.qrc $DIR
38-
#cp default.ini $DIR
39-
cp README.md $DIR
40-
cp LICENSE $DIR
41-
cp -r unittest_files $DIR
42-
43-
echo Packing ....
44-
zip -rq $FILE $DIR
27+
#mkdir $DIR
28+
#
29+
#echo "Copy documentation"
30+
#echo "$DIR/doc"
31+
#mkdir "$DIR/doc"
32+
#cp -r doc/_build/html/* "$DIR/doc"
33+
34+
#echo "Copy source file"
35+
#cp *.py $DIR
36+
#cp *.ui $DIR
37+
#cp *.qrc $DIR
38+
##cp default.ini $DIR
39+
#cp README.md $DIR
40+
#cp LICENSE $DIR
41+
#cp -r unittest_files $DIR
42+
43+
#echo "Packing ...."
44+
#zip -rq $FILE $DIR
4545
#zip -r $FILE *.py *.ui *.qrc default.ini README unittest_files/*
46-
cp $FILE ~/dokumenty/web/spilkaj2015ciirc/software/
46+
#cp $FILE ~/dokumenty/web/spilkaj2015ciirc/software/
4747

4848
# copy exe files
4949
FILE_EXE="CTGViewer_v${VERSION}_setup.exe"
50-
cp build/$FILE_EXE ~/dokumenty/web/spilkaj2015ciirc/software/$FILE_EXE
50+
cp src/build/$FILE_EXE ~/dokumenty/web/spilkaj2015ciirc/software/$FILE_EXE
5151

52-
rm -r $DIR
52+
#rm -r $DIR
5353

54-
echo DONE
54+
echo "DONE"
5555

‎doc/conf.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
# The short X.Y version.
6161
version = '0.2.'
6262
# The full version, including alpha/beta/rc tags.
63-
release = '0.3.20'
63+
release = '0.3.30'
6464

6565
# The language for content autogenerated by Sphinx. Refer to documentation
6666
# for a list of supported languages.

‎doc/development.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,9 @@ All required files are available on github: https://github.com/spilkjir/CTGViewe
8484

8585
**An example of setup.py file:**
8686

87-
.. literalinclude:: ../setup.py
87+
.. literalinclude:: ../src/setup.py
8888

8989
**An example of setup_inno.iss file:**
9090

91-
.. literalinclude:: ../setup_inno.iss
91+
.. literalinclude:: ../src/setup_inno.iss
9292
:language: guess

‎doc/downloads.rst

+2-1
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,11 @@ Windows installer
1212

1313
*The latest version:*
1414

15-
* `CTGViewer_v0.3.10_setup.exe <../CTGViewer_v0.3.10_setup.exe>`_
15+
* `CTGViewer_v0.3.30_setup.exe <../CTGViewer_v0.3.30_setup.exe>`_
1616

1717
*Past versions:*
1818

19+
* `CTGViewer_v0.3.10_setup.exe <../CTGViewer_v0.3.10_setup.exe>`_
1920
* `CTGViewerLite_v0.3.00_setup.exe <../CTGViewerLite_v0.3.00_setup.exe>`_
2021
* `CTGViewerLite_v0.2.72_setup.exe <../CTGViewerLite_v0.2.72_setup.exe>`_
2122
* `CTGViewerLite_v0.2.55_setup.exe <../CTGViewerLite_v0.2.55_setup.exe>`_

‎doc/index.rst

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
CTGViewer documentation
22
=======================
33

4-
The CTGViewer a simple software used to display cardiotocography (CTG) records -- fetal heart rate and uterine contractions
4+
The CTGViewer is a software used to display cardiotocography (CTG) records -- fetal heart rate and uterine contractions
55
together with a clinical information. It allows to easily browse directory of CTG files (e.g. the
66
CTU-UHB cardiotographic database).
77

@@ -41,6 +41,7 @@ Contents:
4141
Changelog:
4242
----------
4343

44+
* 2017-10-13 - supports SPAM challenge data
4445
* 2016-08-03 - added tool Caliper (used for measurement of time and bpm)
4546
* 2016-07-12 - added export to PDF file
4647
* 2016-04-13 - added annotations - ellipse, refactoring

‎src/AboutUI.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# -*- coding: utf-8 -*-
22

3-
# Form implementation generated from reading ui file 'src/AboutUI.ui'
3+
# Form implementation generated from reading ui file 'AboutUI.ui'
44
#
55
# Created by: PyQt4 UI code generator 4.11.4
66
#
@@ -50,7 +50,7 @@ def retranslateUi(self, DialogAbout):
5050
"</style></head><body style=\" font-family:\'Noto Sans\'; font-size:10pt; font-weight:400; font-style:normal;\">\n"
5151
"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-family:\'Ubuntu\'; font-size:11pt; font-weight:600;\">CTGViewer</span></p>\n"
5252
"<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:\'Ubuntu\'; font-size:9pt; font-weight:600;\"><br /></p>\n"
53-
"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-family:\'Ubuntu\'; font-size:9pt; font-weight:600;\">Version 0.3.20</span></p>\n"
53+
"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-family:\'Ubuntu\'; font-size:9pt; font-weight:600;\">Version 0.3.30</span></p>\n"
5454
"<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:\'Ubuntu\'; font-size:9pt; font-weight:600;\"><br /></p>\n"
5555
"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-family:\'Ubuntu\'; font-size:9pt;\">The CTGViewer displays fetal heart rate and uterine contractions.</span></p>\n"
5656
"<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:\'Ubuntu\'; font-size:9pt;\"><br /></p>\n"

‎src/AboutUI.ui

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ p, li { white-space: pre-wrap; }
3333
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Noto Sans'; font-size:10pt; font-weight:400; font-style:normal;&quot;&gt;
3434
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:11pt; font-weight:600;&quot;&gt;CTGViewer&lt;/span&gt;&lt;/p&gt;
3535
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Ubuntu'; font-size:9pt; font-weight:600;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
36-
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:9pt; font-weight:600;&quot;&gt;Version 0.3.20&lt;/span&gt;&lt;/p&gt;
36+
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:9pt; font-weight:600;&quot;&gt;Version 0.3.30&lt;/span&gt;&lt;/p&gt;
3737
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Ubuntu'; font-size:9pt; font-weight:600;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
3838
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:9pt;&quot;&gt;The CTGViewer displays fetal heart rate and uterine contractions.&lt;/span&gt;&lt;/p&gt;
3939
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Ubuntu'; font-size:9pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;

‎src/MainWindow.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,7 @@ def _toolbar_align(self):
348348
# self.ui.toolBar.addAction(self.ui.actionEllipse)
349349
self.ui.toolBar.addAction(self.ui.actionEllipseNote)
350350
self.ui.toolBar.addAction(self.ui.actionNote)
351-
self.ui.toolBar.addAction(self.ui.actionEvaluationNote)
351+
# self.ui.toolBar.addAction(self.ui.actionEvaluationNote)
352352
self.ui.toolBar.addSeparator()
353353
self.ui.toolBar.addAction(self.ui.actionCaliper)
354354
# self.ui.toolBar.addAction(self.ui.actionAnnShowHide)

‎src/set_version_number.py

+6-5
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@
1313
import io
1414
import sys
1515

16-
sOldVersion = "0.3.10"
17-
sNewVersion = "0.3.20"
16+
sOldVersion = "0.3.20"
17+
sNewVersion = "0.3.30"
1818

1919

2020
def run():
2121

2222
print('Setting version: ' + sNewVersion)
2323

24-
afiles = 'setup.py', 'src/AboutUI.ui', 'copy_to_web.sh', 'setup_inno.iss', 'doc/conf.py'
24+
afiles = 'setup.py', 'AboutUI.ui', '../copy_to_web.sh', 'setup_inno.iss', '../doc/conf.py'
2525
file_temp = 'temp.txt'
2626

2727
cnt_error = 0
@@ -49,8 +49,8 @@ def run():
4949
print fname + 'error - original file was restored'
5050

5151
if sys.platform == 'linux2':
52-
os.system("pyuic4 src/AboutUI.ui -o src/AboutUI.py")
53-
os.system("chmod 775 copy_to_web.sh")
52+
os.system("pyuic4 AboutUI.ui -o AboutUI.py")
53+
os.system("chmod 775 ../copy_to_web.sh")
5454
else:
5555
os.system('c:\Python26\Lib\site-packages\PyQt4\pyuic4.bat src\AboutUI.ui -o src\AboutUI.py')
5656

@@ -61,5 +61,6 @@ def run():
6161
else:
6262
print('All versions were replaced')
6363

64+
6465
if __name__ == '__main__':
6566
run()

‎src/setup.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545

4646
setup(
4747
name="CTGViewer",
48-
version="0.3.20",
48+
version="0.3.30",
4949
description="CTGViewer application",
5050
author="Jiri Spilka",
5151
author_email='[email protected]',

‎src/setup_inno.iss

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
33
[ISPP]
44
#define AppName "CTGViewer"
5-
#define AppVersion "0.3.20"
5+
#define AppVersion "0.3.30"
66

77
[Setup]
88
; NOTE: The value of AppId uniquely identifies this application.
@@ -20,8 +20,8 @@ DefaultGroupName=CTGViewer
2020
AllowNoIcons=yes
2121
LicenseFile=e:\github\CTGViewer\LICENSE
2222
OutputBaseFilename={#AppName}_v{#AppVersion}_setup
23-
; Compression=lzma
24-
Compression=none
23+
Compression=lzma
24+
; Compression=none
2525
SolidCompression=yes
2626
OutputDir="build"
2727

0 commit comments

Comments
 (0)