Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
soitool
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD 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
bachelor-paa-bittet
soitool
Commits
d3e5d894
Commit
d3e5d894
authored
5 years ago
by
Petter Sagvold
Browse files
Options
Downloads
Patches
Plain Diff
#27 Småendringer, pylint fiks, kommentering
parent
82577c1f
No related branches found
Branches containing commit
No related tags found
1 merge request
!11
Få oppsett som popup
Pipeline
#73110
failed
5 years ago
Stage: lint
Stage: test
Stage: deploy
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
soitool/main_window.py
+9
-4
9 additions, 4 deletions
soitool/main_window.py
with
9 additions
and
4 deletions
soitool/main_window.py
+
9
−
4
View file @
d3e5d894
...
...
@@ -122,7 +122,7 @@ class SOIWorkspaceWidget(QWidget):
self
.
button_setup
.
setStatusTip
(
"
Endre oppsett av SOI
"
)
self
.
list_modules
=
QListWidget
()
self
.
view
=
ViewArea
()
#
self.
view
= Setup()
self
.
popup
=
Setup
()
# prepare module list
self
.
setup_list_modules
()
...
...
@@ -192,7 +192,7 @@ class ViewArea(QWidget):
class
Setup
(
QDialog
):
"""
Innstillinger for å endre oppsett av SOI.
"""
def
__init__
(
self
):
def
__init__
(
self
):
# pylint: disable = R0914, R0915
super
().
__init__
()
layout_setup
=
QVBoxLayout
()
layout_buttons
=
QHBoxLayout
()
...
...
@@ -211,6 +211,7 @@ class Setup(QDialog):
layout_setup
.
addWidget
(
label_setup
)
# Headerdata
layout_setup
.
addWidget
(
label_header
)
head1
=
QLabel
(
"
Header1
"
)
# Endre variabelnavn på disse
head2
=
QLabel
(
"
Header2
"
)
# Endre variabelnavn på disse
...
...
@@ -220,13 +221,15 @@ class Setup(QDialog):
layout_header
.
addRow
(
head2
,
hline2
)
layout_setup
.
addLayout
(
layout_header
)
# Paperorientation
layout_setup
.
addWidget
(
label_paper_orientation
)
pob1
=
QRadioButton
()
# Endre variabelnavn på disse
pob2
=
QRadioButton
()
# Endre variabelnavn på disse
layout_paper_orientation
.
addRow
(
pob1
,
QLabel
(
"
Papir1
"
))
layout_paper_orientation
.
addRow
(
pob2
,
QLabel
(
"
Papir2
"
))
layout_paper_orientation
.
addRow
(
pob1
,
QLabel
(
"
Horisontal (default)
"
))
layout_paper_orientation
.
addRow
(
pob2
,
QLabel
(
"
Vertikal
"
))
layout_setup
.
addLayout
(
layout_paper_orientation
)
# Placement algorithm
layout_setup
.
addWidget
(
label_algorithm
)
pb1
=
QRadioButton
()
# Endre variabelnavn på disse
pb2
=
QRadioButton
()
# Endre variabelnavn på disse
...
...
@@ -238,6 +241,7 @@ class Setup(QDialog):
layout_algorithm
.
addRow
(
pb4
,
QLabel
(
"
Alg4
"
))
layout_setup
.
addLayout
(
layout_algorithm
)
# Moduleplacement
layout_setup
.
addWidget
(
label_module_placement
)
mb1
=
QRadioButton
()
# Endre variabelnavn på disse
mb2
=
QRadioButton
()
# Endre variabelnavn på disse
...
...
@@ -245,6 +249,7 @@ class Setup(QDialog):
layout_module_placement
.
addRow
(
mb2
,
QLabel
(
"
Manuelt
"
))
layout_setup
.
addLayout
(
layout_module_placement
)
# Exit-buttons
self
.
button_cancel
=
QPushButton
(
"
Avbryt
"
)
self
.
button_save
=
QPushButton
(
"
Lagre
"
)
layout_buttons
.
addWidget
(
self
.
button_cancel
)
...
...
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