Commit 2776a368 authored by Stef Smeets's avatar Stef Smeets
Browse files

Update function names for consistency

parent cb2ab7d1
......@@ -625,7 +625,7 @@ class TEMController(object):
def show_stream(self):
"""If the camera has been opened as a stream, start a live view in a tkinter window"""
try:
self.cam.start_gui()
self.cam.show_stream()
except AttributeError:
print("Cannot open live view. The camera interface must be initialized as a stream object.")
......
......@@ -82,7 +82,7 @@ class VideoStream(threading.Thread):
if not callback:
return buffer
def start_gui(self):
def show_stream(self):
from instamatic.gui import videostream_frame
t = threading.Thread(target=videostream_frame.start_gui, args=(self, ), daemon=False)
t.start()
......
......@@ -168,7 +168,7 @@ class VideoStream(threading.Thread):
if not callback:
return buffer
def start_gui(self):
def show_stream(self):
from instamatic.gui import videostream_frame
t = threading.Thread(target=videostream_frame.start_gui, args=(self, ), daemon=True)
t.start()
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment