Version 1.1.143-158

* The `is_clicked()` function of the `GraphicsObject` class returns whether or not the object's `bounds` were clicked.
If it has no bounds, it returns `False`

* Made the `RadioButton` class an iterable
* You can now use the `len()` function on `RadioButton` and `CycleButton` objects
* The `RadioButton` and `CycleButton` classes are now subscriptable
* Added an `anchor` attribute to the `CycleButton` class to support gliding

* The `RadioButton` and `CycleButton` classes now support movement and gliding functions
* The `get_anchor()` function of the `CycleButton` class now returns the value from its states' `get_anchor()` function,
 not the `anchor` attribute itself

 * The `is_clicked()` function in the `Image()` class now uses integer division (`//`) rather than float division (`/`)
  to make it slightly faster and also pre-calculates the divisions to perform half the division operations

 * Fixed bug with the `RadioButton` & `CycleButton` class not changing their anchors when moving
 * Fixed bug with all the `GraphicsObject`glide functions adding 2 lists together instead of their elements
 * The `RadioButton` class now raises an error if the user has specified 0 states

 * Added a `get_anchor()` function to the `RadioButton` class
 * Fixed bug with `Button` objects not defining their `anchor` during the initialization
 * The `change_graphic()` function of the `Button` class now allows you to set graphics to `None`

 * The `GraphicObject` class now raises an error if the user tries to glide an object which does not support it
 * Renamed the `allow_only_numeric()` function of the `Entry` to `allow_only_positive_integer()` and added 2 new
 functions: `allow_only_numeric()` and `allow_only_integer()`

Author: BhavyeMathur

MathFeatures.png

@@ -206,6 +206,35 @@ https://stackoverflow.com/questions/63978464/error-when-compiling-cpython-cannot
 There are probably still a lot of bugs in the release version, but I moved onto Version 1.1 because I started working 
 on converting goopylib code to Cython C and also building a Sound Engine for goopylib 1.2
 
+#### 1.1.158-alpha18 3rd November 2020
+
+* The `is_clicked()` function of the `GraphicsObject` class returns whether or not the object's `bounds` were clicked. 
+If it has no bounds, it returns `False`
+
+* Made the `RadioButton` class an iterable
+* You can now use the `len()` function on `RadioButton` and `CycleButton` objects
+* The `RadioButton` and `CycleButton` classes are now subscriptable
+* Added an `anchor` attribute to the `CycleButton` class to support gliding
+
+* The `RadioButton` and `CycleButton` classes now support movement and gliding functions
+* The `get_anchor()` function of the `CycleButton` class now returns the value from its states' `get_anchor()` function,
+ not the `anchor` attribute itself
+ 
+ * The `is_clicked()` function in the `Image()` class now uses integer division (`//`) rather than float division (`/`)
+  to make it slightly faster and also pre-calculates the divisions to perform half the division operations
+  
+ * Fixed bug with the `RadioButton` & `CycleButton` class not changing their anchors when moving
+ * Fixed bug with all the `GraphicsObject`glide functions adding 2 lists together instead of their elements
+ * The `RadioButton` class now raises an error if the user has specified 0 states
+ 
+ * Added a `get_anchor()` function to the `RadioButton` class
+ * Fixed bug with `Button` objects not defining their `anchor` during the initialization
+ * The `change_graphic()` function of the `Button` class now allows you to set graphics to `None`
+ 
+ * The `GraphicObject` class now raises an error if the user tries to glide an object which does not support it
+ * Renamed the `allow_only_numeric()` function of the `Entry` to `allow_only_positive_integer()` and added 2 new 
+ functions: `allow_only_numeric()` and `allow_only_integer()`
+
 #### 1.1.142-alpha17 1st-2nd November 2020
 
 * Fixed bug with the default Image Texture path being `textures_other/` instead of `textures/`

README.md

@@ -29,6 +29,7 @@ def __init__(self, graphic, hover_graphic=None, clicked_graphic=None, disabled_g
             self.disabled_graphic_given = False
 
         self.graphic = self.normal_graphic
+        self.anchor = self.graphic.anchor
         self.drawn_graphic = self.graphic
 
         self.label = label
@@ -52,7 +53,7 @@ def _draw(self, canvas, options):
             self.label.draw(canvas, _internal_call=True)
 
     def destroy(self):
-        GraphicsObject.objects.remove(self)
+        GraphicsObject.objects.discard(self)
         GraphicsObject.object_layers[self.layer].discard(self)
         GraphicsObject.draggable_objects.discard(self)
         GraphicsObject.cursor_objects.discard(self)
@@ -160,18 +161,18 @@ def set_enabled(self, enable):
         else:
             self.disable()
 
-    def change_graphic(self, graphic=None, hover_graphic=None, clicked_graphic=None, disabled_graphic=None, label=None):
+    def change_graphic(self, graphic=0, hover_graphic=0, clicked_graphic=0, disabled_graphic=0, label=0):
         self.undraw()
-        if hover_graphic is not None:
+        if hover_graphic != 0:
             self.hover_graphic = hover_graphic
-        if graphic is not None:
+        if graphic != 0:
             self.normal_graphic = graphic
-        if clicked_graphic is not None:
+        if clicked_graphic != 0:
             self.clicked_graphic = clicked_graphic
-        if disabled_graphic is not None:
+        if disabled_graphic != 0:
             self.disabled_graphic = disabled_graphic
 
-        if label is not None:
+        if label != 0:
             self.label = label
 
         self.draw(self.graphwin)

goopylib/objects/Button.py

@@ -17,6 +17,20 @@ def __init__(self, *states, state=0, disabled_graphic=None, autoflush=True, laye
 
         self.graphic = states[state]
 
+        self.number_of_states = len(self.states)
+
+        number_of_states = 0
+        self.anchor = [0, 0]
+        for state in self.states:
+            state_anchor = state.get_anchor()
+            if state_anchor is not None:
+                self.anchor[0] += state_anchor[0]
+                self.anchor[1] += state_anchor[1]
+                number_of_states += 1
+
+        if number_of_states != 0:
+            self.anchor = [self.anchor[0] // number_of_states, self.anchor[1] // number_of_states]
+
         GraphicsObject.__init__(self, (), tag=tag, bounds=bounds)
         GraphicsObject.cyclebutton_instances.add(self)
 
@@ -30,6 +44,12 @@ def __iter__(self):
         for state in self.states:
             yield state
 
+    def __getitem__(self, item):
+        return self.states[item]
+
+    def __len__(self):
+        return self.number_of_states
+
     def _draw(self, canvas=None, options=None):
         self.states[self.state].draw(canvas, _internal_call=True)
         self.drawn_graphic = self.states[self.state]
@@ -75,6 +95,8 @@ def _rotate(self, dr, sampling="bicubic", center=None):
             self.disabled_graphic.rotate(dr, sampling=sampling, center=center)
 
     def _move(self, dx, dy):
+        self.anchor[0] += dx
+        self.anchor[1] += dy
         for graphic in self.states:
             graphic.move(dx, dy)
         if self.disabled_graphic is not None:
@@ -227,16 +249,47 @@ def set_state(self, state):
 
     def add_state(self, state):
         self.states.append(state)
+        self.number_of_states += 1
+        number_of_states = 0
+        self.anchor = [0, 0]
+        for state in self.states:
+            state_anchor = state.get_anchor()
+            if state_anchor is not None:
+                self.anchor[0] += state_anchor[0]
+                self.anchor[1] += state_anchor[1]
+                number_of_states += 1
+
+        self.anchor = [self.anchor[0] // number_of_states, self.anchor[1] // number_of_states]
         return self
 
     def remove_state(self, state):
-        if state not in self.states:
-            raise GraphicsError("\n\nThe state to remove is not an existing state of this cycle button")
+        self.number_of_states -= 1
+        number_of_states = 0
+        self.anchor = [0, 0]
+        for state in self.states:
+            state_anchor = state.get_anchor()
+            if state_anchor is not None:
+                self.anchor[0] += state_anchor[0]
+                self.anchor[1] += state_anchor[1]
+                number_of_states += 1
+
+        self.anchor = [self.anchor[0] // number_of_states, self.anchor[1] // number_of_states]
 
         self.states.remove(state)
         return self
 
     def pop_state(self, index):
+        self.number_of_states -= 1
+        number_of_states = 0
+        self.anchor = [0, 0]
+        for state in self.states:
+            state_anchor = state.get_anchor()
+            if state_anchor is not None:
+                self.anchor[0] += state_anchor[0]
+                self.anchor[1] += state_anchor[1]
+                number_of_states += 1
+
+        self.anchor = [self.anchor[0] // number_of_states, self.anchor[1] // number_of_states]
         return self.states.pop(index)
 
     def set_object(self, obj):
@@ -269,7 +322,7 @@ def get_object(self):
     # GETTER FUNCTIONS
 
     def get_anchor(self):
-        return self.graphic.anchor
+        return self.graphic.get_anchor()
 
     def get_state(self):
         return self.state

goopylib/objects/CycleButton.py

@@ -202,6 +202,30 @@ def allow_character(self, character):
         return self
 
     def allow_only_numeric(self, allow=True):
+        if allow:
+            self.allowed_symbols = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9', "-", "."]
+        else:
+            self.allowed_symbols = ['a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q',
+                                    'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H',
+                                    'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y',
+                                    'Z', '!', '"', '#', '$', '%', '&', '\\', "'", '(', ')', '*', '+', ',', '-', '.',
+                                    '/', ':', ';', '<', '=', '>', '?', '@', '[', '\'', '"', ']', '^', '_', '`', '{',
+                                    '|', '}', '~', ':', " "]
+        return self
+
+    def allow_only_integers(self, allow=True):
+        if allow:
+            self.allowed_symbols = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9', "-"]
+        else:
+            self.allowed_symbols = ['a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q',
+                                    'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H',
+                                    'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y',
+                                    'Z', '!', '"', '#', '$', '%', '&', '\\', "'", '(', ')', '*', '+', ',', '-', '.',
+                                    '/', ':', ';', '<', '=', '>', '?', '@', '[', '\'', '"', ']', '^', '_', '`', '{',
+                                    '|', '}', '~', ':', " "]
+        return self
+
+    def allow_only_positive_integers(self, allow=True):
         if allow:
             self.allowed_symbols = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9']
         else:

goopylib/objects/Entry.py

@@ -1039,6 +1039,10 @@ def animate_blinking(self, interval, animate=True, blink_graphic=None, number_of
     # Object Gliding Functions
     def glide(self, dx, dy, time=1, easing_x=py_ease_linear(), easing_y=None, allow_duplicate=True,
               duplicates_metric=("Time", "Initial", "Change")):
+
+        if self.get_anchor() is None:
+            raise GraphicsError("\n\nGraphicsError: gliding functions unsupported for this object")
+
         for metric in duplicates_metric:
             if metric not in DUPLICATES_METRICS["2D Animation"]:
                 raise GraphicsError("\n\nGraphicsError: Metric in duplicates_metric must be one of "
@@ -1066,7 +1070,9 @@ def glide(self, dx, dy, time=1, easing_x=py_ease_linear(), easing_y=None, allow_
                                 f"(integer or float), not {time}")
 
         if len(self.animation_queues["glide"]) > 0:
-            initial = self.animation_queues["glide"][-1]["Initial"] + self.animation_queues["glide"][-1]["Change"]
+            initial = [
+                self.animation_queues["glide"][-1]["Initial"][0] + self.animation_queues["glide"][-1]["Change"][0],
+                self.animation_queues["glide"][-1]["Initial"][1] + self.animation_queues["glide"][-1]["Change"][1]]
             start = self.animation_queues["glide"][-1]["Start"] + self.animation_queues["glide"][-1]["Time"]
         else:
             initial = self.anchor.copy()
@@ -1090,6 +1096,9 @@ def glide(self, dx, dy, time=1, easing_x=py_ease_linear(), easing_y=None, allow_
     def glide_x(self, dx, time=1, easing=py_ease_linear(), allow_duplicate=True,
                 duplicates_metric=("Time", "Initial", "Change")):
 
+        if self.get_anchor() is None:
+            raise GraphicsError("\n\nGraphicsError: gliding functions unsupported for this object")
+
         for metric in duplicates_metric:
             if metric not in DUPLICATES_METRICS["1D Animation"]:
                 raise GraphicsError("\n\nGraphicsError: Metric in duplicates_metric must be one of "
@@ -1108,7 +1117,9 @@ def glide_x(self, dx, time=1, easing=py_ease_linear(), allow_duplicate=True,
                                 f"not {allow_duplicate}")
 
         if len(self.animation_queues["glide"]) > 0:
-            initial = self.animation_queues["glide"][-1]["Initial"] + self.animation_queues["glide"][-1]["Change"]
+            initial = [
+                self.animation_queues["glide"][-1]["Initial"][0] + self.animation_queues["glide"][-1]["Change"][0],
+                self.animation_queues["glide"][-1]["Initial"][1] + self.animation_queues["glide"][-1]["Change"][1]]
             start = self.animation_queues["glide"][-1]["Start"] + self.animation_queues["glide"][-1]["Time"]
         else:
             initial = self.anchor.copy()
@@ -1131,6 +1142,10 @@ def glide_x(self, dx, time=1, easing=py_ease_linear(), allow_duplicate=True,
 
     def glide_y(self, dy, time=1, easing=py_ease_linear(), allow_duplicate=True,
                 duplicates_metric=("Time", "Initial", "Change")):
+
+        if self.get_anchor() is None:
+            raise GraphicsError("\n\nGraphicsError: gliding functions unsupported for this object")
+
         for metric in duplicates_metric:
             if metric not in DUPLICATES_METRICS["1D Animation"]:
                 raise GraphicsError("\n\nGraphicsError: Metric in duplicates_metric must be one of "
@@ -1149,7 +1164,9 @@ def glide_y(self, dy, time=1, easing=py_ease_linear(), allow_duplicate=True,
                                 f"not {allow_duplicate}")
 
         if len(self.animation_queues["glide"]) > 0:
-            initial = self.animation_queues["glide"][-1]["Initial"] + self.animation_queues["glide"][-1]["Change"]
+            initial = [
+                self.animation_queues["glide"][-1]["Initial"][0] + self.animation_queues["glide"][-1]["Change"][0],
+                self.animation_queues["glide"][-1]["Initial"][1] + self.animation_queues["glide"][-1]["Change"][1]]
             start = self.animation_queues["glide"][-1]["Start"] + self.animation_queues["glide"][-1]["Time"]
         else:
             initial = self.anchor.copy()
@@ -1173,6 +1190,9 @@ def glide_y(self, dy, time=1, easing=py_ease_linear(), allow_duplicate=True,
     def glide_to(self, x, y, time=1, easing_x=py_ease_linear(), easing_y=None, allow_duplicate=True,
                  duplicates_metric=("Time", "Final")):
 
+        if self.get_anchor() is None:
+            raise GraphicsError("\n\nGraphicsError: gliding functions unsupported for this object")
+
         for metric in duplicates_metric:
             if metric not in DUPLICATES_METRICS["2D Animation"]:
                 raise GraphicsError("\n\nGraphicsError: Metric in duplicates_metric must be one of "
@@ -1200,7 +1220,9 @@ def glide_to(self, x, y, time=1, easing_x=py_ease_linear(), easing_y=None, allow
                                 f"(integer or float), not {time}")
 
         if len(self.animation_queues["glide"]) > 0:
-            initial = self.animation_queues["glide"][-1]["Initial"] + self.animation_queues["glide"][-1]["Change"]
+            initial = [
+                self.animation_queues["glide"][-1]["Initial"][0] + self.animation_queues["glide"][-1]["Change"][0],
+                self.animation_queues["glide"][-1]["Initial"][1] + self.animation_queues["glide"][-1]["Change"][1]]
             start = self.animation_queues["glide"][-1]["Start"] + self.animation_queues["glide"][-1]["Time"]
         else:
             initial = self.anchor.copy()
@@ -1223,6 +1245,9 @@ def glide_to(self, x, y, time=1, easing_x=py_ease_linear(), easing_y=None, allow
         return self
 
     def glide_to_x(self, x, time=1, easing=py_ease_linear(), allow_duplicate=True, duplicates_metric=("Time", "Final")):
+        if self.get_anchor() is None:
+            raise GraphicsError("\n\nGraphicsError: gliding functions unsupported for this object")
+
         for metric in duplicates_metric:
             if metric not in DUPLICATES_METRICS["1D Animation"]:
                 raise GraphicsError("\n\nGraphicsError: Metric in duplicates_metric must be one of "
@@ -1241,7 +1266,9 @@ def glide_to_x(self, x, time=1, easing=py_ease_linear(), allow_duplicate=True, d
                                 f"not {allow_duplicate}")
 
         if len(self.animation_queues["glide"]) > 0:
-            initial = self.animation_queues["glide"][-1]["Initial"] + self.animation_queues["glide"][-1]["Change"]
+            initial = [
+                self.animation_queues["glide"][-1]["Initial"][0] + self.animation_queues["glide"][-1]["Change"][0],
+                self.animation_queues["glide"][-1]["Initial"][1] + self.animation_queues["glide"][-1]["Change"][1]]
             start = self.animation_queues["glide"][-1]["Start"] + self.animation_queues["glide"][-1]["Time"]
         else:
             initial = self.anchor.copy()
@@ -1263,6 +1290,9 @@ def glide_to_x(self, x, time=1, easing=py_ease_linear(), allow_duplicate=True, d
         return self
 
     def glide_to_y(self, y, time=1, easing=py_ease_linear(), allow_duplicate=True, duplicates_metric=("Time", "Final")):
+        if self.get_anchor() is None:
+            raise GraphicsError("\n\nGraphicsError: gliding functions unsupported for this object")
+
         for metric in duplicates_metric:
             if metric not in DUPLICATES_METRICS["1D Animation"]:
                 raise GraphicsError("\n\nGraphicsError: Metric in duplicates_metric must be one of "
@@ -1281,7 +1311,8 @@ def glide_to_y(self, y, time=1, easing=py_ease_linear(), allow_duplicate=True, d
                                 f"not {allow_duplicate}")
 
         if len(self.animation_queues["glide"]) > 0:
-            initial = self.animation_queues["glide"][-1]["Initial"] + self.animation_queues["glide"][-1]["Change"]
+            initial = [self.animation_queues["glide"][-1]["Initial"][0] + self.animation_queues["glide"][-1]["Change"][0],
+                       self.animation_queues["glide"][-1]["Initial"][1] + self.animation_queues["glide"][-1]["Change"][1]]
             start = self.animation_queues["glide"][-1]["Start"] + self.animation_queues["glide"][-1]["Time"]
         else:
             initial = self.anchor.copy()
@@ -1988,7 +2019,10 @@ def is_selected(self):
         return selected or self.selected_clicks == self.graphwin.total_left_mouse_clicks
 
     def is_clicked(self, mouse_pos):
-        return False
+        if self.bounds is None:
+            return False
+        else:
+            return self.bounds.is_clicked(mouse_pos)
 
     # -------------------------------------------------------------------------
     # STATIC METHODS

goopylib/objects/GraphicsObject.py

@@ -141,13 +141,13 @@ def is_clicked(self, mouse_pos):
         else:
             if self.bounds is None:
                 if self.drawn:
-                    width, height = abs(self.img.width() * self.graphwin.trans.x_scale), \
-                                    abs(self.img.height() * self.graphwin.trans.y_scale)
+                    width, height = abs(self.img.width() * self.graphwin.trans.x_scale) // 2, \
+                                    abs(self.img.height() * self.graphwin.trans.y_scale) // 2
                 else:
-                    width, height = self.img.width(), self.img.height()
+                    width, height = self.img.width() // 2, self.img.height() // 2
 
-                if (self.anchor[0] - width / 2 < mouse_pos[0] < self.anchor[0] + width / 2) and (
-                        self.anchor[1] - height / 2 < mouse_pos[1] < self.anchor[1] + height / 2):
+                if (self.anchor[0] - width < mouse_pos[0] < self.anchor[0] + width) and (
+                        self.anchor[1] - height < mouse_pos[1] < self.anchor[1] + height):
                     return True
                 else:
                     return False