From a0ba5163a5559a62af5c4e6b1eec20100ce9ff99 Mon Sep 17 00:00:00 2001 From: PRemmen Date: Fri, 28 Oct 2016 12:10:24 +0200 Subject: [PATCH 1/3] fix bug for warnings in gui before gui is initialized --- teaser/gui/mainui.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/teaser/gui/mainui.py b/teaser/gui/mainui.py index 17ba2c5de..e064b2289 100644 --- a/teaser/gui/mainui.py +++ b/teaser/gui/mainui.py @@ -65,10 +65,6 @@ def __init__(self, parent=None, gui=True, dir=None, file=None): """ General layout and gui-global variables """ - # Used to display the console inside the program. - sys.stdout = EmittingStream(textWritten=self.normal_output_written) - sys.stdin = EmittingStream(textWritten=self.normal_output_written) - sys.stderr = EmittingStream(textWritten=self.normal_output_written) self.setWindowFlags(self.windowFlags() | Qt.WindowMinMaxButtonsHint) self.setAttribute(QtCore.Qt.WA_DeleteOnClose) @@ -962,6 +958,11 @@ def __init__(self, parent=None, gui=True, dir=None, file=None): self.side_bar_widget, "geometry") self.main_animation = QtCore.QPropertyAnimation( self.main_widget, "geometry") + + # Used to display the console inside the program. + sys.stdout = EmittingStream(textWritten=self.normal_output_written) + sys.stdin = EmittingStream(textWritten=self.normal_output_written) + sys.stderr = EmittingStream(textWritten=self.normal_output_written) def __del__(self): '''Destructor From 141b71be596c9c9c7c1c90005a897115f3601fa5 Mon Sep 17 00:00:00 2001 From: MichaMans Date: Mon, 31 Oct 2016 12:03:06 +0100 Subject: [PATCH 2/3] #332 changed the version displayed in the gui to the current version --- teaser/gui/mainui.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/teaser/gui/mainui.py b/teaser/gui/mainui.py index e064b2289..d7642c0f3 100644 --- a/teaser/gui/mainui.py +++ b/teaser/gui/mainui.py @@ -109,7 +109,7 @@ def __init__(self, parent=None, gui=True, dir=None, file=None): self.teaser_icon.addFile(utilitis.get_full_path( 'gui/guiimages/Teaser_logo.png'), QtCore.QSize(16, 16)) self.setWindowIcon(self.teaser_icon) - teaserVersion = "0.3.6 beta" + teaserVersion = "0.4.1 beta" self.setWindowTitle("TEASER Version %s" % teaserVersion) self.central_widget = QtGui.QWidget(self) self.central_widget.setObjectName(_fromUtf8("central_widget")) From 921fddba235aeb53a2dca258c57f52ace767c7ab Mon Sep 17 00:00:00 2001 From: MichaMans Date: Mon, 31 Oct 2016 12:11:26 +0100 Subject: [PATCH 3/3] #332 changed the version numbers --- README.md | 2 +- doc/conf.py | 2 +- doc/index.rst | 2 +- setup.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index c5e19b390..8024bdc0f 100644 --- a/README.md +++ b/README.md @@ -47,7 +47,7 @@ IEA-EBC [Annex60](https://github.com/iea-annex60/modelica-annex60). ### Version -The current version is 0.4.0, which is a pre-release. +The current version is 0.4.1, which is a pre-release. ### How to cite TEASER diff --git a/doc/conf.py b/doc/conf.py index 41fc22399..b4413f8a4 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -60,7 +60,7 @@ # The short X.Y version. version = '0.4.' # The full version, including alpha/beta/rc tags. -release = '0.4.0' +release = '0.4.1' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/doc/index.rst b/doc/index.rst index 9c43caa5a..8270233ca 100644 --- a/doc/index.rst +++ b/doc/index.rst @@ -60,7 +60,7 @@ IEA-EBC `Annex60 `_. Version ================== -The current version is 0.4.0, which is a pre-release. +The current version is 0.4.1, which is a pre-release. How to cite TEASER ================== diff --git a/setup.py b/setup.py index fbf60edaf..beeb8ad4b 100644 --- a/setup.py +++ b/setup.py @@ -1,7 +1,7 @@ from setuptools import setup setup(name='teaser', - version='0.4.0', + version='0.4.1', description='Tool for Energy Analysis and Simulation for Efficient Retrofit ', url='https://github.com/RWTH-EBC/TEASER', author='RWTH Aachen University, E.ON Energy Research Center, Institute of Energy Efficient Buildings and Indoor Climate',