Skip to content

Commit a5a6a91

Browse files
committed
Refactored Code
1 parent c33c810 commit a5a6a91

File tree

1 file changed

+21
-20
lines changed

1 file changed

+21
-20
lines changed

TardisDiff.py

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3,31 +3,33 @@
33

44

55
class TardisDiff(QtWidgets.QMainWindow):
6+
67
def __init__(self):
78
super(TardisDiff, self).__init__()
89
self.diff = 0
910

1011
self.clipboard = QtWidgets.QApplication.clipboard()
11-
QtWidgets.QShortcut(QtGui.QKeySequence("Ctrl+Shift+C"), self, self.setClipboard)
12+
QtWidgets.QShortcut(QtGui.QKeySequence("Ctrl+Shift+C"), self,
13+
self.setClipboard)
1214
self.initUI()
1315

1416
def initUI(self):
1517
#Create and initialize UI elements
16-
self.centralwidget = QtWidgets.QWidget()
17-
self.gridLayout = QtWidgets.QGridLayout(self.centralwidget)
18+
self.contentWidget = QtWidgets.QWidget()
19+
self.gridLayout = QtWidgets.QGridLayout(self.contentWidget)
1820
self.formLayout = QtWidgets.QFormLayout()
19-
self.label_time1 = QtWidgets.QLabel(self.centralwidget)
20-
self.label_time2 = QtWidgets.QLabel(self.centralwidget)
21-
self.label_time3 = QtWidgets.QLabel(self.centralwidget)
22-
self.timeEdit1 = QtWidgets.QTimeEdit(self.centralwidget)
23-
self.timeEdit2 = QtWidgets.QTimeEdit(self.centralwidget)
24-
self.timeEdit3 = QtWidgets.QTimeEdit(self.centralwidget)
25-
self.label_timeDiff = QtWidgets.QLabel(self.centralwidget)
26-
self.label_timeDiffOut = QtWidgets.QLabel(self.centralwidget)
21+
self.label_time1 = QtWidgets.QLabel(self.contentWidget)
22+
self.label_time2 = QtWidgets.QLabel(self.contentWidget)
23+
self.label_breakTime = QtWidgets.QLabel(self.contentWidget)
24+
self.timeEdit1 = QtWidgets.QTimeEdit(self.contentWidget)
25+
self.timeEdit2 = QtWidgets.QTimeEdit(self.contentWidget)
26+
self.timeEditBreakTime = QtWidgets.QTimeEdit(self.contentWidget)
27+
self.label_timeDiff = QtWidgets.QLabel(self.contentWidget)
28+
self.label_timeDiffOut = QtWidgets.QLabel(self.contentWidget)
2729

2830
self.label_time1.setText("Time 1:")
2931
self.label_time2.setText("Time 2:")
30-
self.label_time3.setText("Break Time:")
32+
self.label_breakTime.setText("Break Time:")
3133
self.label_timeDiff.setText("Difference")
3234
self.label_timeDiffOut.setText("")
3335
self.timeEdit1.setTime(QtCore.QTime(8, 0))
@@ -45,22 +47,22 @@ def initUI(self):
4547
self.formLayout.setWidget(1, QtWidgets.QFormLayout.FieldRole,
4648
self.timeEdit2)
4749
self.formLayout.setWidget(2, QtWidgets.QFormLayout.LabelRole,
48-
self.label_time3)
50+
self.label_breakTime)
4951
self.formLayout.setWidget(2, QtWidgets.QFormLayout.FieldRole,
50-
self.timeEdit3)
52+
self.timeEditBreakTime)
5153
self.formLayout.setWidget(3, QtWidgets.QFormLayout.LabelRole,
5254
self.label_timeDiff)
5355
self.formLayout.setWidget(3, QtWidgets.QFormLayout.FieldRole,
5456
self.label_timeDiffOut)
5557
self.gridLayout.addLayout(self.formLayout, 0, 0, 1, 1)
56-
self.setCentralWidget(self.centralwidget)
58+
self.setCentralWidget(self.contentWidget)
5759

5860
self.statusBar()
5961

6062
#connect slots
6163
self.timeEdit1.timeChanged.connect(self.inputChanged)
6264
self.timeEdit2.timeChanged.connect(self.inputChanged)
63-
self.timeEdit3.timeChanged.connect(self.inputChanged)
65+
self.timeEditBreakTime.timeChanged.connect(self.inputChanged)
6466

6567
self.setWindowTitle('TardisDiff')
6668
QtCore.QMetaObject.connectSlotsByName(self)
@@ -69,12 +71,13 @@ def initUI(self):
6971

7072
def inputChanged(self):
7173
"""
72-
Checks both time inputs and the break time input to determine the difference.
74+
Checks both time inputs and the break time
75+
input to determine the difference.
7376
Then calls the method to update the ui.
7477
"""
7578
time1 = self.timeEdit1.time()
7679
time2 = self.timeEdit2.time()
77-
breakTime = self.timeEdit3.time().secsTo(QtCore.QTime(0, 0))
80+
breakTime = self.timeEditBreakTime.time().secsTo(QtCore.QTime(0, 0))
7881
self.diff = (time1.secsTo(time2) + breakTime) / 3600
7982
self.diff = round(self.diff, 2)
8083
self.label_timeDiffOut.setText(str(self.diff))
@@ -85,8 +88,6 @@ def setClipboard(self):
8588
self.statusBar().showMessage("Copied to clipboard.")
8689

8790

88-
89-
9091
def main():
9192
app = QtWidgets.QApplication(sys.argv)
9293
ed = TardisDiff()

0 commit comments

Comments
 (0)