Add getters and setters

Author: marcohenning

src/pyqt_loading_button/loading_button.py

@@ -16,10 +16,10 @@ def __init__(self, parent=None):
         self.__running = False
 
         # Animation settings
-        self.__animation_type = AnimationType.Dots
-        self.__animation_speed = 1000
-        self.__animation_width = 20
-        self.__animation_thickness = 4
+        self.__animation_type = AnimationType.Circle
+        self.__animation_speed = 2000
+        self.__animation_width = 15
+        self.__animation_stroke_width = 3
         self.__animation_color = QColor(0, 0, 0)
 
         # Animation settings (Circle)
@@ -34,6 +34,7 @@ def __init__(self, parent=None):
         # Animation settings (Dots)
         self.__dots_speed_coefficient = 0.3
         self.__dots_single_speed = int(self.__animation_speed * self.__dots_speed_coefficient)
+        self.__dots_easing_curve = QEasingCurve.Type.InOutSine
         self.__dots_offset_1 = 0
         self.__dots_offset_2 = 0
         self.__dots_offset_3 = 0
@@ -59,35 +60,35 @@ def __init__(self, parent=None):
 
         # Animation timelines (Dots)
         self.__timeline_dots_up_1 = QTimeLine(self.__dots_single_speed, self)
-        self.__timeline_dots_up_1.setFrameRange(0, self.__animation_thickness)
-        self.__timeline_dots_up_1.setEasingCurve(QEasingCurve.Type.InOutSine)
+        self.__timeline_dots_up_1.setFrameRange(0, self.__animation_stroke_width)
+        self.__timeline_dots_up_1.setEasingCurve(self.__dots_easing_curve)
         self.__timeline_dots_up_1.frameChanged.connect(self.__handle_timeline_dots_up_1)
 
         self.__timeline_dots_down_1 = QTimeLine(self.__dots_single_speed, self)
-        self.__timeline_dots_down_1.setFrameRange(self.__animation_thickness, 0)
-        self.__timeline_dots_down_1.setEasingCurve(QEasingCurve.Type.InOutSine)
+        self.__timeline_dots_down_1.setFrameRange(self.__animation_stroke_width, 0)
+        self.__timeline_dots_down_1.setEasingCurve(self.__dots_easing_curve)
         self.__timeline_dots_down_1.frameChanged.connect(self.__handle_timeline_dots_down_1)
         self.__timeline_dots_up_1.finished.connect(self.__timeline_dots_down_1.start)
 
         self.__timeline_dots_up_2 = QTimeLine(self.__dots_single_speed, self)
-        self.__timeline_dots_up_2.setFrameRange(0, self.__animation_thickness)
-        self.__timeline_dots_up_2.setEasingCurve(QEasingCurve.Type.InOutSine)
+        self.__timeline_dots_up_2.setFrameRange(0, self.__animation_stroke_width)
+        self.__timeline_dots_up_2.setEasingCurve(self.__dots_easing_curve)
         self.__timeline_dots_up_2.frameChanged.connect(self.__handle_timeline_dots_up_2)
 
         self.__timeline_dots_down_2 = QTimeLine(self.__dots_single_speed, self)
-        self.__timeline_dots_down_2.setFrameRange(self.__animation_thickness, 0)
-        self.__timeline_dots_down_2.setEasingCurve(QEasingCurve.Type.InOutSine)
+        self.__timeline_dots_down_2.setFrameRange(self.__animation_stroke_width, 0)
+        self.__timeline_dots_down_2.setEasingCurve(self.__dots_easing_curve)
         self.__timeline_dots_down_2.frameChanged.connect(self.__handle_timeline_dots_down_2)
         self.__timeline_dots_up_2.finished.connect(self.__timeline_dots_down_2.start)
 
         self.__timeline_dots_up_3 = QTimeLine(self.__dots_single_speed, self)
-        self.__timeline_dots_up_3.setFrameRange(0, self.__animation_thickness)
-        self.__timeline_dots_up_3.setEasingCurve(QEasingCurve.Type.InOutSine)
+        self.__timeline_dots_up_3.setFrameRange(0, self.__animation_stroke_width)
+        self.__timeline_dots_up_3.setEasingCurve(self.__dots_easing_curve)
         self.__timeline_dots_up_3.frameChanged.connect(self.__handle_timeline_dots_up_3)
 
         self.__timeline_dots_down_3 = QTimeLine(self.__dots_single_speed, self)
-        self.__timeline_dots_down_3.setFrameRange(self.__animation_thickness, 0)
-        self.__timeline_dots_down_3.setEasingCurve(QEasingCurve.Type.InOutSine)
+        self.__timeline_dots_down_3.setFrameRange(self.__animation_stroke_width, 0)
+        self.__timeline_dots_down_3.setEasingCurve(self.__dots_easing_curve)
         self.__timeline_dots_down_3.frameChanged.connect(self.__handle_timeline_dots_down_3)
         self.__timeline_dots_down_3.finished.connect(self.__timeline_dots_up_1.start)
         self.__timeline_dots_up_3.finished.connect(self.__timeline_dots_down_3.start)
@@ -133,7 +134,8 @@ def __handle_timeline_circle_increase_span(self):
         self.update()
 
     def __handle_timeline_circle_increase_span_start(self):
-        self.__circle_previous_additional_rotation = (self.__circle_previous_additional_rotation + self.__circle_additional_rotation) % 360
+        self.__circle_previous_additional_rotation = (self.__circle_previous_additional_rotation +
+                                                      self.__circle_additional_rotation) % 360
         self.__timeline_circle_increase_span.start()
 
     def __handle_timeline_dots_up_1(self, value):
@@ -171,12 +173,15 @@ def paintEvent(self, event):
 
             painter = QPainter(self)
             painter.setRenderHint(QPainter.RenderHint.Antialiasing)
-            painter.setPen(QPen(self.__animation_color, self.__animation_thickness, Qt.PenStyle.SolidLine, Qt.PenCapStyle.RoundCap))
+            painter.setPen(QPen(self.__animation_color, self.__animation_stroke_width,
+                                Qt.PenStyle.SolidLine, Qt.PenCapStyle.RoundCap))
 
-            diameter = self.__animation_width - self.__animation_thickness
+            diameter = self.__animation_width - self.__animation_stroke_width
             x = math.floor((self.width() - diameter) / 2)
             y = math.ceil((self.height() - diameter) / 2)
-            rotation = (self.__timeline_circle_rotation.currentFrame() - self.__circle_additional_rotation - self.__circle_previous_additional_rotation) % 360 * 16
+            rotation = (self.__timeline_circle_rotation.currentFrame() -
+                        self.__circle_additional_rotation -
+                        self.__circle_previous_additional_rotation) % 360 * 16
             span = self.__circle_span * 16
 
             painter.drawArc(x, y, diameter, diameter, rotation, span)
@@ -187,15 +192,18 @@ def paintEvent(self, event):
             painter.setRenderHint(QPainter.RenderHint.Antialiasing)
             painter.setBrush(self.__animation_color)
 
-            true_width = math.ceil(self.__animation_width / 3) * 2 + self.__animation_thickness
+            true_width = math.ceil(self.__animation_width / 3) * 2 + self.__animation_stroke_width
             x_dot_1 = math.ceil((self.width() - true_width) / 2)
             x_dot_2 = x_dot_1 + math.ceil(self.__animation_width / 3)
             x_dot_3 = x_dot_2 + math.ceil(self.__animation_width / 3)
-            y = math.ceil((self.height() - self.__animation_thickness) / 2)
+            y = math.ceil((self.height() - self.__animation_stroke_width) / 2)
 
-            painter.drawEllipse(x_dot_1, y - self.__dots_offset_1, self.__animation_thickness, self.__animation_thickness)
-            painter.drawEllipse(x_dot_2, y - self.__dots_offset_2, self.__animation_thickness, self.__animation_thickness)
-            painter.drawEllipse(x_dot_3, y - self.__dots_offset_3, self.__animation_thickness, self.__animation_thickness)
+            painter.drawEllipse(x_dot_1, y - self.__dots_offset_1,
+                                self.__animation_stroke_width, self.__animation_stroke_width)
+            painter.drawEllipse(x_dot_2, y - self.__dots_offset_2,
+                                self.__animation_stroke_width, self.__animation_stroke_width)
+            painter.drawEllipse(x_dot_3, y - self.__dots_offset_3,
+                                self.__animation_stroke_width, self.__animation_stroke_width)
 
     def text(self) -> str:
         return self.__text
@@ -205,5 +213,52 @@ def setText(self, text: str) -> None:
         if not self.__running:
             super().setText(self.__text)
 
-    def setAction(self, action):
+    def setAction(self, action: callable):
         self.__action = action
+
+    def isRunning(self) -> bool:
+        return self.__running
+
+    def getAnimationType(self) -> AnimationType:
+        return self.__animation_type
+
+    def setAnimationType(self, animation_type: AnimationType):
+        self.__animation_type = animation_type
+
+    def getAnimationSpeed(self) -> int:
+        return self.__animation_speed
+
+    def setAnimationSpeed(self, speed: int):
+        self.__animation_speed = speed
+
+        self.__circle_span_speed = int(self.__animation_speed * self.__circle_speed_coefficient)
+        self.__dots_single_speed = int(self.__animation_speed * self.__dots_speed_coefficient)
+
+        self.__timeline_circle_rotation.setDuration(self.__animation_speed)
+        self.__timeline_circle_decrease_span.setDuration(self.__circle_span_speed)
+        self.__timeline_circle_increase_span.setDuration(self.__circle_span_speed)
+
+        self.__timeline_dots_up_1.setDuration(self.__dots_single_speed)
+        self.__timeline_dots_down_1.setDuration(self.__dots_single_speed)
+        self.__timeline_dots_up_2.setDuration(self.__dots_single_speed)
+        self.__timeline_dots_down_2.setDuration(self.__dots_single_speed)
+        self.__timeline_dots_up_3.setDuration(self.__dots_single_speed)
+        self.__timeline_dots_down_3.setDuration(self.__dots_single_speed)
+
+    def getAnimationWidth(self) -> int:
+        return self.__animation_width
+
+    def setAnimationWidth(self, width: int):
+        self.__animation_width = width
+
+    def getAnimationStrokeWidth(self) -> int:
+        return self.__animation_stroke_width
+
+    def setAnimationStrokeWidth(self, width: int):
+        self.__animation_stroke_width = width
+
+    def getAnimationColor(self) -> QColor:
+        return self.__animation_color
+
+    def setAnimationColor(self, color: QColor):
+        self.__animation_color = color

src/pyqt_loading_button/worker.py

@@ -5,7 +5,7 @@ class Worker(QThread):
 
     finished = Signal()
 
-    def __init__(self, action):
+    def __init__(self, action: callable):
         super(Worker, self).__init__()
 
         self.__action = action