Skip to content
Snippets Groups Projects
Commit a963e80a authored by Harrison Edwards's avatar Harrison Edwards
Browse files

added user commenting

parent 552347d8
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 161 additions and 137 deletions
Experiments/experiment_05_10_2017_10.31.11.429987/experiment_05_10_2017_10.31.11.429987.log deleted 100644 → 0
+ 0
− 5
View file @ 552347d8
INFO:root:finished init.........................................05_10_2017_10.31.11.812096
INFO:root:starting video........................................05_10_2017_10.31.11.812096
INFO:root:taking target picture.................................05_10_2017_10.31.13.485490
INFO:root:taking non target picture.............................05_10_2017_10.31.13.966944
INFO:root:taking non target picture.............................05_10_2017_10.31.15.836573
Experiments/experiment_05_10_2017___12.49.38.642488/experiment_05_10_2017___12.49.38.642488.log 0 → 100644
+ 6
− 0
View file @ a963e80a
INFO:root:finished init.......................................05_10_2017___12.49.38.998459
INFO:root:starting video......................................05_10_2017___12.49.38.998459
INFO:root:user comment:asfas..................................05_10_2017___12.49.41.736561
INFO:root:taking target picture...............................05_10_2017___12.49.42.587058
INFO:root:taking non target picture...........................05_10_2017___12.49.43.013550
INFO:root:taking miscellaneous picture........................05_10_2017___12.49.43.406692
LCL.ui
+ 108
− 70
View file @ a963e80a
......@@ -6,70 +6,18 @@
<rect>
<x>0</x>
<y>0</y>
<width>520</width>
<height>353</height>
<width>370</width>
<height>320</height>
</rect>
</property>
<property name="windowTitle">
<string>LCL System</string>
</property>
<widget class="QWidget" name="centralwidget">
<widget class="QPushButton" name="up_button">
<property name="geometry">
<rect>
<x>210</x>
<y>220</y>
<width>90</width>
<height>23</height>
</rect>
</property>
<property name="text">
<string>Up</string>
</property>
</widget>
<widget class="QPushButton" name="right_button">
<property name="geometry">
<rect>
<x>250</x>
<y>240</y>
<width>75</width>
<height>23</height>
</rect>
</property>
<property name="text">
<string>Right</string>
</property>
</widget>
<widget class="QPushButton" name="left_button">
<property name="geometry">
<rect>
<x>180</x>
<y>240</y>
<width>75</width>
<height>23</height>
</rect>
</property>
<property name="text">
<string>Left</string>
</property>
</widget>
<widget class="QPushButton" name="down_button">
<property name="geometry">
<rect>
<x>210</x>
<y>260</y>
<width>90</width>
<height>23</height>
</rect>
</property>
<property name="text">
<string>Down</string>
</property>
</widget>
<widget class="QWidget" name="verticalLayoutWidget">
<property name="geometry">
<rect>
<x>130</x>
<x>100</x>
<y>0</y>
<width>261</width>
<height>201</height>
......@@ -93,7 +41,7 @@
<widget class="QPushButton" name="target_screenshot_button">
<property name="geometry">
<rect>
<x>40</x>
<x>10</x>
<y>10</y>
<width>81</width>
<height>61</height>
......@@ -107,7 +55,7 @@
<widget class="QPushButton" name="non_target_screenshot_button">
<property name="geometry">
<rect>
<x>40</x>
<x>10</x>
<y>70</y>
<width>81</width>
<height>61</height>
......@@ -118,10 +66,10 @@
Screenshot</string>
</property>
</widget>
<widget class="QPushButton" name="misc_screenshot">
<widget class="QPushButton" name="misc_screenshot_button">
<property name="geometry">
<rect>
<x>40</x>
<x>10</x>
<y>130</y>
<width>81</width>
<height>61</height>
......@@ -132,18 +80,108 @@
Screenshot</string>
</property>
</widget>
<widget class="QTextEdit" name="comment_box">
<property name="geometry">
<rect>
<x>10</x>
<y>230</y>
<width>161</width>
<height>41</height>
</rect>
</property>
</widget>
<widget class="QGroupBox" name="groupBox">
<property name="geometry">
<rect>
<x>190</x>
<y>210</y>
<width>171</width>
<height>101</height>
</rect>
</property>
<property name="title">
<string>Stage Controls</string>
</property>
<widget class="QPushButton" name="down_button">
<property name="geometry">
<rect>
<x>40</x>
<y>60</y>
<width>90</width>
<height>23</height>
</rect>
</property>
<property name="text">
<string>Down</string>
</property>
</widget>
<widget class="QPushButton" name="right_button">
<property name="geometry">
<rect>
<x>80</x>
<y>40</y>
<width>75</width>
<height>23</height>
</rect>
</property>
<property name="text">
<string>Right</string>
</property>
</widget>
<widget class="QPushButton" name="up_button">
<property name="geometry">
<rect>
<x>40</x>
<y>20</y>
<width>90</width>
<height>23</height>
</rect>
</property>
<property name="text">
<string>Up</string>
</property>
</widget>
<widget class="QPushButton" name="left_button">
<property name="geometry">
<rect>
<x>10</x>
<y>40</y>
<width>75</width>
<height>23</height>
</rect>
</property>
<property name="text">
<string>Left</string>
</property>
</widget>
</widget>
<widget class="QLabel" name="comment_box_label">
<property name="geometry">
<rect>
<x>10</x>
<y>210</y>
<width>71</width>
<height>16</height>
</rect>
</property>
<property name="text">
<string>Comment box</string>
</property>
</widget>
<widget class="QPushButton" name="user_comment_button">
<property name="geometry">
<rect>
<x>10</x>
<y>280</y>
<width>161</width>
<height>23</height>
</rect>
</property>
<property name="text">
<string>Add comment to log</string>
</property>
</widget>
</widget>
<widget class="QMenuBar" name="menubar">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>520</width>
<height>21</height>
</rect>
</property>
</widget>
<widget class="QStatusBar" name="statusbar"/>
</widget>
<resources/>
<connections/>
......
LCL_run.py
+ 8
− 10
View file @ a963e80a
......@@ -9,7 +9,6 @@ from PyQt5 import QtGui
from utils import screen_shooter,now,comment
class ShowVideo(QtCore.QObject):
#initiating the built in camera
camera_port = 0
camera = cv2.VideoCapture(camera_port)
......@@ -62,13 +61,10 @@ class main_window(QMainWindow):
def __init__(self):
super(main_window, self).__init__()
# set up the video classes and thread
# set up the video classes
self.vid = ShowVideo()
# self.vid.moveToThread(self.thread)
self.image_viewer = ImageViewer()
self.vid.VideoSignal.connect(self.image_viewer.setImage)
self.screen_shooter = screen_shooter()
self.vid.screenshot_signal.connect(self.screen_shooter.screenshot_slot)
......@@ -80,14 +76,16 @@ class main_window(QMainWindow):
self.ui.verticalLayout.addWidget(self.image_viewer)
# Connect up the buttons.
# TODO add comment logging from the user
# TODO add general screenshot button so user can comment on what is seen
self.ui.target_screenshot_button.clicked.connect(self.screen_shooter.save_target_image)
self.ui.non_target_screenshot_button.clicked.connect(self.screen_shooter.save_non_target_image)
self.ui.non_target_screenshot_button.clicked.connect(self.screen_shooter.save_non_target_image)
self.ui.misc_screenshot_button.clicked.connect(self.screen_shooter.save_misc_image)
self.ui.user_comment_button.clicked.connect(self.send_user_comment)
self.show()
comment('finished init')
comment('finished init')
def send_user_comment(self):
comment('user comment:{}'.format(self.ui.comment_box.toPlainText()))
self.ui.comment_box.clear()
if __name__ == '__main__':
app = QApplication(sys.argv)
......
LCL_ui.py
+ 39
− 31
View file @ a963e80a
......@@ -11,23 +11,11 @@ from PyQt5 import QtCore, QtGui, QtWidgets
class Ui_MainWindow(object):
def setupUi(self, MainWindow):
MainWindow.setObjectName("MainWindow")
MainWindow.resize(520, 353)
MainWindow.resize(370, 320)
self.centralwidget = QtWidgets.QWidget(MainWindow)
self.centralwidget.setObjectName("centralwidget")
self.up_button = QtWidgets.QPushButton(self.centralwidget)
self.up_button.setGeometry(QtCore.QRect(210, 220, 90, 23))
self.up_button.setObjectName("up_button")
self.right_button = QtWidgets.QPushButton(self.centralwidget)
self.right_button.setGeometry(QtCore.QRect(250, 240, 75, 23))
self.right_button.setObjectName("right_button")
self.left_button = QtWidgets.QPushButton(self.centralwidget)
self.left_button.setGeometry(QtCore.QRect(180, 240, 75, 23))
self.left_button.setObjectName("left_button")
self.down_button = QtWidgets.QPushButton(self.centralwidget)
self.down_button.setGeometry(QtCore.QRect(210, 260, 90, 23))
self.down_button.setObjectName("down_button")
self.verticalLayoutWidget = QtWidgets.QWidget(self.centralwidget)
self.verticalLayoutWidget.setGeometry(QtCore.QRect(130, 0, 261, 201))
self.verticalLayoutWidget.setGeometry(QtCore.QRect(100, 0, 261, 201))
self.verticalLayoutWidget.setObjectName("verticalLayoutWidget")
self.verticalLayout = QtWidgets.QVBoxLayout(self.verticalLayoutWidget)
self.verticalLayout.setContentsMargins(0, 0, 0, 0)
......@@ -36,22 +24,39 @@ class Ui_MainWindow(object):
self.pushButton.setGeometry(QtCore.QRect(-90, 200, 75, 23))
self.pushButton.setObjectName("pushButton")
self.target_screenshot_button = QtWidgets.QPushButton(self.centralwidget)
self.target_screenshot_button.setGeometry(QtCore.QRect(40, 10, 81, 61))
self.target_screenshot_button.setGeometry(QtCore.QRect(10, 10, 81, 61))
self.target_screenshot_button.setObjectName("target_screenshot_button")
self.non_target_screenshot_button = QtWidgets.QPushButton(self.centralwidget)
self.non_target_screenshot_button.setGeometry(QtCore.QRect(40, 70, 81, 61))
self.non_target_screenshot_button.setGeometry(QtCore.QRect(10, 70, 81, 61))
self.non_target_screenshot_button.setObjectName("non_target_screenshot_button")
self.misc_screenshot = QtWidgets.QPushButton(self.centralwidget)
self.misc_screenshot.setGeometry(QtCore.QRect(40, 130, 81, 61))
self.misc_screenshot.setObjectName("misc_screenshot")
self.misc_screenshot_button = QtWidgets.QPushButton(self.centralwidget)
self.misc_screenshot_button.setGeometry(QtCore.QRect(10, 130, 81, 61))
self.misc_screenshot_button.setObjectName("misc_screenshot_button")
self.comment_box = QtWidgets.QTextEdit(self.centralwidget)
self.comment_box.setGeometry(QtCore.QRect(10, 230, 161, 41))
self.comment_box.setObjectName("comment_box")
self.groupBox = QtWidgets.QGroupBox(self.centralwidget)
self.groupBox.setGeometry(QtCore.QRect(190, 210, 171, 101))
self.groupBox.setObjectName("groupBox")
self.down_button = QtWidgets.QPushButton(self.groupBox)
self.down_button.setGeometry(QtCore.QRect(40, 60, 90, 23))
self.down_button.setObjectName("down_button")
self.right_button = QtWidgets.QPushButton(self.groupBox)
self.right_button.setGeometry(QtCore.QRect(80, 40, 75, 23))
self.right_button.setObjectName("right_button")
self.up_button = QtWidgets.QPushButton(self.groupBox)
self.up_button.setGeometry(QtCore.QRect(40, 20, 90, 23))
self.up_button.setObjectName("up_button")
self.left_button = QtWidgets.QPushButton(self.groupBox)
self.left_button.setGeometry(QtCore.QRect(10, 40, 75, 23))
self.left_button.setObjectName("left_button")
self.comment_box_label = QtWidgets.QLabel(self.centralwidget)
self.comment_box_label.setGeometry(QtCore.QRect(10, 210, 71, 16))
self.comment_box_label.setObjectName("comment_box_label")
self.user_comment_button = QtWidgets.QPushButton(self.centralwidget)
self.user_comment_button.setGeometry(QtCore.QRect(10, 280, 161, 23))
self.user_comment_button.setObjectName("user_comment_button")
MainWindow.setCentralWidget(self.centralwidget)
self.menubar = QtWidgets.QMenuBar(MainWindow)
self.menubar.setGeometry(QtCore.QRect(0, 0, 520, 21))
self.menubar.setObjectName("menubar")
MainWindow.setMenuBar(self.menubar)
self.statusbar = QtWidgets.QStatusBar(MainWindow)
self.statusbar.setObjectName("statusbar")
MainWindow.setStatusBar(self.statusbar)
self.retranslateUi(MainWindow)
QtCore.QMetaObject.connectSlotsByName(MainWindow)
......@@ -59,17 +64,20 @@ class Ui_MainWindow(object):
def retranslateUi(self, MainWindow):
_translate = QtCore.QCoreApplication.translate
MainWindow.setWindowTitle(_translate("MainWindow", "LCL System"))
self.up_button.setText(_translate("MainWindow", "Up"))
self.right_button.setText(_translate("MainWindow", "Right"))
self.left_button.setText(_translate("MainWindow", "Left"))
self.down_button.setText(_translate("MainWindow", "Down"))
self.pushButton.setText(_translate("MainWindow", "PushButton"))
self.target_screenshot_button.setText(_translate("MainWindow", "Target \n"
" Screenshot"))
self.non_target_screenshot_button.setText(_translate("MainWindow", "Non-Target \n"
" Screenshot"))
self.misc_screenshot.setText(_translate("MainWindow", "Miscellaneous \n"
self.misc_screenshot_button.setText(_translate("MainWindow", "Miscellaneous \n"
" Screenshot"))
self.groupBox.setTitle(_translate("MainWindow", "Stage Controls"))
self.down_button.setText(_translate("MainWindow", "Down"))
self.right_button.setText(_translate("MainWindow", "Right"))
self.up_button.setText(_translate("MainWindow", "Up"))
self.left_button.setText(_translate("MainWindow", "Left"))
self.comment_box_label.setText(_translate("MainWindow", "Comment box"))
self.user_comment_button.setText(_translate("MainWindow", "Add comment to log"))
if __name__ == "__main__":
......
__pycache__/LCL_ui.cpython-36.pyc
+ 0
− 0
View file @ a963e80a
No preview for this file type
__pycache__/utils.cpython-36.pyc
+ 0
− 0
View file @ a963e80a
No preview for this file type
test.py deleted 100644 → 0
+ 0
− 21
View file @ 552347d8
from PyQt5.QtCore import QObject, pyqtSignal
class Foo(QObject):
# Define a new signal called 'trigger' that has no arguments.
trigger = pyqtSignal()
def connect_and_emit_trigger(self):
# Connect the trigger signal to a slot.
self.trigger.connect(self.handle_trigger)
# Emit the signal.
self.trigger.emit()
def handle_trigger(self):
# Show that the slot has been called.
print('trigger signal received')
cl = Foo()
cl.connect_and_emit_trigger()
\ No newline at end of file
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