From d3e5d894edf259ca805b0998dfaf89d84e5d7f75 Mon Sep 17 00:00:00 2001
From: Petter <pettsag@stud.ntnu.no>
Date: Mon, 9 Mar 2020 13:26:03 +0100
Subject: [PATCH] =?UTF-8?q?#27=20Sm=C3=A5endringer,=20pylint=20fiks,=20kom?=
=?UTF-8?q?mentering?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
soitool/main_window.py | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/soitool/main_window.py b/soitool/main_window.py
index 6fc00c8..75d6e9d 100644
--- a/soitool/main_window.py
+++ b/soitool/main_window.py
@@ -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)
--
GitLab