Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ target-version = "py311"
line-length = 100

[tool.ruff.lint]
allowed-confusables = ["α", "γ", "ρ", "×", "–"]
allowed-confusables = ["α", "γ", "ρ", "×", "–", "ℹ"]
select = ["B", "C4", "C90", "E4", "E7", "E9", "F", "I", "RUF", "SIM", "UP"]

[tool.ruff.lint.isort]
Expand Down Expand Up @@ -141,6 +141,7 @@ include = [
"src/setuav_studio/ui/dialog/expression_dialog.py",
"src/setuav_studio/ui/dialog/log.py",
"src/setuav_studio/ui/dialog/plugin_manager.py",
"src/setuav_studio/ui/dialog/problems.py",
"src/setuav_studio/ui/dialog/task_monitor.py",
"src/setuav_studio/ui/editor/component.py",
"src/setuav_studio/ui/editor/constraint.py",
Expand Down
81 changes: 81 additions & 0 deletions src/setuav_studio/assets/icons/error.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions src/setuav_studio/assets/icons/manifest.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
[icons]
error = "error.svg"
warning = "warning.svg"
# File menu
file_open = "project-open-file.png"
file_new = "project-open-file.png"
Expand Down
74 changes: 74 additions & 0 deletions src/setuav_studio/assets/icons/warning.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions src/setuav_studio/model/constraint.py
Original file line number Diff line number Diff line change
Expand Up @@ -202,3 +202,12 @@ def check_all(
self.check_constraint(c, project_data, context, api=api, config_id=config_id)
)
return results

def evaluate_project(
self,
project_data: dict[str, Any],
config_id: str | None = None,
api: Any | None = None,
) -> list[ConstraintResult]:
"""Evaluate all constraints in project (alias for check_all)."""
return self.check_all(project_data, config_id=config_id, api=api)
3 changes: 3 additions & 0 deletions src/setuav_studio/ui/dialog/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
log_signal,
)
from setuav_studio.ui.dialog.plugin_manager import PluginManagerDialog
from setuav_studio.ui.dialog.problems import Problem, ProblemsDialog
from setuav_studio.ui.dialog.task_monitor import TaskMonitorDialog

__all__ = [
Expand All @@ -23,6 +24,8 @@
"LogEntry",
"LogWindow",
"PluginManagerDialog",
"Problem",
"ProblemsDialog",
"TaskMonitorDialog",
"clear_log_buffer",
"install_log_buffer",
Expand Down
102 changes: 102 additions & 0 deletions src/setuav_studio/ui/dialog/problems.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,102 @@
"""Dialog displaying consolidated system problems, plugin warnings, and constraint violations."""

from __future__ import annotations

from collections.abc import Sequence
from dataclasses import dataclass
from typing import TYPE_CHECKING

from PySide6.QtCore import Qt
from PySide6.QtWidgets import (
QAbstractItemView,
QDialog,
QHeaderView,
QTableWidget,
QTableWidgetItem,
QVBoxLayout,
QWidget,
)

from setuav_studio.ui.icons import get_icon

if TYPE_CHECKING:
from setuav_studio.api.api import StudioAPI


@dataclass(frozen=True)
class Problem:
"""Represents a single problem, constraint violation, or system/plugin warning."""

id: str
title: str
message: str
severity: str = "warning" # "error" | "warning" | "info"
source: str = "System" # "Constraint" | "Plugin" | "System" | "Geometry" etc.


class ProblemsDialog(QDialog):
"""Simple read-only window listing problems as a table, matching LogWindow layout."""

def __init__(
self,
problems: Sequence[Problem],
parent: QWidget | None = None,
api: StudioAPI | None = None,
) -> None:
super().__init__(parent)
self._api = api
self._problems = list(problems)

self.setWindowTitle("Problems")
self.setWindowIcon(get_icon("warning"))
self.setMinimumSize(760, 460)
self.setAttribute(Qt.WidgetAttribute.WA_DeleteOnClose, False)

layout = QVBoxLayout(self)
layout.setContentsMargins(0, 0, 0, 0)

self.problem_table = QTableWidget(0, 4, self)
self.problem_table.setObjectName("problemsTable")
self.problem_table.setHorizontalHeaderLabels(["Severity", "Source", "Problem", "Message"])
self.problem_table.setEditTriggers(QAbstractItemView.EditTrigger.NoEditTriggers)
self.problem_table.setSelectionBehavior(QAbstractItemView.SelectionBehavior.SelectRows)
self.problem_table.setSelectionMode(QAbstractItemView.SelectionMode.SingleSelection)
self.problem_table.setWordWrap(True)
self.problem_table.verticalHeader().setVisible(False)

header = self.problem_table.horizontalHeader()
header.setSectionResizeMode(0, QHeaderView.ResizeMode.ResizeToContents)
header.setSectionResizeMode(1, QHeaderView.ResizeMode.ResizeToContents)
header.setSectionResizeMode(2, QHeaderView.ResizeMode.ResizeToContents)
header.setSectionResizeMode(3, QHeaderView.ResizeMode.Stretch)

layout.addWidget(self.problem_table)

self._populate_table()

def _populate_table(self) -> None:
self.problem_table.setRowCount(0)
if not self._problems:
self.problem_table.insertRow(0)
msg_item = QTableWidgetItem("No problems or rule violations detected.")
msg_item.setFlags(Qt.ItemFlag.NoItemFlags)
self.problem_table.setItem(0, 3, msg_item)
return

for row, p in enumerate(self._problems):
self.problem_table.insertRow(row)
icon_key = "error" if p.severity == "error" else "warning"
sev_text = p.severity.capitalize()

sev_item = QTableWidgetItem(get_icon(icon_key), sev_text)
source_item = QTableWidgetItem(p.source)
title_item = QTableWidgetItem(p.title)
desc_item = QTableWidgetItem(p.message)

self.problem_table.setItem(row, 0, sev_item)
self.problem_table.setItem(row, 1, source_item)
self.problem_table.setItem(row, 2, title_item)
self.problem_table.setItem(row, 3, desc_item)


__all__ = ["Problem", "ProblemsDialog"]
11 changes: 3 additions & 8 deletions src/setuav_studio/ui/shell/actions.py
Original file line number Diff line number Diff line change
Expand Up @@ -146,19 +146,14 @@ def _setup_menus(self) -> None:
# Tools Menu
self.tools_menu = menu_bar.addMenu("&Tools")
self.menus["tools"] = self.tools_menu
self.tools_menu.addAction(self.command_palette_action)
self.task_monitor_action = self.tools_menu.addAction(
get_icon("fa6s.list-check"),
"Background Tasks…",
self.open_task_monitor,
)
self.task_monitor_action.setShortcut("Ctrl+T")
self.command_actions["core.tasks.manage"] = self.task_monitor_action
self.constraints_action = self.tools_menu.addAction(
get_icon("constraint"),
"Design Constraints…",
self.open_constraints,
)
self.command_actions["core.constraints.manage"] = self.constraints_action
self.plugin_manager_action = self.tools_menu.addAction(
get_icon("package"),
"Plugin Manager…",
Expand Down Expand Up @@ -245,6 +240,8 @@ def update_all_icons(self) -> None:
self.settings_action.setIcon(get_icon("fa6s.gear"))
if hasattr(self._window, "_log_button"):
self._window._log_button.setIcon(get_icon("log"))
if hasattr(self._window, "_command_palette_button"):
self._window._command_palette_button.setIcon(get_icon("fa6s.terminal"))
if hasattr(self._window, "_update_toolbar_contribution_icons"):
self._window._update_toolbar_contribution_icons()
if hasattr(self._window, "_refresh_workspace_combo"):
Expand All @@ -254,8 +251,6 @@ def update_all_icons(self) -> None:

def populate_view_menu(self, workspace_id: str | None = None) -> None:
self.view_menu.clear()
self.view_menu.addAction(self.command_palette_action)
self.view_menu.addSeparator()
theme_menu = self.view_menu.addMenu("Theme")
theme_menu.addAction(self.dark_theme_action)
theme_menu.addAction(self.light_theme_action)
Expand Down
10 changes: 2 additions & 8 deletions src/setuav_studio/ui/shell/project_controller.py
Original file line number Diff line number Diff line change
Expand Up @@ -133,22 +133,16 @@ def activate_project(self, project: ProjectDocument, *, confirm_close: bool = Tr
8000,
)
project_name = str(project.data.get("name") or project.location.name or project.path.name)
if status_mgr:
status_mgr.evaluate_problems(project)
if project.degraded:
if status_mgr:
status_mgr.degraded_badge.setToolTip("\n".join(project.plugin_issues))
status_mgr.degraded_badge.show()
self._api.show_status(
"Degraded mode — " + "; ".join(project.plugin_issues),
"warning",
0,
)
elif not project.read_only:
if status_mgr:
status_mgr.degraded_badge.hide()
self._api.show_status(f"Project opened: {project_name}", "info", 4000)
else:
if status_mgr:
status_mgr.degraded_badge.hide()
return True

def save_project(self) -> bool:
Expand Down
Loading