make it possible to reset the application, allowing to switch images

Author: mwinkens

src/backend/rule_manager.py

@@ -58,15 +58,13 @@ def getRules(self) -> List[str]:
         return list(self._config.keys())
 
     @staticmethod
-    def _getFileBase(filename):
-        # remove mime type and check it if exists
+    def _getFileBase(filename: str):
+        # remove .rules mime type
+        if filename.startswith("."):
+            raise ValueError("rules are not allowed to start with .")
         splits = filename.split(".")
-        if len(splits) > 2:
-            raise ValueError("The name must have format <rule> or <rule>.rules")
-        if len(splits) == 2:
-            if splits[1] != "rules":
-                raise ValueError(f"Unknown rule mime type '{splits[1]}'")
-            filename = splits[0]
+        if len(splits) >= 2 and splits[-1] == "rules":
+            filename = ".".join(splits[0:-1])
         return filename
 
     @staticmethod

src/backend/tile_handler.py

@@ -115,3 +115,6 @@ def findTilesByNeighborhood(self, neighborhood: int) -> List[NeighborhoodEntry]:
         if neighborhood < 0 or neighborhood >= 2**8:
             raise ValueError("only use 8 bit neighbourhood to find tiles by neighborhood")
         return self.neighborhood_map[neighborhood]
+
+    def reset(self):
+        self._init()

src/config/app_state.py

@@ -43,6 +43,13 @@ def setImagePath(cls, image_path):
         cls.instance().rule_manager.loadRules(Path(image_path).stem)
         cls.instance().signal_emitter.application_status_signal.emit(ApplicationStatusEnum.IMAGE_LOADED, "")
 
+    @classmethod
+    def reset(cls):
+        # do not call _init here, don't overwrite the signal emitter, reset manually
+        cls.instance().rule_manager: RuleManager = RuleManager()
+        cls.instance().main_image_path: Optional[str] = None
+        cls.instance().signal_emitter.application_status_signal.emit(ApplicationStatusEnum.RESET_APP, "")
+
     @classmethod
     def setStatus(cls, status_type: ApplicationStatusEnum, message: str):
         if status_type == ApplicationStatusEnum.IMAGE_LOADED:

src/main_window.py

@@ -9,6 +9,10 @@
 from src.widgets.widget_image_selector import ImageSelectorWidget
 from src.config.app_state import AppState
 from src.signals.signal_emitter import ApplicationStatusEnum
+from src.backend.tile_handler import TileHandler
+import logging
+
+logger = logging.getLogger(__name__)
 
 
 class MainWindow(QMainWindow):
@@ -63,8 +67,13 @@ def showAbout(self):
         QMessageBox.about(self, 'About', 'This is a PyQt6 menu example.')
 
     def statusUpdateReceived(self, status_type: ApplicationStatusEnum, message: str):
+        logger.debug(f"Status update received: {status_type}, {message}")
         if status_type == ApplicationStatusEnum.IMAGE_LOADED:
             self.mapper_generator.setEnabled(True)
             self.mapper_generator.widget().rulesLoaded()
             # TODO set status dockwidget "Successfully loaded image"
+        elif status_type == ApplicationStatusEnum.RESET_APP:
+            self.mapper_generator.widget().reset()
+            self.central_widget.reset()
+            TileHandler.instance().reset()
         pass

src/signals/signal_emitter.py

@@ -9,6 +9,7 @@ class ConfigurationClickedEmitter(QObject):
 
 class ApplicationStatusEnum(Enum):
     IMAGE_LOADED = "ImageLoaded"
+    RESET_APP = "ResetApp"
     WARNING = "Warning"
     INFO = "Info"
 

src/widgets/widget_image_selector.py

@@ -37,8 +37,15 @@ def select_image(self):
             if selected_files:
                 image_path = selected_files[0]
                 pixmap = QPixmap(image_path)
+                if AppState.imagePath():
+                    AppState.reset()  # reset app before loading new, calls self.reset somewhere
                 if not pixmap.isNull():
                     self.image_label.setPixmap(pixmap)
                     AppState.setImagePath(image_path)
                 # else:
                 #    self.image_label.setText("Invalid image file")
+
+    def reset(self):
+        self.layout().removeWidget(self.image_label)
+        self.image_label = TileClicker(self)
+        self.layout().addWidget(self.image_label)

src/widgets/widget_mapper_generator.py

@@ -5,7 +5,7 @@
 from PyQt6.QtGui import QPixmap, QRegularExpressionValidator
 from PyQt6.QtCore import QRegularExpression
 
-from src.config.app_state import AppState
+from src.config.app_state import AppState, ApplicationStatusEnum
 from src.dialogs.dialog_check_map import CheckMapDialog
 from src.config.config_manager import ConfigManager
 
@@ -87,8 +87,13 @@ def __init__(self, parent=None):
         self.new_mapper_line_edit.setMaxLength(128)  # limit number of characters
 
     def startRuleGeneration(self):
-        rule_name = self.new_mapper_line_edit.text()
-        if not AppState.imagePath() or not len(rule_name):
+        if self.radio_buttons[0].isChecked():
+            rule_name = self.new_mapper_line_edit.text()
+        else:
+            rule_name = self.existing_mapper_combobox.currentText()
+
+        if not AppState.imagePath() or not rule_name or not len(rule_name):
+            AppState.setStatus(ApplicationStatusEnum.WARNING, "You can't generate without a rule name")
             return
         cmd = CheckMapDialog(self, title=f"Do you want to save your mapping rule '{rule_name}'?", cancel=True)
         ret = cmd.exec()
@@ -102,11 +107,20 @@ def checkMappingRules(self):
         cmd.exec()
 
     def mappingRuleNameChanged(self):
-        rule_name = self.new_mapper_line_edit.text()
-        if not rule_name or len(rule_name) == 0:
-            self.generate_button.setDisabled(True)
+        self._updateGenerateButton()
+
+    def _updateGenerateButton(self):
+        if self.radio_buttons[0].isChecked():
+            rule_name = self.new_mapper_line_edit.text()
+            if not rule_name or len(rule_name) == 0:
+                self.generate_button.setDisabled(True)
+            else:
+                self.generate_button.setEnabled(True)
         else:
-            self.generate_button.setEnabled(True)
+            if not self.existing_mapper_combobox.count():
+                self.generate_button.setDisabled(True)
+            else:
+                self.generate_button.setEnabled(True)
 
     def ruleNameToggle(self):
         if self.radio_buttons[0].isChecked():
@@ -115,6 +129,7 @@ def ruleNameToggle(self):
         elif self.radio_buttons[1].isChecked():
             self.new_mapper.hide()
             self.existing_mapper.show()
+        self._updateGenerateButton()
 
     def startDDNetCheck(self):
         # TODO
@@ -137,5 +152,12 @@ def rulesLoaded(self):
             self.radio_buttons[1].setEnabled(True)
         else:  # disable combo box
             if self.radio_buttons[1].isChecked():
-                self.ruleNameToggle()  # only new is available
+                self.radio_buttons[0].click()
             self.radio_buttons[1].setDisabled(True)
+        self._updateGenerateButton()
+
+    def reset(self):
+        if self.radio_buttons[1].isChecked():
+            self.ruleNameToggle()
+        self.new_mapper_line_edit.setText("")
+        self.existing_mapper_combobox.clear()