statable 3.1.1__tar.gz → 3.2.1__tar.gz

{statable-3.1.1 → statable-3.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: statable
-Version: 3.1.1
+Version: 3.2.1
 Summary: MISRA C:2012-aware state machine design and C code generation for embedded systems
 Author: Hideki Akashi
 License-Expression: Apache-2.0

{statable-3.1.1 → statable-3.2.1}/codegen/__init__.py

@@ -8,7 +8,7 @@ StaTable code generation layer
     so it is not re-exported at top level (to reduce startup time)
 """
 
-__version__ = "3.1.1"
+__version__ = "3.2.1"
 
 __all__ = [
     'CCodeGenerator',

{statable-3.1.1 → statable-3.2.1}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "statable"
-version = "3.1.1"
+version = "3.2.1"
 description = "MISRA C:2012-aware state machine design and C code generation for embedded systems"
 readme = "README.md"
 requires-python = ">=3.10"

{statable-3.1.1 → statable-3.2.1}/statable/__init__.py

@@ -40,7 +40,7 @@ from .global_defs import (
     StructMemberDef,
 )
 
-__version__ = "3.1.1"
+__version__ = "3.2.1"
 
 __all__ = [
     # model

{statable-3.1.1 → statable-3.2.1}/statable/cli.py

@@ -27,7 +27,7 @@ import json
 import sys
 from pathlib import Path
 
-CLI_VERSION = "3.1.1"
+CLI_VERSION = "3.2.1"
 
 
 def _err(msg: str) -> None:

{statable-3.1.1 → statable-3.2.1}/statable.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: statable
-Version: 3.1.1
+Version: 3.2.1
 Summary: MISRA C:2012-aware state machine design and C code generation for embedded systems
 Author: Hideki Akashi
 License-Expression: Apache-2.0

{statable-3.1.1 → statable-3.2.1}/statable.egg-info/SOURCES.txt

@@ -88,6 +88,8 @@ statable_gui/literal_definition_dialog.py
 statable_gui/logger.py
 statable_gui/main_window.py
 statable_gui/matrix_table.py
+statable_gui/new_project_templates.py
+statable_gui/new_project_wizard.py
 statable_gui/preference_keys.py
 statable_gui/preferences.py
 statable_gui/role_function_dialog.py
@@ -157,4 +159,5 @@ tests/test_v3_0_g1_shared.py
 tests/test_v3_0_s1_packaging.py
 tests/test_v3_0_s2_public_api.py
 tests/test_v3_0_s3_cli.py
-tests/test_v3_0_s4_docs.py
+tests/test_v3_0_s4_docs.py
+tests/test_v3_2_s1_wizard.py

{statable-3.1.1 → statable-3.2.1}/statable_gui/i18n/__init__.py

@@ -14,6 +14,7 @@ Usage in gui_main.py or statable_gui/main_window.py:
 """
 from __future__ import annotations
 
+import sys
 from pathlib import Path
 from typing import Optional
 
@@ -25,7 +26,16 @@ from PySide6.QtCore import (
 )
 from PySide6.QtWidgets import QApplication
 
-I18N_DIR = Path(__file__).parent
+# [v3.2] PyInstaller frozen support
+if getattr(sys, "frozen", False):
+    # Bundled: resources are in sys._MEIPASS/statable_gui/i18n
+    _meipass = getattr(sys, "_MEIPASS", None)
+    if _meipass:
+        I18N_DIR = Path(_meipass) / "statable_gui" / "i18n"
+    else:
+        I18N_DIR = Path(__file__).parent
+else:
+    I18N_DIR = Path(__file__).parent
 DEFAULT_LANG = "en"
 SUPPORTED_LANGUAGES = ["en", "zh_CN"]
 LANG_DISPLAY = {

{statable-3.1.1 → statable-3.2.1}/statable_gui/main_window.py

@@ -39,7 +39,7 @@ from pathlib import Path
 from PySide6.QtCore import Qt
 from PySide6.QtGui import QAction
 from PySide6.QtWidgets import (
-    QMainWindow, QTabWidget, QToolButton, QMessageBox,
+    QMainWindow, QTabWidget, QToolButton, QMessageBox, QDialog,
     QInputDialog, QFileDialog, QDialog, QToolBar
 )
 
@@ -211,6 +211,8 @@ class MainWindow(QMainWindow):
 
         self.tab_widget = QTabWidget()
         self.tab_widget.setTabsClosable(True)
+        # [v3.2.1] Enable drag-and-drop tab reordering
+        self.tab_widget.setMovable(True)
         self.tab_widget.tabCloseRequested.connect(
             self.close_tab)
         self.setCentralWidget(self.tab_widget)
@@ -375,16 +377,17 @@ class MainWindow(QMainWindow):
 
         file_menu = menubar.addMenu(self.tr("File"))
 
-        # [v2.3] New Project (Ctrl+N)
-        new_project_action = QAction(self.tr("New Project..."), self)
-        new_project_action.setShortcut("Ctrl+N")
-        new_project_action.triggered.connect(self.new_project)
-        file_menu.addAction(new_project_action)
+        # [v3.2] New Project Wizard (Ctrl+N)
+        new_wizard_action = QAction(self.tr("New Project..."), self)
+        new_wizard_action.setShortcut("Ctrl+N")
+        new_wizard_action.triggered.connect(self.new_project_wizard)
+        file_menu.addAction(new_wizard_action)
 
         file_menu.addSeparator()
 
         open_action = QAction(self.tr("Open Project..."), self)
-        open_action.triggered.connect(self.open_project)
+        # [v3.2.1 fix] lambda: avoid passing triggered(bool) as filepath
+        open_action.triggered.connect(lambda: self.open_project())
         file_menu.addAction(open_action)
 
         save_action = QAction(self.tr("Save Project..."), self)
@@ -516,7 +519,12 @@ class MainWindow(QMainWindow):
             self._restart_in_progress = True
 
             exe = _sys.executable
-            args = [exe, "-m", "statable"]
+            # [v3.2] Frozen (PyInstaller) support: sys.executable is the
+            # bundled StaTable.exe, which does not accept "-m statable".
+            if getattr(_sys, "frozen", False):
+                args = [exe]
+            else:
+                args = [exe, "-m", "statable"]
             cwd = os.getcwd()
 
             # Disable UI to avoid double-clicks
@@ -805,8 +813,12 @@ class MainWindow(QMainWindow):
                 f"Failed to save project:\n{e}")
             return False
 
-    def open_project(self):
+    def open_project(self, filepath: str = None):
         """Load the whole project"""
+        # [v3.2.1 fix] Qt triggered signal passes bool; normalize to None
+        if isinstance(filepath, bool):
+            filepath = None
+
         # [v2.3] Prompt to save before loading
         if not self._maybe_save():
             return
@@ -814,13 +826,14 @@ class MainWindow(QMainWindow):
         StaTableLogger.debug(
             "MainWindow.open_project called")
 
-        last_dir = self.prefs.last_project_dir
-        filepath, _ = QFileDialog.getOpenFileName(
-            self, "Open Project", last_dir,
-            "XML files (*.xml)")
-        if not filepath:
-            StaTableLogger.debug("Open cancelled")
-            return
+        if filepath is None:
+            last_dir = self.prefs.last_project_dir
+            filepath, _ = QFileDialog.getOpenFileName(
+                self, "Open Project", last_dir,
+                "XML files (*.xml)")
+            if not filepath:
+                StaTableLogger.debug("Open cancelled")
+                return
         try:
             StaTableLogger.debug(
                 f"Calling project_from_xml: {filepath}")
@@ -1297,6 +1310,38 @@ class MainWindow(QMainWindow):
     # New Project feature (v2.3 / F-15)
     # ==================================================================
 
+    def new_project_wizard(self) -> None:
+        """[v3.2] Launch the New Project Wizard."""
+        if not self._maybe_save():
+            return
+        try:
+            from statable_gui.new_project_wizard import NewProjectWizard
+        except ImportError as e:
+            QMessageBox.critical(
+                self, "Wizard Error",
+                f"Failed to import wizard module:\n{e}")
+            return
+        try:
+            wiz = NewProjectWizard(self)
+            if wiz.exec() != QDialog.Accepted:
+                StaTableLogger.debug("New project wizard: cancelled")
+                return
+            xml_path = wiz.generate()
+            if not xml_path:
+                StaTableLogger.warning("Wizard returned no path")
+                return
+            StaTableLogger.info(f"New project generated: {xml_path}")
+            self.open_project(filepath=xml_path)
+            self.statusBar().showMessage(
+                f"New project created: {xml_path}", 5000)
+        except Exception as e:
+            StaTableLogger.error(f"New project wizard failed: {e!r}")
+            import traceback
+            QMessageBox.critical(
+                self, "Wizard Error",
+                f"Failed to create project:\n{e}\n\n"
+                f"{traceback.format_exc()}")
+
     def new_project(self) -> None:
         """Start a new empty project.
 

statable-3.2.1/statable_gui/new_project_templates.py

@@ -0,0 +1,133 @@
+# statable_gui/new_project_templates.py
+"""Template definitions for the New Project Wizard."""
+
+from __future__ import annotations
+
+# Common events used across all layers
+COMMON_EVENTS = [
+    {"name": "EV_INIT",    "delivery": "queue",  "kind": "signal", "description": "Initialization request"},
+    {"name": "EV_START",   "delivery": "direct", "kind": "signal", "description": "Start request"},
+    {"name": "EV_STOP",    "delivery": "direct", "kind": "signal", "description": "Stop request"},
+    {"name": "EV_ERROR",   "delivery": "queue",  "kind": "signal", "description": "Error notification"},
+    {"name": "EV_TIMEOUT", "delivery": "queue",  "kind": "time",   "description": "Timer expiry"},
+]
+
+# Global interrupts (shared across layers)
+INTERRUPTS = [
+    {"name": "ISR_TIMER0",   "description": "System tick timer"},
+    {"name": "ISR_UART_RX",  "description": "UART receive complete"},
+    {"name": "ISR_UART_TX",  "description": "UART transmit complete"},
+    {"name": "ISR_GPIO",     "description": "GPIO edge detection"},
+    {"name": "ISR_ADC",      "description": "ADC conversion complete"},
+]
+
+# Global variables (shared)
+GLOBAL_VARIABLES = [
+    {"name": "g_counter",     "type": "uint32_t", "description": "Loop counter"},
+    {"name": "g_error_code",  "type": "int32_t",  "description": "Last error code"},
+    {"name": "g_last_event",  "type": "uint16_t", "description": "Last processed event ID"},
+    {"name": "g_timeout_ms",  "type": "uint32_t", "description": "Timeout in milliseconds"},
+    {"name": "g_debug_level", "type": "uint8_t",  "description": "Debug verbosity level"},
+]
+
+# Event flags (shared)
+EVENT_FLAGS = [
+    {"name": "f_init_done", "description": "Initialization complete"},
+    {"name": "f_error",     "description": "Error state active"},
+    {"name": "f_ready",     "description": "Ready for operation"},
+    {"name": "f_busy",      "description": "Operation in progress"},
+    {"name": "f_timeout",   "description": "Timeout occurred"},
+]
+
+# Event queues (one per layer + 2 shared)
+EVENT_QUEUES = [
+    {"name": "q_driver",      "size": 16, "description": "Driver layer event queue"},
+    {"name": "q_middleware",  "size": 16, "description": "Middleware layer event queue"},
+    {"name": "q_application", "size": 16, "description": "Application layer event queue"},
+    {"name": "q_system",      "size": 32, "description": "System-wide event queue"},
+    {"name": "q_debug",       "size": 8,  "description": "Debug message queue"},
+]
+
+
+# Layer templates
+LAYERS_3LAYER = [
+    {
+        "name": "Driver",
+        "priority": 1,
+        "description": "Hardware abstraction layer",
+        "states": [
+            {"name": "Driver_Init",    "type": "initial", "description": "Hardware initialization"},
+            {"name": "Driver_Idle",    "type": "normal",  "description": "Waiting for commands"},
+            {"name": "Driver_Active",  "type": "normal",  "description": "Hardware active"},
+            {"name": "Driver_Error",   "type": "normal",  "description": "Hardware error"},
+            {"name": "Driver_Recover", "type": "normal",  "description": "Recovery in progress"},
+        ],
+        "role_functions": [
+            {"name": "Driver_HwInit",      "description": "Initialize hardware"},
+            {"name": "Driver_Start",       "description": "Start hardware operation"},
+            {"name": "Driver_Stop",        "description": "Stop hardware operation"},
+            {"name": "Driver_HandleError", "description": "Handle hardware error"},
+            {"name": "Driver_Cleanup",     "description": "Cleanup resources"},
+        ],
+    },
+    {
+        "name": "Middleware",
+        "priority": 3,
+        "description": "Business logic layer",
+        "states": [
+            {"name": "Middleware_Init",      "type": "initial", "description": "Middleware initialization"},
+            {"name": "Middleware_Standby",   "type": "normal",  "description": "Waiting"},
+            {"name": "Middleware_Processing","type": "normal",  "description": "Processing data"},
+            {"name": "Middleware_Waiting",   "type": "normal",  "description": "Waiting for response"},
+            {"name": "Middleware_Error",     "type": "normal",  "description": "Middleware error"},
+        ],
+        "role_functions": [
+            {"name": "Middleware_Init",      "description": "Initialize middleware"},
+            {"name": "Middleware_Process",   "description": "Process request"},
+            {"name": "Middleware_Commit",    "description": "Commit result"},
+            {"name": "Middleware_Rollback",  "description": "Rollback on error"},
+            {"name": "Middleware_Cleanup",   "description": "Cleanup resources"},
+        ],
+    },
+    {
+        "name": "Application",
+        "priority": 5,
+        "description": "User-facing application layer",
+        "states": [
+            {"name": "Application_Boot",     "type": "initial", "description": "Boot sequence"},
+            {"name": "Application_Ready",    "type": "normal",  "description": "Ready for user input"},
+            {"name": "Application_Running",  "type": "normal",  "description": "Main operation"},
+            {"name": "Application_Paused",   "type": "normal",  "description": "Paused state"},
+            {"name": "Application_Shutdown", "type": "normal",  "description": "Shutdown sequence"},
+        ],
+        "role_functions": [
+            {"name": "Application_Init",     "description": "Initialize application"},
+            {"name": "Application_Start",    "description": "Start main operation"},
+            {"name": "Application_Pause",    "description": "Pause operation"},
+            {"name": "Application_Resume",   "description": "Resume operation"},
+            {"name": "Application_Shutdown", "description": "Shutdown application"},
+        ],
+    },
+]
+
+
+TEMPLATES = {
+    "blank": {
+        "id": "blank",
+        "name": "Empty Project",
+        "description": "One empty Application layer (existing behavior)",
+        "layers": [],
+    },
+    "basic": {
+        "id": "basic",
+        "name": "Basic (Single Layer)",
+        "description": "Application layer with 5 states + 5 events + 5 role functions",
+        "layers": [LAYERS_3LAYER[2]],  # Application only
+    },
+    "three_layer": {
+        "id": "three_layer",
+        "name": "3-Layer (Driver / Middleware / Application) [Recommended]",
+        "description": "Full 3-layer structure with all placeholders",
+        "layers": LAYERS_3LAYER,
+    },
+}