1b-agent/OneCAD-Draft
1
0 Fork 0
forked from 1b-agent/opencadstudio-upstream
Code Pull Requests Activity

Merge pull request #1360 from HakanSeven12/plot/b4-ctb-leniency

Browse Source 
fix(plot-style): load plot style tables written by other applications

# Conflicts:
#	src/app/update/file.rs
#	src/ui/window/plot.rs
This commit is contained in:
Hakan Seven committed 2026-09-19 23:00:19 +03:00
2 parents 996412c405 7a75d430cd
commit f20c823ffe
28 files changed
+339 -35
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/app/update/mod.rs
+15 -2
View File
@@ -8946,7 +8946,7 @@ impl OpenCADStudio {
Message::PlotStyleLoad => {
Task::perform(crate::io::pick_plot_style(), Message::PlotStyleLoaded)
}
Message::PlotStyleLoaded(Some(table)) => {
Message::PlotStyleLoaded(Ok(Some(table))) => {
if table.is_stb {
self.command_line.push_error(
crate::t!(
@@ -8958,6 +8958,8 @@ impl OpenCADStudio {
}
self.plot_dialog.style_name = table.name.clone();
self.plot_dialog.style_missing = false;
self.plot_dialog.style_error = None;
self.report_plot_style_warnings(&table);
self.command_line.push_output(
crate::tf!(
"Plot style '{}' loaded ({} color entries).",
@@ -8974,7 +8976,15 @@ impl OpenCADStudio {
self.plot_dialog.plot_styles = crate::io::plot_style::available_ctb_names();
Task::none()
}
Message::PlotStyleLoaded(None) => Task::none(),
Message::PlotStyleLoaded(Ok(None)) => Task::none(),
Message::PlotStyleLoaded(Err(error)) => {
// The file the user pointed at could not be read: say why,
// in the dialog as well as on the command line.
self.command_line.push_error(&error);
self.plot_dialog.style_missing = true;
self.plot_dialog.style_error = Some(error);
Task::none()
}
Message::PlotStyleClear => {
self.active_plot_style = None;
self.plot_dialog.style_name.clear();
@@ -9001,12 +9011,15 @@ impl OpenCADStudio {
if needs_load {
match crate::io::plot_style::PlotStyleTable::load_named(&selected_style) {
Ok(table) => {
self.report_plot_style_warnings(&table);
self.active_plot_style = Some(table);
self.plot_dialog.style_missing = false;
self.plot_dialog.style_error = None;
}
Err(error) => {
self.plot_dialog.style_missing = true;
self.command_line.push_error(&error);
self.plot_dialog.style_error = Some(error);
return Task::none();
}
}