Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
su
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
dmeiss2s
su
Commits
aa05233e
Commit
aa05233e
authored
9 years ago
by
Daniel Meißner
Committed by
Daniel Meißner
9 years ago
Browse files
Options
Downloads
Patches
Plain Diff
gui: moved to from import syntax to import hardware class
parent
3c61aab7
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
lib/gui/gui.py
+2
-2
2 additions, 2 deletions
lib/gui/gui.py
with
2 additions
and
2 deletions
lib/gui/gui.py
+
2
−
2
View file @
aa05233e
...
@@ -7,7 +7,7 @@ import datetime
...
@@ -7,7 +7,7 @@ import datetime
from
PyQt5
import
QtCore
,
QtGui
,
QtWidgets
,
uic
from
PyQt5
import
QtCore
,
QtGui
,
QtWidgets
,
uic
import
lib.hardware
as
h
ardware
from
lib.hardware
import
H
ardware
class
SuGui
(
QtWidgets
.
QMainWindow
):
class
SuGui
(
QtWidgets
.
QMainWindow
):
"""
"""
...
@@ -59,7 +59,7 @@ class SuGui(QtWidgets.QMainWindow):
...
@@ -59,7 +59,7 @@ class SuGui(QtWidgets.QMainWindow):
Refresh combo box with current connected hardware.
Refresh combo box with current connected hardware.
"""
"""
self
.
comboBox_hardware
.
clear
()
self
.
comboBox_hardware
.
clear
()
for
device
in
hardware
.
Hardware
().
get_connected_supported_devices
():
for
device
in
Hardware
().
get_connected_supported_devices
():
text
=
device
[
'
id
'
]
+
"
:
"
+
device
[
'
name
'
]
text
=
device
[
'
id
'
]
+
"
:
"
+
device
[
'
name
'
]
self
.
comboBox_hardware
.
insertItem
(
0
,
self
.
tr
(
text
))
self
.
comboBox_hardware
.
insertItem
(
0
,
self
.
tr
(
text
))
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment