From a9f3557648135eca0766a51baddf7d39a22a6e01 Mon Sep 17 00:00:00 2001
From: hbui <hong-phuc.bui@htwsaar.de>
Date: Wed, 24 Jul 2024 15:40:46 +0200
Subject: [PATCH] neue Gestaltung
---
num-int/src/numint/ui_mainwindow.py | 187 ++++++++++++++++++++--------------------------
1 files changed, 81 insertions(+), 106 deletions(-)
diff --git a/num-int/src/numint/ui_mainwindow.py b/num-int/src/numint/ui_mainwindow.py
index 9b907f5..b47fd6b 100644
--- a/num-int/src/numint/ui_mainwindow.py
+++ b/num-int/src/numint/ui_mainwindow.py
@@ -15,10 +15,10 @@
QFont, QFontDatabase, QGradient, QIcon,
QImage, QKeySequence, QLinearGradient, QPainter,
QPalette, QPixmap, QRadialGradient, QTransform)
-from PySide6.QtWidgets import (QApplication, QGroupBox, QHBoxLayout, QLabel,
- QLineEdit, QMainWindow, QMenuBar, QPlainTextEdit,
- QPushButton, QSizePolicy, QSpacerItem, QStatusBar,
- QVBoxLayout, QWidget)
+from PySide6.QtWidgets import (QApplication, QFormLayout, QGroupBox, QHBoxLayout,
+ QLabel, QLineEdit, QMainWindow, QMenuBar,
+ QPlainTextEdit, QPushButton, QSizePolicy, QSpacerItem,
+ QStatusBar, QVBoxLayout, QWidget)
class Ui_MainWindow(object):
def setupUi(self, MainWindow):
@@ -31,71 +31,65 @@
self.horizontalLayout_2.setObjectName(u"horizontalLayout_2")
self.verticalLayout = QVBoxLayout()
self.verticalLayout.setObjectName(u"verticalLayout")
- self.plainTextEdit = QPlainTextEdit(self.centralwidget)
- self.plainTextEdit.setObjectName(u"plainTextEdit")
+ self.helpingText = QPlainTextEdit(self.centralwidget)
+ self.helpingText.setObjectName(u"helpingText")
sizePolicy = QSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Minimum)
sizePolicy.setHorizontalStretch(0)
sizePolicy.setVerticalStretch(0)
- sizePolicy.setHeightForWidth(self.plainTextEdit.sizePolicy().hasHeightForWidth())
- self.plainTextEdit.setSizePolicy(sizePolicy)
+ sizePolicy.setHeightForWidth(self.helpingText.sizePolicy().hasHeightForWidth())
+ self.helpingText.setSizePolicy(sizePolicy)
font = QFont()
font.setFamilies([u"Noto Mono"])
- self.plainTextEdit.setFont(font)
- self.plainTextEdit.setReadOnly(True)
+ self.helpingText.setFont(font)
+ self.helpingText.setReadOnly(True)
- self.verticalLayout.addWidget(self.plainTextEdit)
+ self.verticalLayout.addWidget(self.helpingText)
self.functionInfo = QGroupBox(self.centralwidget)
self.functionInfo.setObjectName(u"functionInfo")
- self.horizontalLayout = QHBoxLayout(self.functionInfo)
- self.horizontalLayout.setObjectName(u"horizontalLayout")
+ self.formLayout_3 = QFormLayout(self.functionInfo)
+ self.formLayout_3.setObjectName(u"formLayout_3")
self.label_start = QLabel(self.functionInfo)
self.label_start.setObjectName(u"label_start")
- self.horizontalLayout.addWidget(self.label_start)
+ self.formLayout_3.setWidget(0, QFormLayout.LabelRole, self.label_start)
self.function = QLineEdit(self.functionInfo)
self.function.setObjectName(u"function")
- self.horizontalLayout.addWidget(self.function)
+ self.formLayout_3.setWidget(0, QFormLayout.FieldRole, self.function)
self.label_fn = QLabel(self.functionInfo)
self.label_fn.setObjectName(u"label_fn")
- self.horizontalLayout.addWidget(self.label_fn)
+ self.formLayout_3.setWidget(1, QFormLayout.LabelRole, self.label_fn)
self.startValue = QLineEdit(self.functionInfo)
self.startValue.setObjectName(u"startValue")
- self.horizontalLayout.addWidget(self.startValue)
+ self.formLayout_3.setWidget(1, QFormLayout.FieldRole, self.startValue)
self.label_end = QLabel(self.functionInfo)
self.label_end.setObjectName(u"label_end")
- self.horizontalLayout.addWidget(self.label_end)
+ self.formLayout_3.setWidget(2, QFormLayout.LabelRole, self.label_end)
self.endValue = QLineEdit(self.functionInfo)
self.endValue.setObjectName(u"endValue")
- self.horizontalLayout.addWidget(self.endValue)
+ self.formLayout_3.setWidget(2, QFormLayout.FieldRole, self.endValue)
self.verticalLayout.addWidget(self.functionInfo)
self.breakRule = QGroupBox(self.centralwidget)
self.breakRule.setObjectName(u"breakRule")
- self.verticalLayout_3 = QVBoxLayout(self.breakRule)
- self.verticalLayout_3.setObjectName(u"verticalLayout_3")
- self.horizontalLayout_5 = QHBoxLayout()
- self.horizontalLayout_5.setObjectName(u"horizontalLayout_5")
+ self.formLayout_2 = QFormLayout(self.breakRule)
+ self.formLayout_2.setObjectName(u"formLayout_2")
self.label_4 = QLabel(self.breakRule)
self.label_4.setObjectName(u"label_4")
- self.horizontalLayout_5.addWidget(self.label_4)
-
- self.horizontalSpacer_2 = QSpacerItem(40, 20, QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Minimum)
-
- self.horizontalLayout_5.addItem(self.horizontalSpacer_2)
+ self.formLayout_2.setWidget(0, QFormLayout.LabelRole, self.label_4)
self.espilon = QLineEdit(self.breakRule)
self.espilon.setObjectName(u"espilon")
@@ -105,95 +99,75 @@
sizePolicy1.setHeightForWidth(self.espilon.sizePolicy().hasHeightForWidth())
self.espilon.setSizePolicy(sizePolicy1)
- self.horizontalLayout_5.addWidget(self.espilon)
+ self.formLayout_2.setWidget(0, QFormLayout.FieldRole, self.espilon)
-
- self.verticalLayout_3.addLayout(self.horizontalLayout_5)
-
- self.horizontalLayout_3 = QHBoxLayout()
- self.horizontalLayout_3.setObjectName(u"horizontalLayout_3")
self.label_5 = QLabel(self.breakRule)
self.label_5.setObjectName(u"label_5")
- self.horizontalLayout_3.addWidget(self.label_5)
-
- self.horizontalSpacer_3 = QSpacerItem(40, 20, QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Minimum)
-
- self.horizontalLayout_3.addItem(self.horizontalSpacer_3)
+ self.formLayout_2.setWidget(1, QFormLayout.LabelRole, self.label_5)
self.section = QLineEdit(self.breakRule)
self.section.setObjectName(u"section")
sizePolicy1.setHeightForWidth(self.section.sizePolicy().hasHeightForWidth())
self.section.setSizePolicy(sizePolicy1)
- self.horizontalLayout_3.addWidget(self.section)
-
-
- self.verticalLayout_3.addLayout(self.horizontalLayout_3)
+ self.formLayout_2.setWidget(1, QFormLayout.FieldRole, self.section)
self.verticalLayout.addWidget(self.breakRule)
- self.groupBox = QGroupBox(self.centralwidget)
- self.groupBox.setObjectName(u"groupBox")
- self.verticalLayout_2 = QVBoxLayout(self.groupBox)
- self.verticalLayout_2.setObjectName(u"verticalLayout_2")
- self.horizontalLayout_6 = QHBoxLayout()
- self.horizontalLayout_6.setObjectName(u"horizontalLayout_6")
- self.label = QLabel(self.groupBox)
- self.label.setObjectName(u"label")
-
- self.horizontalLayout_6.addWidget(self.label)
-
- self.horizontalSpacer = QSpacerItem(40, 20, QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Minimum)
-
- self.horizontalLayout_6.addItem(self.horizontalSpacer)
-
- self.leftSum = QLineEdit(self.groupBox)
- self.leftSum.setObjectName(u"leftSum")
- sizePolicy1.setHeightForWidth(self.leftSum.sizePolicy().hasHeightForWidth())
- self.leftSum.setSizePolicy(sizePolicy1)
- self.leftSum.setReadOnly(True)
-
- self.horizontalLayout_6.addWidget(self.leftSum)
-
-
- self.verticalLayout_2.addLayout(self.horizontalLayout_6)
-
- self.horizontalLayout_4 = QHBoxLayout()
- self.horizontalLayout_4.setObjectName(u"horizontalLayout_4")
- self.label_2 = QLabel(self.groupBox)
- self.label_2.setObjectName(u"label_2")
-
- self.horizontalLayout_4.addWidget(self.label_2)
-
- self.horizontalSpacer_4 = QSpacerItem(40, 20, QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Minimum)
-
- self.horizontalLayout_4.addItem(self.horizontalSpacer_4)
-
- self.rightSum = QLineEdit(self.groupBox)
- self.rightSum.setObjectName(u"rightSum")
- sizePolicy1.setHeightForWidth(self.rightSum.sizePolicy().hasHeightForWidth())
- self.rightSum.setSizePolicy(sizePolicy1)
- self.rightSum.setReadOnly(True)
-
- self.horizontalLayout_4.addWidget(self.rightSum)
-
-
- self.verticalLayout_2.addLayout(self.horizontalLayout_4)
-
-
- self.verticalLayout.addWidget(self.groupBox)
-
- self.verticalSpacer = QSpacerItem(20, 40, QSizePolicy.Policy.Minimum, QSizePolicy.Policy.Expanding)
-
- self.verticalLayout.addItem(self.verticalSpacer)
-
self.plotBtn = QPushButton(self.centralwidget)
self.plotBtn.setObjectName(u"plotBtn")
self.verticalLayout.addWidget(self.plotBtn)
+ self.verticalSpacer = QSpacerItem(20, 40, QSizePolicy.Policy.Minimum, QSizePolicy.Policy.Expanding)
+
+ self.verticalLayout.addItem(self.verticalSpacer)
+
+ self.riemannSumGruppe = QGroupBox(self.centralwidget)
+ self.riemannSumGruppe.setObjectName(u"riemannSumGruppe")
+ self.formLayout = QFormLayout(self.riemannSumGruppe)
+ self.formLayout.setObjectName(u"formLayout")
+ self.label = QLabel(self.riemannSumGruppe)
+ self.label.setObjectName(u"label")
+
+ self.formLayout.setWidget(0, QFormLayout.LabelRole, self.label)
+
+ self.leftSum = QLineEdit(self.riemannSumGruppe)
+ self.leftSum.setObjectName(u"leftSum")
+ sizePolicy1.setHeightForWidth(self.leftSum.sizePolicy().hasHeightForWidth())
+ self.leftSum.setSizePolicy(sizePolicy1)
+ self.leftSum.setReadOnly(True)
+
+ self.formLayout.setWidget(0, QFormLayout.FieldRole, self.leftSum)
+
+ self.label_2 = QLabel(self.riemannSumGruppe)
+ self.label_2.setObjectName(u"label_2")
+
+ self.formLayout.setWidget(1, QFormLayout.LabelRole, self.label_2)
+
+ self.rightSum = QLineEdit(self.riemannSumGruppe)
+ self.rightSum.setObjectName(u"rightSum")
+ sizePolicy1.setHeightForWidth(self.rightSum.sizePolicy().hasHeightForWidth())
+ self.rightSum.setSizePolicy(sizePolicy1)
+ self.rightSum.setReadOnly(True)
+
+ self.formLayout.setWidget(1, QFormLayout.FieldRole, self.rightSum)
+
+ self.label_3 = QLabel(self.riemannSumGruppe)
+ self.label_3.setObjectName(u"label_3")
+
+ self.formLayout.setWidget(2, QFormLayout.LabelRole, self.label_3)
+
+ self.numOfSections = QLineEdit(self.riemannSumGruppe)
+ self.numOfSections.setObjectName(u"numOfSections")
+
+ self.formLayout.setWidget(2, QFormLayout.FieldRole, self.numOfSections)
+
+
+ self.verticalLayout.addWidget(self.riemannSumGruppe)
+
self.horizontalLayout_2.addLayout(self.verticalLayout)
@@ -224,12 +198,12 @@
def retranslateUi(self, MainWindow):
MainWindow.setWindowTitle(QCoreApplication.translate("MainWindow", u"Riemann Sum", None))
- self.plainTextEdit.setPlainText(QCoreApplication.translate("MainWindow", u"Die Funktion f(x) kann eine belibige Kombination von arithmetischen Operationen und Python mathematische Funktion in Modul math sein. Einige Beispiele sind:\n"
+ self.helpingText.setPlainText(QCoreApplication.translate("MainWindow", u"Die Funktion f(x) kann eine beliebige Kombination von arithmetischen Operationen und Python mathematische Funktion in Modul math sein. Einige Beispiele sind:\n"
"\n"
-"x ** 2\n"
-"x ** 3\n"
-"tan(radians(x))\n"
-"sin(x)\n"
+"x ** 2 0 4\n"
+"x ** 3 0 4\n"
+"tan(radians(x)) 0 45\n"
+"sin(x)**3 + cos(x)**3 0 2*pi\n"
"", None))
self.functionInfo.setTitle(QCoreApplication.translate("MainWindow", u"Angabe der Funktion", None))
self.label_start.setText(QCoreApplication.translate("MainWindow", u"Funktion f(x) = ", None))
@@ -239,13 +213,14 @@
self.label_end.setText(QCoreApplication.translate("MainWindow", u"end", None))
self.endValue.setText(QCoreApplication.translate("MainWindow", u"4", None))
self.breakRule.setTitle(QCoreApplication.translate("MainWindow", u"Abbuchkriterium", None))
- self.label_4.setText(QCoreApplication.translate("MainWindow", u"Maximum Differenz ziwschen Link- und Recht-Summe", None))
+ self.label_4.setText(QCoreApplication.translate("MainWindow", u"Epsilon", None))
self.label_5.setText(QCoreApplication.translate("MainWindow", u"Anzahl der Sektionen", None))
self.section.setText(QCoreApplication.translate("MainWindow", u"8", None))
- self.groupBox.setTitle(QCoreApplication.translate("MainWindow", u"Riemann Summe", None))
+ self.plotBtn.setText(QCoreApplication.translate("MainWindow", u"Ok", None))
+ self.riemannSumGruppe.setTitle(QCoreApplication.translate("MainWindow", u"Riemann Summe", None))
self.label.setText(QCoreApplication.translate("MainWindow", u"linke Summe", None))
self.label_2.setText(QCoreApplication.translate("MainWindow", u"rechte Summe", None))
- self.plotBtn.setText(QCoreApplication.translate("MainWindow", u"Ok", None))
+ self.label_3.setText(QCoreApplication.translate("MainWindow", u"Anzahl der Iterationen", None))
self.plotBox.setTitle(QCoreApplication.translate("MainWindow", u"Plot", None))
# retranslateUi
--
Gitblit v1.10.0-SNAPSHOT