Minor edits (#168)

* fix : get_plotter_area method modified * fix : layout and canvas name fixed * doc : codacy badge fixed
ECSIM · Jan 17, 2024 · 0b0894c · 0b0894c
1 parent 9fe4079
commit 0b0894c
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 28 deletions.
diff --git a/README.md b/README.md
@@ -45,7 +45,7 @@ GOPEM is a graphical user interface of [OPEM (Open Source PEM Fuel Cell Simulati
 	<tr> 
 		<td align="center">Code Quality</td>
 		<td align="center"><a href="https://www.codefactor.io/repository/github/ecsim/gopem"><img src="https://www.codefactor.io/repository/github/ecsim/gopem/badge" alt="CodeFactor" /></a></td>
-		<td align="center"><a href="https://www.codacy.com/gh/ECSIM/gopem/dashboard?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=ECSIM/gopem&amp;utm_campaign=Badge_Grade"><img src="https://app.codacy.com/project/badge/Grade/1ab9a56a65414c2f9b0b7d9ec127ea9f"/></a></td>
+		<td align="center"><a href="https://app.codacy.com/gh/ECSIM/gopem/dashboard?utm_source=gh&utm_medium=referral&utm_content=&utm_campaign=Badge_grade"><img src="https://app.codacy.com/project/badge/Grade/1ab9a56a65414c2f9b0b7d9ec127ea9f"/></a></td>
 	</tr>
 </table>
 

diff --git a/gopem/mainwindow.py b/gopem/mainwindow.py
@@ -293,9 +293,9 @@ def get_plotter_area(self):
 
         :return: QWidget for plotter layer
         """
-        w = QWidget(self)
-        l = QVBoxLayout()
-        w.setLayout(l)
+        widget = QWidget(self)
+        widget_layout = QVBoxLayout()
+        widget.setLayout(widget_layout)
         x_label = QLabel("X-Axis")
         y_label = QLabel("Y-Axis")
         color_label = QLabel("Color")
@@ -313,7 +313,7 @@ def get_plotter_area(self):
         self.transChkBox.setEnabled(False)
         self.saveBtn.clicked.connect(self.save_slt)
         checkBtn.clicked.connect(self.check_update)
-        ll = QHBoxLayout()
+        hbl1 = QHBoxLayout()
 
         vbl1 = QVBoxLayout()
         vbl1.addWidget(x_label, alignment=Qt.AlignCenter)
@@ -323,51 +323,51 @@ def get_plotter_area(self):
         vbl1.setContentsMargins(0, 0, 20, 0)
         vbl1.setAlignment(Qt.AlignCenter)
         vbl1.setAlignment(Qt.AlignHCenter)
-        ll.addLayout(vbl1)
+        hbl1.addLayout(vbl1)
 
         vbl2 = QVBoxLayout()
         vbl2.addWidget(x_scale_label, alignment=Qt.AlignCenter)
         vbl2.addWidget(self.x_scale, alignment=Qt.AlignCenter)
         vbl2.addWidget(y_scale_label, alignment=Qt.AlignCenter)
         vbl2.addWidget(self.y_scale, alignment=Qt.AlignCenter)
         vbl2.setContentsMargins(0, 0, 20, 0)
-        ll.addLayout(vbl2)
+        hbl1.addLayout(vbl2)
 
         vbl3 = QVBoxLayout()
         vbl3.addWidget(color_label, alignment=Qt.AlignCenter)
         vbl3.addWidget(self.color_bar, alignment=Qt.AlignCenter)
         vbl3.addWidget(marker_label, alignment=Qt.AlignCenter)
         vbl3.addWidget(self.marker_bar, alignment=Qt.AlignCenter)
         vbl3.setContentsMargins(0, 0, 20, 0)
-        ll.addLayout(vbl3)
+        hbl1.addLayout(vbl3)
 
         vbl4 = QVBoxLayout()
         vbl4.addWidget(style_label, alignment=Qt.AlignCenter)
         vbl4.addWidget(self.style_bar, alignment=Qt.AlignCenter)
         vbl4.addWidget(line_width_label, alignment=Qt.AlignCenter)
         vbl4.addWidget(self.line_width, alignment=Qt.AlignCenter)
         vbl4.setContentsMargins(0, 0, 20, 0)
-        ll.addLayout(vbl4)
+        hbl1.addLayout(vbl4)
 
         vbl5 = QVBoxLayout()
         vbl5.addWidget(font_axes_label, alignment=Qt.AlignCenter)
         vbl5.addWidget(self.font_axes, alignment=Qt.AlignCenter)
         vbl5.addWidget(font_title_label, alignment=Qt.AlignCenter)
         vbl5.addWidget(self.font_title, alignment=Qt.AlignCenter)
         vbl5.setContentsMargins(0, 0, 20, 0)
-        ll.addLayout(vbl5)
-
-        ll.setAlignment(Qt.AlignCenter)
-        l.addLayout(ll)
-        l.addWidget(self.h_line())
-        l.addWidget(self.plotter)
-        l.addWidget(self.h_line())
-        l.addWidget(self.transChkBox)
-        llll = QHBoxLayout()
-        llll.addWidget(checkBtn)
-        llll.addWidget(self.saveBtn)
-        l.addLayout(llll)
-        return w
+        hbl1.addLayout(vbl5)
+
+        hbl1.setAlignment(Qt.AlignCenter)
+        widget_layout.addLayout(hbl1)
+        widget_layout.addWidget(self.h_line())
+        widget_layout.addWidget(self.plotter)
+        widget_layout.addWidget(self.h_line())
+        widget_layout.addWidget(self.transChkBox)
+        hbl2 = QHBoxLayout()
+        hbl2.addWidget(checkBtn)
+        hbl2.addWidget(self.saveBtn)
+        widget_layout.addLayout(hbl2)
+        return widget
 
     def get_button_widget(self):
         """
@@ -654,7 +654,7 @@ def save_slt(self):
             self, "Save Plot", "", "PNG (*.png)", options=options)
         if filename:
             try:
-                self.plotter.sc.save_fig(filename, trans_flag)
+                self.plotter.canvas.save_fig(filename, trans_flag)
                 self.message_box("Save Plot", gopem.helper.PlotMessage)
             except Exception:
                 self.message_box(

diff --git a/gopem/plotter.py b/gopem/plotter.py
@@ -114,10 +114,10 @@ def __init__(self, *args, **kwargs):
         :param kwargs: the dictionary of keywords
         """
         super().__init__(*args, **kwargs)
-        l = QtWidgets.QVBoxLayout(self)
-        self.sc = MplCanvas(self, width=20, height=20, dpi=100)
+        layout = QtWidgets.QVBoxLayout(self)
+        self.canvas = MplCanvas(self, width=20, height=20, dpi=100)
 
-        l.addWidget(self.sc)
+        layout.addWidget(self.canvas)
 
     def update_plotter_data(
             self,
@@ -177,7 +177,7 @@ def update_plotter_data(
             style = gopem.helper.StyleTable["Solid"]
         else:
             style = gopem.helper.StyleTable[style]
-        self.sc.update_plot(
+        self.canvas.update_plot(
             data,
             x_axis,
             y_axis,
@@ -212,4 +212,4 @@ def clear_plot(self):
 
         :return: None
         """
-        self.sc.axes.cla()
+        self.canvas.axes.cla()