refactor display layout

Author: OLuwis

app/utils/display_utils.py

@@ -0,0 +1,38 @@
+from re import match, split
+from numexpr import evaluate
+from views.layouts.display_layout import DisplayLayout
+
+class DisplayUtils():
+  def __init__(self, displayLayout: DisplayLayout):
+    super().__init__()
+
+    self.equationDisplay = displayLayout.equationDisplay
+    self.resultDisplay = displayLayout.resultDisplay
+
+  def insert(self, value: str):
+    if value == ".":
+      if "." not in split(r"\+|-|x|/|%", self.resultDisplay.text())[-1]:
+        text = self.resultDisplay.text()
+        self.resultDisplay.setText(text + value)  
+    elif bool(match(r"\+|-|x|/|%", value)):
+      if not bool(match(r"\+|-|x|/|%|\.", self.resultDisplay.text()[-1])):
+        text = self.resultDisplay.text()
+        self.resultDisplay.setText(text + value)
+    else:
+      text = self.resultDisplay.text()
+      self.resultDisplay.setText(text + value)
+
+  def delete(self):
+    self.resultDisplay.setText(self.resultDisplay.text()[:-1])
+    
+  def clear(self):
+    self.equationDisplay.setText("")
+    self.resultDisplay.setText("")
+
+  def calculate(self):
+    if not bool(match(r"\+|-|x|/|%|\.", self.resultDisplay.text()[-1])):
+      equation = self.resultDisplay.text().replace("x", "*")
+      result = int(evaluate(equation).item()) if float(evaluate(equation).item()).is_integer() else float(evaluate(equation).item())
+      
+      self.equationDisplay.setText(self.resultDisplay.text())
+      self.resultDisplay.setText(str(result))

app/views/calculator/display.py

@@ -0,0 +1,22 @@
+from PySide6.QtWidgets import QVBoxLayout
+from PySide6.QtCore import Qt
+from views.widgets.display_widget import DisplayWidget
+
+class DisplayLayout(QVBoxLayout):  
+  def __init__(self):
+    super().__init__()
+
+    equationDisplay = DisplayWidget(10, Qt.AlignmentFlag.AlignVCenter)
+    resultDisplay = DisplayWidget(15, Qt.AlignmentFlag.AlignTop)
+
+    equationDisplay.setText("Equation")
+    resultDisplay.setText("Result")
+
+    self.addWidget(equationDisplay)
+    self.addWidget(resultDisplay)
+
+    self.setSpacing(0)
+    self.setContentsMargins(5,0,5,0)
+
+    self.equationDisplay = equationDisplay
+    self.resultDisplay = resultDisplay

app/views/layouts/display_layout.py

@@ -0,0 +1,12 @@
+from PySide6.QtGui import QFont
+from PySide6.QtCore import Qt
+from qfluentwidgets.components.widgets.label import DisplayLabel
+
+class DisplayWidget(DisplayLabel):
+  def __init__(self, fontSize: float, verticalAlign: Qt.AlignmentFlag):
+    super().__init__()
+                       
+    font = QFont("OpenSans")
+    font.setPointSizeF(fontSize)
+    self.setAlignment(verticalAlign | Qt.AlignmentFlag.AlignRight)
+    self.setFont(font)