Skip to content

Commit

Permalink
Merge pull request #333 from RWTH-EBC/issue332_consoleBug
Browse files Browse the repository at this point in the history
fix bug for warnings in gui before gui is initialized
  • Loading branch information
MichaMans authored Oct 31, 2016
2 parents 99cc413 + 921fddb commit 45505ca
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 9 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion doc/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion doc/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,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
==================
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
@@ -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',
Expand Down
11 changes: 6 additions & 5 deletions teaser/gui/mainui.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -113,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"))
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 45505ca

Please sign in to comment.