Rename connector entities allow backdoor deletes

Author: RetiredWizard

Fruit_Jam/Fruit_Jam_Logic_Gates/entity.py

@@ -224,9 +224,9 @@ def apply_state_palette_mapping(self):
         for loc in self.tile_locations:
             self._workspace.tilegrid.pixel_shader[loc] = pal
 
-class ConnectorIn(Entity):
+class SignalReceiver(Entity):
     """
-    Input Connector used to bring signals into an entity from an output connector
+    Virtual Connector used to bring signals into an entity from a Signal Transmitter
     """
 
     def __init__(self, location, workspace, connector_number=None, add_to_workspace=True):
@@ -241,9 +241,9 @@ def __init__(self, location, workspace, connector_number=None, add_to_workspace=
         self._input_one = None
 
         if connector_number is None:
-            # Find the last ConnectorOut entity added to the workspace to link to
+            # Find the last SignalTransmitter entity added to the workspace to link to
             for entity in self._workspace.entities:
-                if isinstance(entity, ConnectorOut):
+                if isinstance(entity, SignalTransmitter):
                     self.connector_number = entity.connector_number
                     self._input_one = entity
         else:
@@ -270,7 +270,7 @@ def input_one(self):
 
     @input_one.setter
     def input_one(self, input_entity):
-        if isinstance(input_entity, ConnectorOut):
+        if isinstance(input_entity, SignalTransmitter):
             self._input_one = input_entity
             self.apply_state_palette_mapping()
 
@@ -314,12 +314,12 @@ def apply_state_palette_mapping(self):
 
     def handle_click(self):
         """
-        Cycle through available ConnectorOut entities on the workspace
+        Cycle through available SignalTransmitter entities on the workspace
         """
         connector_outs = []
         inuse_connector_numbers = []
         for entity in self._workspace.entities:
-            if isinstance(entity, ConnectorOut):
+            if isinstance(entity, SignalTransmitter):
                 connector_outs.append(entity)
                 inuse_connector_numbers.append(entity.connector_number)
 
@@ -343,7 +343,7 @@ def handle_click(self):
             if entity.connector_number == self.connector_number:
                 self.input_one = entity
 
-class ConnectorOut(Entity):
+class SignalTransmitter(Entity):
     """
     Output Connector used to send signals from an entity to an input connector
     """

Fruit_Jam/Fruit_Jam_Logic_Gates/logic_gates_assets/sprites.bmp

@@ -29,8 +29,8 @@
     NeoPixelOutput,
     PhysicalButton,
     Wire,
-    ConnectorIn,
-    ConnectorOut,
+    SignalReceiver,
+    SignalTransmitter,
 )
 
 # pylint: disable=too-many-branches, too-many-statements
@@ -63,8 +63,8 @@
     "XnorGate": XnorGate,
     "NotGate": NotGate,
     "Wire": Wire,
-    "ConnectorIn": ConnectorIn,
-    "ConnectorOut": ConnectorOut,
+    "SignalReceiver": SignalReceiver,
+    "SignalTransmitter": SignalTransmitter,
     "OutputPanel": OutputPanel,
     "VirtualPushButton": VirtualPushButton,
     "PhysicalButton": PhysicalButton,
@@ -222,8 +222,8 @@ def remove_entity(self, entity):
             self.tilegrid[entity.tile_locations[i]] = EMPTY
             self.overlay_tilegrid[entity.tile_locations[i]] = EMPTY
 
-        # Special case for ConnectorOut to clear its input wire tap overlay
-        if isinstance(entity, ConnectorOut):
+        # Special case for SignalTransmitter to clear its input wire tap overlay
+        if isinstance(entity, SignalTransmitter):
             if isinstance(entity.input_entity,Wire):
                 self.overlay_tilegrid[entity.input_entity_location] = EMPTY
 
@@ -242,6 +242,23 @@ def _set_mouse_moving_tiles(self, entity):
                 loc[1] - entity.location[1] + midpoint_offset,
             ] = entity.tiles[i]
 
+    def _clear_cursor(self):
+        # Special SignalTransmitter case, add connection_number back into available list
+        if isinstance(self.moving_entity, SignalTransmitter):
+            self.available_connectors.append(self.moving_entity.connector_number)
+            self.available_connectors.sort()
+            # Remove connections from SignalReceivers pointing to this SignalTransmitter
+            for entity in self.entities:
+                if isinstance(entity, SignalReceiver) and \
+                    entity.connector_number == self.moving_entity.connector_number:
+
+                    entity.connector_number = None
+                    entity.input_one = None
+
+        self.moving_entity = None
+        self.mouse_moving_tg.hidden = True
+        self.update()
+
     def handle_mouse_click(self, screen_x, screen_y, pressed_btns):
         """
         Handle mouse click events sent from code.py
@@ -263,8 +280,7 @@ def handle_mouse_click(self, screen_x, screen_y, pressed_btns):
 
                 # if there is an entity on the mouse, remove it
                 else:
-                    self.moving_entity = None
-                    self.mouse_moving_tg.hidden = True
+                    self._clear_cursor()
                 return
 
         # apply offset value based on scroll position
@@ -444,31 +460,13 @@ def handle_key_press(self, key_bytes, mouse_x, mouse_y):
         # remove action, clear out the entity moving with the mouse
         elif action == "remove":
             if self.moving_entity is not None:
-                # Speical ConnectorOut case, add connection_number back into available list
-                if isinstance(self.moving_entity, ConnectorOut):
-                    self.available_connectors.append(self.moving_entity.connector_number)
-                    self.available_connectors.sort()
-                    # Remove connections from all ConnectorIn entities pointing to this ConnectorOut
-                    for entity in self.entities:
-                        if isinstance(entity, ConnectorIn) and \
-                            entity.connector_number == self.moving_entity.connector_number:
-
-                            entity.connector_number = None
-                            entity.input_one = None
-
-                self.moving_entity = None
-                self.mouse_moving_tg.hidden = True
-                self.update()
+                self._clear_cursor()
 
         # eyedropper or pipette action
         elif action == "eyedropper":
             # if there is already an entity moving with the mouse
             if self.moving_entity is not None:
-                # clear out the entity moving with the mouse
-                # This was a "back door" delete of the object, better to just ignore
-                # otherwise we need to add the ConnectorOut special case here as well
-                #self.moving_entity = None
-                #self.mouse_moving_tg.hidden = True
+                self._clear_cursor()
                 return
 
             # adjust mouse coordinates for the scroll position
@@ -482,14 +480,14 @@ def handle_key_press(self, key_bytes, mouse_x, mouse_y):
             # try to get the entity at the tile coordinates
             target_entity = self.entity_at((tile_x, tile_y))
 
-            # special case only limited number of ConnectorOuts
-            if target_entity is not None and isinstance(target_entity, ConnectorOut):
-                num_ConnectorOuts = 0
+            # special case only limited number of SignalTransmitters
+            if target_entity is not None and isinstance(target_entity, SignalTransmitter):
+                num_SignalTransmitters = 0
                 for entity in self.entities:
-                    if isinstance(entity, ConnectorOut):
-                        num_ConnectorOuts += 1
-                if num_ConnectorOuts >= MAX_CONNECTORS:
-                    # Can't create additional ConnectorOut
+                    if isinstance(entity, SignalTransmitter):
+                        num_SignalTransmitters += 1
+                if num_SignalTransmitters >= MAX_CONNECTORS:
+                    # Can't create additional SignalTransmitters
                     target_entity = None
 
             # if there was an entity at the coordinates
@@ -585,7 +583,7 @@ def create_entity_from_json(self, entity_json, add_to_workspace=True):
                 location, self, entity_json["state"], add_to_workspace=add_to_workspace
             )
         # special case Connectors need the connector number
-        elif entity_json["class"] == "ConnectorIn" or entity_json["class"] == "ConnectorOut":
+        elif entity_json["class"] == "SignalReceiver" or entity_json["class"] == "SignalTransmitter":
             if entity_json.get("connector_number") is not None:
                 new_entity = ENTITY_CLASS_CONSTRUCTOR_MAP[entity_json["class"]](
                     location, self, entity_json["connector_number"],
@@ -611,7 +609,7 @@ def load_from_json(self, json_data):
         """
         Load the workspace state from a JSON object.
         """
-        # reset list of available ConnectorOuts
+        # reset list of available SignalTransmitters
         self.available_connectors = list(range(MAX_CONNECTORS))
         self.neopixels.fill(0)
         # clear out all sprites in the tilegrid
@@ -629,11 +627,11 @@ def load_from_json(self, json_data):
 
         # Connect any connectors
         for entity in self.entities:
-            if isinstance(entity,ConnectorOut):
+            if isinstance(entity,SignalTransmitter):
                 if entity.connector_number in self.available_connectors:
                     self.available_connectors.remove(entity.connector_number)
                 for entity_in in self.entities:
-                    if isinstance(entity_in,ConnectorIn) and \
+                    if isinstance(entity_in,SignalReceiver) and \
                         entity_in.connector_number is not None and \
                         entity.connector_number == entity_in.connector_number:
 
@@ -751,15 +749,15 @@ class ToolBox:
             "size": (1, 1),
         },
         {
-            "label": "Output Connector",
+            "label": "Signal Transmit'r",
             "tiles": (31,),
-            "constructor": ConnectorOut,
+            "constructor": SignalTransmitter,
             "size": (1, 1),
         },
         {
-            "label": "Input Connector",
+            "label": "Signal Receiver",
             "tiles": (30,),
-            "constructor": ConnectorIn,
+            "constructor": SignalReceiver,
             "size": (1, 1),
         },
         {
@@ -892,13 +890,13 @@ def handle_mouse_click(self, screen_coords):
                 (0, 0), self._workspace, clicked_item["index"], add_to_workspace=False
             )
 
-        # special case only limited number of ConnectorOuts
+        # special case only limited number of SignalTransmitters
         elif clicked_item["label"] == "Output Connector":
-            num_ConnectorOuts = 0
+            num_SignalTransmitters = 0
             for entity in self._workspace.entities:
-                if isinstance(entity, ConnectorOut):
-                    num_ConnectorOuts += 1
-            if num_ConnectorOuts >= MAX_CONNECTORS:
+                if isinstance(entity, SignalTransmitter):
+                    num_SignalTransmitters += 1
+            if num_SignalTransmitters >= MAX_CONNECTORS:
                 # close the ToolBox
                 self.hidden = True
                 return