From b517de5e5808d7bd489220ae19a9d3924aafb5d4 Mon Sep 17 00:00:00 2001 From: Marc Jeanmougin Date: Thu, 11 Jul 2019 18:38:40 +0200 Subject: add autotrace options --- po/inkscape.pot | 2 +- share/ui/dialog-trace.glade | 81 +++++++++++++++++++++++++++++++++++------- src/ui/dialog/tracedialog2.cpp | 12 ++++--- 3 files changed, 77 insertions(+), 18 deletions(-) diff --git a/po/inkscape.pot b/po/inkscape.pot index 54e632011..132530e7a 100644 --- a/po/inkscape.pot +++ b/po/inkscape.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: inkscape-translator@lists.inkscape.org\n" -"POT-Creation-Date: 2019-08-14 11:37+0200\n" +"POT-Creation-Date: 2019-08-14 11:38+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/share/ui/dialog-trace.glade b/share/ui/dialog-trace.glade index d24c5f7e0..82f99b86b 100644 --- a/share/ui/dialog-trace.glade +++ b/share/ui/dialog-trace.glade @@ -37,10 +37,12 @@ 0.20000000000000001 10 - - 100 - 1 - 10 + + 1 + 10 + 2 + 0.1 + 1 1 @@ -55,8 +57,10 @@ 1 10 - - 100 + + 1 + 20 + 4 1 10 @@ -151,7 +155,7 @@ True -- + True False @@ -269,7 +273,7 @@ True False - Autotrace ? + Filter iterations False @@ -281,8 +285,33 @@ True True - SS_AT_T - 3 + SS_AT_FI_T + 0 + + + False + True + 1 + + + + + True + False + Error threshold + + + False + True + 0 + + + + + True + True + SS_AT_ET_T + 1 False @@ -301,11 +330,12 @@ True False vertical + True False - Centerline tries + Filter iterations False @@ -317,8 +347,33 @@ True True - SS_CT_T - 3 + SS_AT_FI_T + 0 + + + False + True + 1 + + + + + True + False + Error threshold + + + False + True + 0 + + + + + True + True + SS_AT_ET_T + 1 False diff --git a/src/ui/dialog/tracedialog2.cpp b/src/ui/dialog/tracedialog2.cpp index 14ec1cebc..486caf17b 100644 --- a/src/ui/dialog/tracedialog2.cpp +++ b/src/ui/dialog/tracedialog2.cpp @@ -66,7 +66,7 @@ class TraceDialogImpl2 : public TraceDialog { Glib::RefPtr builder; - Glib::RefPtr MS_scans, PA_curves, PA_islands, PA_sparse1, PA_sparse2, SS_AT_T, SS_BC_T, SS_CQ_T, + Glib::RefPtr MS_scans, PA_curves, PA_islands, PA_sparse1, PA_sparse2, SS_AT_ET_T, SS_AT_FI_T, SS_BC_T, SS_CQ_T, SS_CT_T, SS_ED_T, optimize, smooth, speckles; Gtk::ComboBoxText *CBT_SS, *CBT_MS; Gtk::CheckButton *CB_invert, *CB_MS_smooth, *CB_MS_stack, *CB_MS_rb, *CB_speckles, *CB_smooth, *CB_optimize, @@ -156,6 +156,8 @@ void TraceDialogImpl2::traceProcess(bool do_i_trace) { g_warning("Should not happen!"); } + ate.opts->filter_iterations = (int) SS_AT_FI_T->get_value(); + ate.opts->error_threshold = SS_AT_ET_T->get_value(); Inkscape::Trace::Potrace::PotraceTracingEngine pte( potraceType, CB_invert->get_active(), (int)SS_CQ_T->get_value(), SS_BC_T->get_value(), @@ -237,7 +239,8 @@ void TraceDialogImpl2::onSetDefaults() PA_islands->set_value(5); PA_sparse1->set_value(4); PA_sparse2->set_value(1); - SS_AT_T->set_value(0); + SS_AT_FI_T->set_value(4); + SS_AT_ET_T->set_value(2); SS_BC_T->set_value(0.45); SS_CQ_T->set_value(64); SS_CT_T->set_value(0); @@ -264,7 +267,7 @@ TraceDialogImpl2::TraceDialogImpl2() : TraceDialog() { const std::string req_widgets[] = { "MS_scans", "PA_curves", "PA_islands", "PA_sparse1", "PA_sparse2", - "SS_AT_T", "SS_BC_T", "SS_CQ_T", "SS_CT_T", "SS_ED_T", + "SS_AT_FI_T", "SS_AT_ET_T", "SS_BC_T", "SS_CQ_T", "SS_CT_T", "SS_ED_T", "optimize", "smooth", "speckles", "CB_invert", "CB_MS_smooth", "CB_MS_stack", "CB_MS_rb", "CB_speckles", "CB_smooth", "CB_optimize", /*"CB_live",*/ "CB_SIOX", "CBT_SS", "CBT_MS", "B_RESET", @@ -298,7 +301,8 @@ TraceDialogImpl2::TraceDialogImpl2() GET_O(PA_islands) GET_O(PA_sparse1) GET_O(PA_sparse2) - GET_O(SS_AT_T) + GET_O(SS_AT_FI_T) + GET_O(SS_AT_ET_T) GET_O(SS_BC_T) GET_O(SS_CQ_T) GET_O(SS_CT_T) -- cgit v1.2.3