feat: import Origin 7.0552 OPJ worksheets

.gitattributes

@@ -2,3 +2,5 @@
 
 *.ico binary
 *.png binary
+*.opj binary
+*.opju binary

Cargo.toml

@@ -73,6 +73,7 @@ muda = { version = "0.19.3", default-features = false }
 rfd = "0.17"
 zip = { version = "8.6", default-features = false, features = ["deflate"] }
 image = { version = "0.25", default-features = false, features = ["jpeg", "png", "tiff"] }
+libc = "0.2"
 pdf-writer = "0.12"
 resvg = "0.47"
 svg2pdf = "0.13"

crates/app/Cargo.toml

@@ -37,6 +37,9 @@ uuid.workspace = true
 raw-window-handle.workspace = true
 windows-sys.workspace = true
 
+[target.'cfg(unix)'.dependencies]
+libc.workspace = true
+
 [target.'cfg(target_os = "macos")'.dependencies]
 muda.workspace = true
 

crates/app/src/ui/canvas/mod.rs

@@ -345,7 +345,7 @@ fn welcome_start(app: &mut PlotxApp, ui: &mut Ui) {
     if welcome_action(ui, icon::FOLDER_OPEN, "Open project…") {
         crate::ui::file_dialogs::open_project(app);
     }
-    if welcome_action(ui, icon::TABLE, "Import table / CSV…") {
+    if welcome_action(ui, icon::TABLE, "Import table…") {
         crate::ui::file_dialogs::import_delimited_table(app);
     }
     if welcome_action(ui, icon::FILE_PLUS, "New empty data table") {

crates/app/src/ui/commands.rs

@@ -324,6 +324,10 @@ pub fn describe(app: &PlotxApp, id: CommandId) -> CommandDescriptor {
             !app.session.recent_files.is_empty(),
             "Open a file or project to build the recent list.",
         ),
+        CommandId::ImportTable => requires(
+            app.session.ui.table_import_preview.is_none(),
+            "Finish or cancel the current table import preview before importing another table.",
+        ),
         CommandId::ExportData => requires(
             dataset().is_some_and(|dataset| {
                 !plotx_core::data_export::DataExportAvailability::for_dataset(dataset).is_empty()

crates/app/src/ui/commands/identity.rs

@@ -45,7 +45,7 @@ pub(super) fn command_identity(
         ),
         CommandId::ClearRecentFiles => plain("Clear Recent Files", None),
         CommandId::HelpManual => plain("User Manual", Some(icon::BOOK_OPEN)),
-        CommandId::ImportTable => plain("Import Table / CSV…", Some(icon::TABLE)),
+        CommandId::ImportTable => plain("Import Table…", Some(icon::TABLE)),
         CommandId::PasteTable => plain("Paste Table from Clipboard", Some(icon::CLIPBOARD_TEXT)),
         CommandId::SaveProject => plain("Save Project", Some(icon::FLOPPY_DISK)),
         CommandId::NewTable => plain("New Empty Data Table", Some(icon::TABLE)),

crates/app/src/ui/commands_tests.rs

@@ -108,6 +108,34 @@ fn stable_ids_cover_static_and_dynamic_commands() {
     assert_eq!(CommandId::RunBatchWorkflow.stable_id(), "tools.automation");
 }
 
+#[test]
+fn origin_import_reuses_import_table_command_identity() {
+    let app = app();
+    assert_eq!(CommandId::ImportTable.stable_id(), "file.import_table");
+    assert_eq!(
+        describe(&app, CommandId::ImportTable).label,
+        "Import Table…"
+    );
+}
+
+#[test]
+fn import_table_is_disabled_while_a_table_preview_is_pending() {
+    let mut app = app();
+    crate::ui::file_dialogs::import_delimited_text(
+        &mut app,
+        "x,y\n0,1\n",
+        crate::ui::file_dialogs::DelimitedTableSource::Clipboard,
+    );
+    assert!(app.session.ui.table_import_preview.is_some());
+
+    let command = describe(&app, CommandId::ImportTable);
+    assert!(!command.enabled);
+    assert_eq!(
+        command.disabled_reason,
+        Some("Finish or cancel the current table import preview before importing another table.")
+    );
+}
+
 #[test]
 fn automation_is_a_global_menu_and_palette_command() {
     let app = app();

crates/app/src/ui/file_dialogs.rs

@@ -8,41 +8,39 @@ use plotx_core::state::ProcessingSchemeDialogState;
 
 mod delimited;
 mod discovery;
+mod origin;
 mod path;
 mod preview;
 mod recent;
 mod xlsx;
 pub(crate) use delimited::DelimitedTableSource;
 use path::{ensure_extension, ensure_plotx_extension, io_error_category};
 pub(crate) use preview::table_import_preview_window;
-pub(crate) use recent::open_recent_path;
 #[cfg(test)]
-use recent::{RecentOpenKind, recent_open_kind};
+use recent::RecentOpenKind;
+pub(crate) use recent::open_recent_path;
 use xlsx::import_xlsx_table_path;
 
 pub(crate) fn import_delimited_table(app: &mut PlotxApp) {
     let Some(path) = rfd::FileDialog::new()
         .add_filter(
-            "Table (*.csv, *.tsv, *.txt, *.xlsx)",
-            &["csv", "tsv", "txt", "xlsx"],
+            "Table (*.csv, *.tsv, *.txt, *.xlsx, *.opj)",
+            origin::IMPORT_TABLE_FILTER_EXTENSIONS,
+        )
+        .add_filter(
+            origin::ORIGIN_PROJECT_FILTER_LABEL,
+            origin::ORIGIN_PROJECT_FILTER_EXTENSIONS,
         )
         .add_filter("Excel workbook (*.xlsx)", &["xlsx"])
         .add_filter("CSV (*.csv)", &["csv"])
         .add_filter("TSV (*.tsv)", &["tsv"])
         .add_filter("All files", &["*"])
-        .set_title("Import a comma, tab, or semicolon delimited table")
+        .set_title("Import a table")
         .pick_file()
     else {
         return;
     };
-    if path
-        .extension()
-        .is_some_and(|extension| extension.eq_ignore_ascii_case("xlsx"))
-    {
-        import_xlsx_table_path(app, &path);
-    } else {
-        import_delimited_table_path(app, &path);
-    }
+    open_recent_path(app, &path);
 }
 
 fn import_delimited_table_path(app: &mut PlotxApp, path: &std::path::Path) {
@@ -290,9 +288,34 @@ pub(crate) fn import_delimited_text_with_schema(
 }
 
 pub(crate) fn commit_table_import_preview(app: &mut PlotxApp) -> bool {
+    commit_table_import_preview_with_recent(app, PlotxApp::note_recent_file)
+}
+
+pub(crate) fn commit_table_import_preview_with_recent<F>(
+    app: &mut PlotxApp,
+    mut note_recent_file: F,
+) -> bool
+where
+    F: FnMut(&mut PlotxApp, &std::path::Path),
+{
     let Some(preview) = app.session.ui.table_import_preview.take() else {
         return false;
     };
+    if preview.candidates.is_empty() {
+        app.session.record_operation(OperationReport::<()>::failure(
+            preview.report.id,
+            OperationKind::TableImport,
+            "Table import failed because there are no supported tables to import.",
+            Diagnostic::new(
+                Severity::Error,
+                DiagnosticCode::TableImportFailed,
+                "The import preview contains no supported table candidates.",
+            )
+            .with_source("app.table_import")
+            .with_context("stage", "preview_commit"),
+        ));
+        return false;
+    }
     for candidate in preview.candidates {
         app.import_table_dataset_typed(
             candidate.name,
@@ -303,7 +326,7 @@ pub(crate) fn commit_table_import_preview(app: &mut PlotxApp) -> bool {
         );
     }
     if let Some(path) = preview.recent_path {
-        app.note_recent_file(&path);
+        note_recent_file(app, &path);
     }
     app.session.record_operation(preview.report);
     true
@@ -320,8 +343,12 @@ pub(crate) fn load_and_note(app: &mut PlotxApp, path: &std::path::Path) {
 pub(crate) fn open_file(app: &mut PlotxApp) {
     if let Some(paths) = rfd::FileDialog::new()
         .add_filter(
-            "All supported data (*.abf, *.jdf, fid, ser, *.zip)",
-            &["abf", "jdf", "fid", "ser", "zip"],
+            "All supported data (*.abf, *.jdf, fid, ser, *.zip, *.opj)",
+            origin::OPEN_FILE_FILTER_EXTENSIONS,
+        )
+        .add_filter(
+            origin::ORIGIN_PROJECT_FILTER_LABEL,
+            origin::ORIGIN_PROJECT_FILTER_EXTENSIONS,
         )
         .add_filter("Axon Binary Format 2 (*.abf)", &["abf"])
         .add_filter("JEOL Delta (*.jdf)", &["jdf"])
@@ -332,7 +359,7 @@ pub(crate) fn open_file(app: &mut PlotxApp) {
         .pick_files()
     {
         for path in paths {
-            load_and_note(app, &path);
+            open_recent_path(app, &path);
         }
     }
 }