Skip to content

Commit

Permalink
0.11.1
Browse files Browse the repository at this point in the history
Merge pull request #61 from hephy-dd/devel-0.11.x
  • Loading branch information
arnobaer authored Sep 3, 2020
2 parents 7d8272b + 8189fb8 commit 8bd6199
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 15 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ See the documentation on https://hephy-dd.github.io/comet/
Install from GitHub using pip

```bash
pip install git+https://github.com/hephy-dd/comet.git@0.11.0
pip install git+https://github.com/hephy-dd/comet.git@0.11.1
```

## Quick start
Expand Down
23 changes: 13 additions & 10 deletions comet/application.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ def __init__(self, name=None, *, title=None, width=None,

@property
def title(self):
"""Main window title."""
return self.window.title

@title.setter
Expand All @@ -64,22 +65,25 @@ def title(self, value):

@property
def width(self):
"""Main window width."""
return self.window.width

@width.setter
def width(self, width):
self.window.width = width
self.window.resize(width, self.height)

@property
def height(self):
"""Main window height."""
return self.window.height

@height.setter
def height(self, height):
self.window.height = height
self.window.resize(self.width, height)

@property
def about(self):
"""Application about text."""
return self.window.about_text

@about.setter
Expand Down Expand Up @@ -128,11 +132,10 @@ def run(self):
self.window.show()
self.window.up()

# Run event loop
result = super().run()

# Stop processes
self.processes.stop()
self.processes.join()

return result
try:
# Run event loop
return super().run()
finally:
# Stop processes
self.processes.stop()
self.processes.join()
6 changes: 5 additions & 1 deletion comet/ui/mainwindow.py
Original file line number Diff line number Diff line change
Expand Up @@ -96,10 +96,12 @@ def message_label(self):
return self.__message_label

def show_message(self, message):
"""Show status message."""
self.message_label.text = message
self.message_label.show()

def hide_message(self):
"""Hide status message."""
self.message_label.clear()
self.message_label.hide()

Expand All @@ -108,17 +110,19 @@ def progress_bar(self):
return self.__progress_bar

def show_progress(self, value, maximum):
"""Show progress bar."""
self.progress_bar.range = 0, maximum
self.progress_bar.value = value
self.progress_bar.show()

def hide_progress(self):
"""Hide progress bar."""
self.progress_bar.range = 0, 0
self.progress_bar.value = 0
self.progress_bar.hide()

def show_exception(self, exception, tb=None):
"""Raise message box showing exception inforamtion."""
"""Raise message box showing exception information."""
ui.show_exception(exception, tb)
self.show_message("Error")
self.hide_progress()
Expand Down
2 changes: 1 addition & 1 deletion comet/version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = '0.11.0'
__version__ = '0.11.1'
2 changes: 1 addition & 1 deletion docs/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ graphical user interface. It runs on both Linux and Windows operating systems.
Install from GitHub using pip

```bash
pip install git+https://github.com/hephy-dd/comet.git@0.11.0
pip install git+https://github.com/hephy-dd/comet.git@0.11.1
```

### Quick start
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

setup(
name='comet',
version='0.11.0',
version='0.11.1',
author="Bernhard Arnold",
author_email="bernhard.arnold@oeaw.ac.at",
description="Control and Measurement Toolkit",
Expand Down

0 comments on commit 8bd6199

Please sign in to comment.