mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-10-16 20:31:14 +00:00
* Add orca-translations Claude skill and PO tool
Add a .claude skill that guides translation passes over the localization/i18n gettext catalogs. It covers the workflow: run gettext, settle new glossary terms, translate in batches, verify, and report.
Includes translation-rules.md, which condenses the placeholder, line-break and glossary rules plus the guidance on review notes.
Also adds scripts/po_tool.py (standard library only). It lists pending entries with glossary hints, validates and applies translations, adding '# AI Translated' and '# Needs human review' comments, and rewrites only the entries it changes. It can also check catalogs, look up existing translations, suggest glossary candidates and update the wiki glossary TSV.
* Let po_tool apply translations by entry id
pending now gives each entry a short id, so a translation file can name
entries by id instead of repeating the English msgid. apply accepts either.
A "review": "" item clears an earlier review note when overwriting an
entry, and check gives each msgfmt run its own temporary output file so
parallel checks do not collide.
* Fill all empty translations
Regenerate the template with run_gettext --full and translate every empty
entry in the 22 catalogs (7,089 entries) with the orca-translations skill,
following the localization glossary, including the new belt printer,
IDEX/IQEX and plugin terms. Every new entry is marked "# AI Translated";
122 also carry "# Needs human review" with what to check.
* Show entry ids in po_tool lookup and search translations
lookup now prints each entry's id, so an entry found there can be
rewritten with apply --overwrite without repeating the English, and
--msgstr searches the translations instead of the msgids, which finds
every entry that still uses a term being changed.
SKILL.md describes how to change an established term: check the
catalog's usage first, update the glossary cell, then rewrite only the
entries where the term has that meaning.
* Fix mistranslated terms and align catalogs with the glossary
Correct labels that the glossary had copied, and the entries that used
them:
- ca: Raft was rendered as the Brim term; it is now "Rai". Exhaust fan,
Monotonic line, Unretract, Slice, Lateral Honeycomb and PA Tower
labels fixed.
- cs: Lightning infill is "Blesk", not "Osvětlení" (illumination).
- sv: Retraction is "Retraktion", not "Reduktion"; Unretract,
Lagerhöjd, Delkylningsfläkt, Utsugsfläkt, Aligned Rectilinear and the
Preset label fixed.
- de: Brim is "Rand" and Skirt is "Umrandung", as most entries already
had them.
- lt: brim entries used the Skirt word "apvadas"; they now use "kraštas".
- es: Sparse infill is "relleno de baja densidad", the catalog majority.
- eu: nozzle wipe is "garbiketa", not purge.
- th: the project plate is "เพลต", distinct from the bed.
- uk: Quarter Cubic, Latin "PA" in PA Tower, and Belt purge tower.
- pl: Cross Hatch, Tri-hexagon, Volumetric speed and Raft labels.
- zh_TW: Brim stays "Brim", as the existing labels have it.
- tr: "Prime Tower" read "Prime Minister Tower".
- ko: the plugin "Capabilities" label read "performance".
- Build Volume labels fixed in tr, de, cs and eu.
All 242 rewritten entries are marked "# AI Translated".
* Make more UI text translatable and fix pluralization and context
Audit the sources for text that translators could not translate
correctly and fix it.
Mark text that reached users in English only: IDEX/IQEX role names,
plugin permission prompts and errors, 3MF/preset loading errors, G-code
placeholder parser errors, calibration and device messages, notification
texts, file dialog filters, and the config validation messages.
Replace sentences built from translated fragments, such as the prime
tower warnings, "left"/"right" nozzle names, and "Filament " + number,
with single msgids that have placeholders, so translators can reorder
and inflect them.
Use plural forms for texts with a count ("%1% mixed filaments",
"%d objects", "%1% triangles") instead of "(s)" and mismatched verbs.
Fix the swapped singular/plural pair in "The following presets inherit
this preset".
Add translation contexts where one English word has several meanings
(Subscribed/Local, Standard, Pause, View, Step, Model, Camera, Flow,
Filter, Others, Prepare, the Design tools). Show "Size" instead of
"Build Volume" in the Cut tool, which displays the object size.
Fix code that compared translated text with English (the Edit G-code
dialog group, the plugin registration failure check), and add the
bundled web pages' missing string-table entries. Use the single
character for degrees Celsius, say "G-code", and describe the head
filament map without internal jargon.
Install the libslic3r translate callback before the presets load, so
their load errors are translated, and list the 28 source files that had
marked strings but were never extracted into localization/i18n/list.txt.
* Suggest earlier translations and list fuzzy entries in po_tool pending
pending now attaches the closest earlier translation of a similar
English text (from obsolete or translated entries), so a reworded or
split string keeps its wording, and it lists fuzzy entries by default,
since users never see them. A fuzzy entry also carries its stale
translation as previous_translation.
* Fix wording of the non-boolean operands error
The logical operation error said "operators" where it means the
operands the operation was applied to.
* Translate the newly translatable strings in all languages
Regenerate the template after the translatability changes and fill every
new or changed entry in the 22 catalogs (about 12,800 entries): the
strings that became translatable, the plural forms, the entries split by
context, and the previously fuzzy singular entries that became plurals.
Every new entry is marked "# AI Translated", and about 360 also carry a
"# Needs human review" note saying what to check. Terms follow the
localization glossary. Earlier translations of reworded strings were
reused where the meaning was unchanged. Existing entries were not
changed, and obsolete entries are kept.
* Document the source translatability audit in the orca-translations skill
Add a reference describing how strings reach translators, what to look
for (untranslated text, spliced sentences, missing plurals, ambiguous
words), what not to translate, where a context cannot be carried, and
what to do after the edits, plus a scanner that lists untranslated
user-facing string literals.
* Document how to write translatable strings in AGENTS.md
Tell developers to keep each message complete in one msgid: use
placeholders instead of concatenating translated fragments, plural forms
for counts, and contexts for ambiguous words, and to list new source
files in localization/i18n/list.txt. Add a matching code review item.
* Translate the strings added since the rebase
Regenerate the template against the current main and translate the 26
new entries per language: the Fix Model commands and messages, and the
texture displacement image adjustment panel. Each new entry is marked
"# AI Translated"; existing entries are unchanged.
* tidy
722 lines
33 KiB
C++
722 lines
33 KiB
C++
#include <algorithm>
|
|
#include <string>
|
|
#include <wx/dialog.h>
|
|
#include <sstream>
|
|
#include <vector>
|
|
#include <utility>
|
|
#include "slic3r/GUI/RammingChart.hpp"
|
|
#include <wx/dcclient.h>
|
|
#include "slic3r/GUI/Widgets/StateColor.hpp"
|
|
#include <wx/colour.h>
|
|
#include "slic3r/GUI/Widgets/SpinInput.hpp"
|
|
#include <cstddef>
|
|
#include "libslic3r/PrintConfig.hpp"
|
|
#include "slic3r/GUI/Plater.hpp"
|
|
#include "libslic3r/FlushVolPredictor.hpp"
|
|
#include "libslic3r/Utils.hpp"
|
|
#include <boost/log/trivial.hpp>
|
|
#include <wx/display.h>
|
|
#include <wx/gdicmn.h>
|
|
#include <wx/event.h>
|
|
#include <wx/panel.h>
|
|
#include <wx/filename.h>
|
|
#include <wx/sizer.h>
|
|
#include <wx/string.h>
|
|
#include <wx/spinctrl.h>
|
|
#include <wx/toplevel.h>
|
|
#include <wx/webview.h>
|
|
#include "libslic3r/FlushVolCalc.hpp"
|
|
#include "WipeTowerDialog.hpp"
|
|
#include "GUI.hpp"
|
|
#include "I18N.hpp"
|
|
#include "GUI_App.hpp"
|
|
#include "MsgDialog.hpp"
|
|
#include "format.hpp"
|
|
#include "Widgets/StaticLine.hpp"
|
|
#include "Widgets/DialogButtons.hpp"
|
|
#include "libslic3r/Config.hpp"
|
|
#include "Widgets/Label.hpp"
|
|
#include "MainFrame.hpp"
|
|
#include "libslic3r/PresetBundle.hpp"
|
|
#include "libslic3r/Preset.hpp"
|
|
#include "DeviceCore/DevConfigUtil.h"
|
|
#include "DeviceCore/DevDefs.h"
|
|
#include <nlohmann/json.hpp>
|
|
#include "slic3r/GUI/Jobs/SendJob.hpp"
|
|
#include "slic3r/GUI/Widgets/WebViewHostDialog.hpp"
|
|
#include <boost/filesystem.hpp>
|
|
|
|
using json = nlohmann::json;
|
|
|
|
class wxWindow;
|
|
|
|
namespace fs = boost::filesystem;
|
|
|
|
using namespace Slic3r;
|
|
using namespace Slic3r::GUI;
|
|
|
|
int scale(const int val) { return val * Slic3r::GUI::wxGetApp().em_unit() / 10; }
|
|
|
|
static void update_ui(wxWindow* window)
|
|
{
|
|
Slic3r::GUI::wxGetApp().UpdateDarkUI(window);
|
|
}
|
|
|
|
RammingDialog::RammingDialog(wxWindow* parent,const std::string& parameters)
|
|
: wxDialog(parent, wxID_ANY, _(L("Ramming customization")), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE/* | wxRESIZE_BORDER*/)
|
|
{
|
|
SetBackgroundColour(*wxWHITE);
|
|
m_panel_ramming = new RammingPanel(this,parameters);
|
|
m_panel_ramming->Show(true);
|
|
|
|
auto main_sizer = new wxBoxSizer(wxVERTICAL);
|
|
main_sizer->Add(m_panel_ramming, 1, wxEXPAND | wxTOP | wxLEFT | wxRIGHT, 5);
|
|
auto dlg_btns = new DialogButtons(this, {"OK", "Cancel"});
|
|
main_sizer->Add(dlg_btns, 0, wxEXPAND);
|
|
SetSizer(main_sizer);
|
|
main_sizer->SetSizeHints(this);
|
|
|
|
this->Bind(wxEVT_CLOSE_WINDOW, [this](wxCloseEvent& e) { EndModal(wxCANCEL); });
|
|
|
|
this->Bind(wxEVT_BUTTON,[this](wxCommandEvent&) {
|
|
m_output_data = m_panel_ramming->get_parameters();
|
|
EndModal(wxID_OK);
|
|
},wxID_OK);
|
|
|
|
wxGetApp().UpdateDlgDarkUI(this);
|
|
this->Show();
|
|
|
|
Slic3r::GUI::MessageDialog dlg(this, _(L("Ramming denotes the rapid extrusion just before a tool change in a single-extruder MM printer. Its purpose is to "
|
|
"properly shape the end of the unloaded filament so it does not prevent insertion of the new filament and can itself "
|
|
"be reinserted later. This phase is important and different materials can require different extrusion speeds to get "
|
|
"the good shape. For this reason, the extrusion rates during ramming are adjustable.\n\nThis is an expert-level "
|
|
"setting, incorrect adjustment will likely lead to jams, extruder wheel grinding into filament etc.")), _(L("Warning")), wxOK | wxICON_EXCLAMATION);// .ShowModal();
|
|
dlg.ShowModal();
|
|
}
|
|
|
|
|
|
#ifdef _WIN32
|
|
#define style wxSP_ARROW_KEYS | wxBORDER_SIMPLE
|
|
#else
|
|
#define style wxSP_ARROW_KEYS
|
|
#endif
|
|
|
|
|
|
|
|
RammingPanel::RammingPanel(wxWindow* parent, const std::string& parameters)
|
|
: wxPanel(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize/*,wxPoint(50,50), wxSize(800,350),wxBORDER_RAISED*/)
|
|
{
|
|
SetBackgroundColour(*wxWHITE);
|
|
update_ui(this);
|
|
auto sizer_chart = new wxBoxSizer(wxVERTICAL);
|
|
auto sizer_param = new wxBoxSizer(wxVERTICAL);
|
|
|
|
std::stringstream stream{ parameters };
|
|
stream >> m_ramming_line_width_multiplicator >> m_ramming_step_multiplicator;
|
|
int ramming_speed_size = 0;
|
|
float dummy = 0.f;
|
|
while (stream >> dummy)
|
|
++ramming_speed_size;
|
|
stream.clear();
|
|
stream.get();
|
|
|
|
std::vector<std::pair<float, float>> buttons;
|
|
float x = 0.f;
|
|
float y = 0.f;
|
|
while (stream >> x >> y)
|
|
buttons.push_back(std::make_pair(x, y));
|
|
|
|
m_chart = new Chart(this, wxRect(scale(10),scale(10),scale(480),scale(360)), buttons, ramming_speed_size, 0.25f, scale(10));
|
|
update_ui(m_chart);
|
|
sizer_chart->Add(m_chart, 0, wxALL, 5);
|
|
|
|
// Create help text for constant flow rate dragging
|
|
std::string ctrl_str = GUI::shortkey_ctrl_prefix();
|
|
if (!ctrl_str.empty() && ctrl_str.back() == '+')
|
|
ctrl_str.pop_back(); // Remove trailing '+'
|
|
wxString message = format_wxstr(_L("For constant flow rate, hold %1% while dragging."), ctrl_str);
|
|
Label* label = new Label(this, wxEmptyString);
|
|
wxClientDC dc(label);
|
|
wxString multiline_message;
|
|
label->SetFont(Label::Body_14);
|
|
label->SetForegroundColour(StateColor::darkModeColorFor(wxColour("#363636")));
|
|
label->split_lines(dc, scale(470), message, multiline_message);
|
|
label->SetLabel(multiline_message);
|
|
sizer_chart->Add(label, 0, wxEXPAND | wxALL, 5);
|
|
|
|
m_widget_time = new SpinInput(this, wxEmptyString, _L("ms"), wxDefaultPosition, wxSize(scale(120), -1), wxSP_ARROW_KEYS, 0 , 5000 , 3000, 250);
|
|
m_widget_volume = new SpinInput(this, wxEmptyString, _L("mm³"), wxDefaultPosition, wxSize(scale(120), -1), wxSP_ARROW_KEYS, 0 , 10000, 0 );
|
|
m_widget_ramming_line_width_multiplicator = new SpinInput(this, wxEmptyString, "%" , wxDefaultPosition, wxSize(scale(120), -1), wxSP_ARROW_KEYS, 10, 300 , 100 );
|
|
m_widget_ramming_step_multiplicator = new SpinInput(this, wxEmptyString, "%" , wxDefaultPosition, wxSize(scale(120), -1), wxSP_ARROW_KEYS, 10, 300 , 100 );
|
|
|
|
auto add_title = [this, sizer_param](wxString label){
|
|
auto title = new StaticLine(this, 0, label);
|
|
title->SetFont(Label::Head_14);
|
|
title->SetForegroundColour(StateColor::darkModeColorFor(wxColour("#363636")));
|
|
sizer_param->Add(title, 0, wxEXPAND | wxBOTTOM, scale(8));
|
|
};
|
|
|
|
SetFont(Label::Body_14);
|
|
wxSize col_size;
|
|
for(auto label : {"Time", "Volume", "Width", "Spacing"})
|
|
col_size.IncTo(GetTextExtent(_L(label)));
|
|
col_size = wxSize(col_size.x + scale(30) ,-1);
|
|
|
|
auto add_spin = [this, sizer_param, col_size](wxString label, SpinInput* spin){
|
|
spin->Bind(wxEVT_KILL_FOCUS, [this](auto &e) {
|
|
e.SetId(GetId());
|
|
ProcessEventLocally(e);
|
|
e.Skip();
|
|
});
|
|
auto h_sizer = new wxBoxSizer(wxHORIZONTAL);
|
|
auto text = new wxStaticText(this, wxID_ANY, label, wxDefaultPosition, col_size);
|
|
text->SetForegroundColour(StateColor::darkModeColorFor(wxColour("#363636")));
|
|
h_sizer->Add(text, 0, wxALIGN_CENTER_VERTICAL);
|
|
h_sizer->Add(spin);
|
|
sizer_param->Add(h_sizer, 0, wxEXPAND | wxBOTTOM, scale(2));
|
|
};
|
|
|
|
add_title(_L("Total ramming"));
|
|
add_spin( _L("Time") , m_widget_time );
|
|
add_spin( _L("Volume"), m_widget_volume);
|
|
|
|
sizer_param->AddSpacer(10);
|
|
|
|
add_title(_L("Ramming line"));
|
|
add_spin( _L("Width") , m_widget_ramming_line_width_multiplicator);
|
|
add_spin( _L("Spacing"), m_widget_ramming_step_multiplicator );
|
|
|
|
m_widget_time->SetValue(int(m_chart->get_time() * 1000));
|
|
m_widget_volume->SetValue(m_chart->get_volume());
|
|
m_widget_volume->Disable();
|
|
m_widget_ramming_line_width_multiplicator->SetValue(m_ramming_line_width_multiplicator);
|
|
m_widget_ramming_step_multiplicator->SetValue(m_ramming_step_multiplicator);
|
|
|
|
m_widget_ramming_step_multiplicator->Bind(wxEVT_SPINCTRL,[this](wxCommandEvent&) { line_parameters_changed(); });
|
|
m_widget_ramming_line_width_multiplicator->Bind(wxEVT_SPINCTRL,[this](wxCommandEvent&) { line_parameters_changed(); });
|
|
|
|
auto sizer = new wxBoxSizer(wxHORIZONTAL);
|
|
sizer->Add(sizer_chart, 0, wxALL, 5);
|
|
sizer->Add(sizer_param, 0, wxALL, 10);
|
|
|
|
sizer->SetSizeHints(this);
|
|
SetSizer(sizer);
|
|
|
|
m_widget_time->Bind(wxEVT_SPINCTRL,[this](wxCommandEvent&) {
|
|
m_chart->set_xy_range(m_widget_time->GetValue() * 0.001,-1);
|
|
});
|
|
m_widget_time->Bind(wxEVT_CHAR,[](wxKeyEvent&){}); // do nothing - prevents the user to change the value
|
|
m_widget_volume->Bind(wxEVT_CHAR,[](wxKeyEvent&){}); // do nothing - prevents the user to change the value
|
|
Bind(EVT_WIPE_TOWER_CHART_CHANGED,[this](wxCommandEvent&) {
|
|
m_widget_volume->SetValue(m_chart->get_volume());
|
|
m_widget_time->SetValue(m_chart->get_time() * 1000);
|
|
});
|
|
Refresh(true); // erase background
|
|
}
|
|
|
|
void RammingPanel::line_parameters_changed() {
|
|
m_ramming_line_width_multiplicator = m_widget_ramming_line_width_multiplicator->GetValue();
|
|
m_ramming_step_multiplicator = m_widget_ramming_step_multiplicator->GetValue();
|
|
}
|
|
|
|
std::string RammingPanel::get_parameters()
|
|
{
|
|
std::vector<float> speeds = m_chart->get_ramming_speed(0.25f);
|
|
std::vector<std::pair<float,float>> buttons = m_chart->get_buttons();
|
|
std::stringstream stream;
|
|
stream << m_ramming_line_width_multiplicator << " " << m_ramming_step_multiplicator;
|
|
for (const float& speed_value : speeds)
|
|
stream << " " << speed_value;
|
|
stream << "|";
|
|
for (const auto& button : buttons)
|
|
stream << " " << button.first << " " << button.second;
|
|
return stream.str();
|
|
}
|
|
|
|
static const float g_min_flush_multiplier = 0.f;
|
|
static const float g_max_flush_multiplier = 3.f;
|
|
|
|
bool is_flush_config_modified()
|
|
{
|
|
const auto &project_config = wxGetApp().preset_bundle->project_config;
|
|
const std::vector<double> &config_matrix = (project_config.option<ConfigOptionFloats>("flush_volumes_matrix"))->values;
|
|
const std::vector<double> &config_multiplier = (project_config.option<ConfigOptionFloats>("flush_multiplier"))->values;
|
|
// The config matrix is N x N per nozzle over every slot, while CalcFlushingVolumes is p x p
|
|
// over the physical slots (mixed slots never flush): map each default cell to its config index.
|
|
const auto physical_indices = wxGetApp().preset_bundle->physical_filament_config_indices();
|
|
const size_t full_n = project_config.option<ConfigOptionStrings>("filament_colour")->values.size();
|
|
|
|
bool has_modify = false;
|
|
for (int i = 0; i < config_multiplier.size(); i++) {
|
|
if (config_multiplier[i] != 1) {
|
|
has_modify = true;
|
|
break;
|
|
}
|
|
std::vector<std::vector<double>> default_matrix = WipingDialog::CalcFlushingVolumes(i);
|
|
size_t p_len = default_matrix.size();
|
|
size_t nozzle_offset = i * full_n * full_n;
|
|
for (size_t m = 0; m < p_len; m++) {
|
|
for (size_t n = 0; n < p_len; n++) {
|
|
size_t cfg_idx = nozzle_offset + physical_indices[m] * full_n + physical_indices[n];
|
|
if (cfg_idx < config_matrix.size() && config_matrix[cfg_idx] != default_matrix[m][n] * config_multiplier[i]) {
|
|
has_modify = true;
|
|
break;
|
|
}
|
|
}
|
|
if (has_modify) break;
|
|
}
|
|
if (has_modify) break;
|
|
}
|
|
return has_modify;
|
|
}
|
|
|
|
void open_flushing_dialog(wxEvtHandler *parent, const wxEvent &event)
|
|
{
|
|
auto &project_config = wxGetApp().preset_bundle->project_config;
|
|
|
|
WipingDialog dlg(static_cast<wxWindow *>(wxGetApp().mainframe));
|
|
dlg.ShowModal();
|
|
if (dlg.GetSubmitFlag()) {
|
|
auto matrix = dlg.GetFlattenMatrix();
|
|
auto flush_multipliers = dlg.GetMultipliers();
|
|
(project_config.option<ConfigOptionFloats>("flush_volumes_matrix"))->values = std::vector<double>(matrix.begin(), matrix.end());
|
|
(project_config.option<ConfigOptionFloats>("flush_multiplier"))->values = std::vector<double>(flush_multipliers.begin(), flush_multipliers.end());
|
|
bool flushing_volume_modify = is_flush_config_modified();
|
|
wxGetApp().sidebar().set_flushing_volume_warning(flushing_volume_modify);
|
|
wxGetApp().preset_bundle->export_selections(*wxGetApp().app_config);
|
|
wxGetApp().plater()->update_project_dirty_from_presets();
|
|
wxPostEvent(parent, event);
|
|
}
|
|
}
|
|
|
|
static std::vector<float> MatrixFlatten(const WipingDialog::VolumeMatrix& matrix) {
|
|
std::vector<float> vec;
|
|
for (auto row_elems : matrix) {
|
|
for (auto elem : row_elems)
|
|
vec.emplace_back(elem);
|
|
}
|
|
return vec;
|
|
}
|
|
|
|
// Mixed-color slots are virtual and have no flushing volumes, so the dialog shows only the
|
|
// physical filaments. That means converting between the full config matrix (indexed by config
|
|
// slot) and a dense physical sub-matrix (indexed by row/column in the table).
|
|
static std::vector<double> extract_physical_sub_matrix(
|
|
const std::vector<double>& full_matrix, size_t full_n,
|
|
const std::vector<size_t>& indices)
|
|
{
|
|
size_t p = indices.size();
|
|
std::vector<double> sub(p * p, 0.0);
|
|
if (full_matrix.size() < full_n * full_n)
|
|
return sub;
|
|
for (size_t pi = 0; pi < p; ++pi)
|
|
for (size_t pj = 0; pj < p; ++pj)
|
|
sub[pi * p + pj] = full_matrix[indices[pi] * full_n + indices[pj]];
|
|
return sub;
|
|
}
|
|
|
|
// Write the edited physical sub-matrix back into a copy of the full matrix, leaving the
|
|
// entries that belong to mixed slots untouched.
|
|
static std::vector<double> expand_physical_to_full_matrix(
|
|
const std::vector<double>& sub_matrix,
|
|
const std::vector<size_t>& indices, size_t full_n,
|
|
const std::vector<double>& original_matrix)
|
|
{
|
|
std::vector<double> full = original_matrix;
|
|
if (full.size() < full_n * full_n)
|
|
return full;
|
|
size_t p = indices.size();
|
|
for (size_t pi = 0; pi < p; ++pi)
|
|
for (size_t pj = 0; pj < p; ++pj)
|
|
full[indices[pi] * full_n + indices[pj]] = sub_matrix[pi * p + pj];
|
|
return full;
|
|
}
|
|
|
|
wxString WipingDialog::BuildTableObjStr()
|
|
{
|
|
auto full_config = wxGetApp().preset_bundle->full_config();
|
|
auto filament_colors = full_config.option<ConfigOptionStrings>("filament_colour")->values;
|
|
auto flush_multiplier = full_config.option<ConfigOptionFloats>("flush_multiplier")->values;
|
|
int nozzle_num = full_config.option<ConfigOptionFloats>("nozzle_diameter")->values.size();
|
|
auto raw_matrix_data = full_config.option<ConfigOptionFloats>("flush_volumes_matrix")->values;
|
|
auto nozzle_flush_dataset = full_config.option<ConfigOptionIntsNullable>("nozzle_flush_dataset")->values;
|
|
|
|
// Restrict the table to physical filaments; mixed slots have no flushing volumes.
|
|
m_physical_indices = wxGetApp().preset_bundle->physical_filament_config_indices();
|
|
const size_t full_n = filament_colors.size();
|
|
{
|
|
std::vector<std::string> physical_colors;
|
|
physical_colors.reserve(m_physical_indices.size());
|
|
for (size_t i : m_physical_indices)
|
|
if (i < filament_colors.size())
|
|
physical_colors.push_back(filament_colors[i]);
|
|
filament_colors = std::move(physical_colors);
|
|
}
|
|
|
|
std::vector<std::vector<double>> flush_matrixs;
|
|
for (int idx = 0; idx < nozzle_num; ++idx) {
|
|
auto fm = get_flush_volumes_matrix(raw_matrix_data, idx, nozzle_num);
|
|
flush_matrixs.emplace_back(extract_physical_sub_matrix(fm, full_n, m_physical_indices));
|
|
}
|
|
flush_multiplier.resize(nozzle_num, 1);
|
|
|
|
std::vector<std::vector<float>> default_matrixs;
|
|
for (int idx = 0; idx < nozzle_num; ++idx) {
|
|
default_matrixs.emplace_back(MatrixFlatten(CalcFlushingVolumes(idx)));
|
|
}
|
|
|
|
m_raw_matrixs = flush_matrixs;
|
|
m_flush_multipliers = flush_multiplier;
|
|
|
|
json obj;
|
|
obj["flush_multiplier"] = flush_multiplier;
|
|
obj["extruder_num"] = nozzle_num;
|
|
obj["filament_colors"] = filament_colors;
|
|
obj["flush_volume_matrixs"] = json::array();
|
|
obj["min_flush_volumes"] = json::array();
|
|
obj["max_flush_volumes"] = json::array();
|
|
obj["min_flush_multiplier"] = g_min_flush_multiplier;
|
|
obj["max_flush_multiplier"] = g_max_flush_multiplier;
|
|
obj["is_dark_mode"] = wxGetApp().dark_mode();
|
|
obj["default_matrixs"] = json::array();
|
|
|
|
for (const auto& vec : flush_matrixs) {
|
|
obj["flush_volume_matrixs"].push_back(vec);
|
|
}
|
|
for (const auto &vec : default_matrixs) {
|
|
obj["default_matrixs"].push_back(vec);
|
|
}
|
|
|
|
for (int idx = 0; idx < nozzle_num; ++idx) {
|
|
const std::vector<int> &min_flush_volumes = get_min_flush_volumes(full_config, idx);
|
|
int min_flush_from_nozzle_volume = *min_element(min_flush_volumes.begin(), min_flush_volumes.end());
|
|
GenericFlushPredictor pd(nozzle_flush_dataset[idx]);
|
|
int min_flush_from_flush_data = pd.get_min_flush_volume();
|
|
obj["min_flush_volumes"].push_back(std::min(min_flush_from_flush_data,min_flush_from_nozzle_volume));
|
|
obj["max_flush_volumes"].push_back(m_max_flush_volume);
|
|
}
|
|
|
|
auto obj_str = obj.dump();
|
|
return obj_str;
|
|
}
|
|
|
|
wxString WipingDialog::BuildTextObjStr(bool multi_language)
|
|
{
|
|
wxString auto_flush_tip;
|
|
wxString volume_desp_panel;
|
|
wxString volume_range_panel;
|
|
wxString multiplier_range_panel;
|
|
wxString calc_btn_panel;
|
|
wxString extruder_label_0;
|
|
wxString extruder_label_1;
|
|
wxString multiplier_label;
|
|
wxString ok_btn_label;
|
|
wxString cancel_btn_label;
|
|
|
|
const std::string pt = wxGetApp().preset_bundle->printers.get_edited_preset().get_printer_type(wxGetApp().preset_bundle);
|
|
const std::string extruder_name_0 = DevPrinterConfigUtil::get_toolhead_display_name(pt, DEPUTY_EXTRUDER_ID, ToolHeadComponent::Extruder, ToolHeadNameCase::SentenceCase);
|
|
const std::string extruder_name_1 = DevPrinterConfigUtil::get_toolhead_display_name(pt, MAIN_EXTRUDER_ID, ToolHeadComponent::Extruder, ToolHeadNameCase::SentenceCase);
|
|
|
|
if (multi_language) {
|
|
auto_flush_tip = _L("Orca would re-calculate your flushing volumes everytime the filaments color changed or filaments changed. You could disable the auto-calculate in Orca Slicer > Preferences");
|
|
volume_desp_panel = _L("Flushing volume (mm³) for each filament pair.");
|
|
volume_range_panel = wxString::Format(_L("Suggestion: Flushing Volume in range [%d, %d]"), 0, 700);
|
|
multiplier_range_panel = wxString::Format(_L("The multiplier should be in range [%.2f, %.2f]."), 0., 3.);
|
|
calc_btn_panel = _L("Re-calculate");
|
|
extruder_label_0 = _L(extruder_name_0);
|
|
extruder_label_1 = _L(extruder_name_1);
|
|
multiplier_label = _L("Multiplier");
|
|
ok_btn_label = _L("OK");
|
|
cancel_btn_label = _L("Cancel");
|
|
} else {
|
|
auto_flush_tip = "Orca would re-calculate your flushing volumes everytime the filaments color changed or filaments changed. You could disable the auto-calculate in Orca Slicer > Preferences";
|
|
volume_desp_panel = wxString::FromUTF8("Flushing volume (mm³) for each filament pair.");
|
|
volume_range_panel = wxString::Format("Suggestion: Flushing Volume in range [%d, %d]", 0, 700);
|
|
multiplier_range_panel = wxString::Format("The multiplier should be in range [%.2f, %.2f].", 0., 3.);
|
|
calc_btn_panel = "Re-calculate";
|
|
extruder_label_0 = wxString::FromUTF8(extruder_name_0);
|
|
extruder_label_1 = wxString::FromUTF8(extruder_name_1);
|
|
multiplier_label = "Multiplier";
|
|
ok_btn_label = "OK";
|
|
cancel_btn_label = "Cancel";
|
|
}
|
|
|
|
wxString text_obj = "{";
|
|
text_obj += wxString::Format("\"volume_desp_panel\":\"%s\",", volume_desp_panel);
|
|
text_obj += wxString::Format("\"volume_range_panel\":\"%s\",", volume_range_panel);
|
|
text_obj += wxString::Format("\"multiplier_range_panel\":\"%s\",", multiplier_range_panel);
|
|
text_obj += wxString::Format("\"calc_btn_panel\":\"%s\",", calc_btn_panel);
|
|
text_obj += wxString::Format("\"extruder_label_0\":\"%s\",", extruder_label_0);
|
|
text_obj += wxString::Format("\"extruder_label_1\":\"%s\",", extruder_label_1);
|
|
text_obj += wxString::Format("\"multiplier_label\":\"%s\",", multiplier_label);
|
|
text_obj += wxString::Format("\"ok_btn_label\":\"%s\",", ok_btn_label);
|
|
text_obj += wxString::Format("\"cancel_btn_label\":\"%s\",", cancel_btn_label);
|
|
text_obj += wxString::Format("\"auto_flush_tip\":\"%s\"", auto_flush_tip);
|
|
text_obj += "}";
|
|
return text_obj;
|
|
}
|
|
|
|
WipingDialog::WipingDialog(wxWindow* parent, const int max_flush_volume) :
|
|
wxDialog(parent, wxID_ANY, _(L("Flushing volumes for filament change")),
|
|
wxDefaultPosition, wxDefaultSize,
|
|
wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER ),
|
|
m_max_flush_volume(max_flush_volume)
|
|
{
|
|
wxBoxSizer* main_sizer = new wxBoxSizer(wxVERTICAL);
|
|
this->SetSizer(main_sizer);
|
|
this->SetBackgroundColour(*wxWHITE);
|
|
auto filament_count = wxGetApp().preset_bundle->physical_filament_config_indices().size();
|
|
|
|
// Estimate table scroll area size based on filament count
|
|
// Each table cell is ~60x25 DIP, plus headers and borders
|
|
wxSize max_scroll_size = { FromDIP(1000), FromDIP(500) };
|
|
wxSize table_size = { (int)(filament_count + 1) * FromDIP(60), (int)(filament_count + 1) * FromDIP(25) + FromDIP(2) };
|
|
wxSize scroll_size = { std::min(max_scroll_size.x, table_size.x), std::min(max_scroll_size.y, table_size.y) };
|
|
|
|
// Fixed overhead: padding (~30), tip panel (~70), controls row (~50),
|
|
// description/multiplier section (~130), button row (~45) = ~325 DIP
|
|
wxSize fixed_overhead = { FromDIP(100), FromDIP(325) };
|
|
wxSize applied_size = scroll_size + fixed_overhead;
|
|
|
|
// Clamp to screen size (leave some margin for window decorations)
|
|
wxSize scaled_screen_size = wxGetDisplaySize();
|
|
double scale_factor = wxDisplay().GetScaleFactor();
|
|
scaled_screen_size = { (int)(scaled_screen_size.x / scale_factor), (int)(scaled_screen_size.y / scale_factor) };
|
|
wxSize screen_margin = { FromDIP(40), FromDIP(60) };
|
|
scaled_screen_size -= screen_margin;
|
|
|
|
applied_size = { std::min(applied_size.x, scaled_screen_size.x), std::min(applied_size.y, scaled_screen_size.y) };
|
|
|
|
// Ensure a reasonable minimum size so the dialog is usable even when clamped
|
|
applied_size.x = std::max(applied_size.x, FromDIP(350));
|
|
applied_size.y = std::max(applied_size.y, FromDIP(450));
|
|
m_webview = wxWebView::New(this, wxID_ANY,
|
|
wxEmptyString,
|
|
wxDefaultPosition,
|
|
applied_size,
|
|
wxWebViewBackendDefault,
|
|
wxNO_BORDER);
|
|
|
|
m_webview->AddScriptMessageHandler("wipingDialog");
|
|
// The page's strings (resources/web/flush/WipingDialog.html), keyed by their T() ids.
|
|
const nlohmann::json page_strings = {
|
|
// TRN Corner header of the flushing volume table: rows are the filament flushed from, columns the filament changed to.
|
|
{"from_to", _u8L("from/to")},
|
|
};
|
|
m_webview->AddUserScript(wxString::FromUTF8(WebViewHostDialog::localized_strings_script(page_strings)));
|
|
main_sizer->Add(m_webview, 1, wxEXPAND);
|
|
|
|
fs::path filepath = fs::path(resources_dir()) / "web/flush/WipingDialog.html";
|
|
wxString filepath_str = from_path(filepath);
|
|
wxFileName fn(filepath_str);
|
|
if(fn.FileExists()) {
|
|
wxString url = file_url_from_path(filepath);
|
|
BOOST_LOG_TRIVIAL(debug) << __FUNCTION__<< "File exists and load url " << url.ToStdString();
|
|
m_webview->LoadURL(url);
|
|
BOOST_LOG_TRIVIAL(debug) << __FUNCTION__<< "Successfully loaded url: " << url.ToStdString();
|
|
} else {
|
|
BOOST_LOG_TRIVIAL(error) << __FUNCTION__<< "WipingDialog.html not exist at path: " << filepath.string();
|
|
}
|
|
|
|
main_sizer->SetSizeHints(this);
|
|
main_sizer->Fit(this);
|
|
CenterOnParent();
|
|
wxGetApp().UpdateDlgDarkUI(this);
|
|
|
|
//m_webview->Bind(wxEVT_WEBVIEW_NAVIGATED, [this](auto& evt) {
|
|
// auto table_obj_str = BuildTableObjStr();
|
|
// auto text_obj_str = BuildTextObjStr();
|
|
// CallAfter([table_obj_str, text_obj_str, this] {
|
|
// wxString script = wxString::Format("buildTable(%s);buildText(%s)", table_obj_str, text_obj_str);
|
|
// m_webview->RunScript(script);
|
|
// });
|
|
// });
|
|
|
|
m_webview->Bind(wxEVT_WEBVIEW_SCRIPT_MESSAGE_RECEIVED, [this](wxWebViewEvent& evt) {
|
|
std::string message = evt.GetString().ToStdString();
|
|
BOOST_LOG_TRIVIAL(debug) << __FUNCTION__<< "Received message: " << message;
|
|
try {
|
|
json j = json::parse(message);
|
|
if (j["msg"].get<std::string>() == "init") {
|
|
auto table_obj_str = BuildTableObjStr();
|
|
auto text_obj_str = BuildTextObjStr(true);
|
|
CallAfter([table_obj_str, text_obj_str, this] {
|
|
wxString script1 = wxString::Format("buildTable(%s)", table_obj_str);
|
|
m_webview->RunScript(script1);
|
|
wxString script2 = wxString::Format("buildText(%s)", text_obj_str);
|
|
bool result = m_webview->RunScript(script2);
|
|
if (!result) {
|
|
BOOST_LOG_TRIVIAL(error) << __FUNCTION__<< "Failed to run buildText, retry without multi language";
|
|
wxString script3 = wxString::Format("buildText(%s)", BuildTextObjStr(false));
|
|
m_webview->RunScript(script3);
|
|
}
|
|
});
|
|
}
|
|
else if (j["msg"].get<std::string>() == "updateMatrix") {
|
|
int extruder_id = j["extruder_id"].get<int>();
|
|
auto new_matrix = CalcFlushingVolumes(extruder_id);
|
|
json obj;
|
|
obj["flush_volume_matrix"] = MatrixFlatten(new_matrix);
|
|
obj["extruder_id"] = extruder_id;
|
|
CallAfter([obj, this] {
|
|
std::string flush_volume_matrix_str = obj["flush_volume_matrix"].dump();
|
|
std::string extruder_id_str = std::to_string(obj["extruder_id"].get<int>());
|
|
wxString script = wxString::Format("updateTable(%s,%s)", flush_volume_matrix_str, extruder_id_str);
|
|
m_webview->RunScript(script);
|
|
});
|
|
}
|
|
else if (j["msg"].get<std::string>() == "storeData") {
|
|
int extruder_num = j["number_of_extruders"].get<int>();
|
|
std::vector<std::vector<double>> store_matrixs;
|
|
for (auto iter = j["raw_matrix"].begin(); iter != j["raw_matrix"].end(); ++iter) {
|
|
store_matrixs.emplace_back((*iter).get<std::vector<double>>());
|
|
}
|
|
std::vector<double>store_multipliers = j["flush_multiplier"].get<std::vector<double>>();
|
|
{// limit all matrix value before write to gcode, the limitation is depends on the multipliers
|
|
size_t cols_temp_matrix = 0;
|
|
if (!store_matrixs.empty()) { cols_temp_matrix = store_matrixs[0].size(); }
|
|
if (store_multipliers.size() == store_matrixs.size() && cols_temp_matrix>0) // nuzzles==nuzzles
|
|
{
|
|
for (size_t idx = 0; idx < store_multipliers.size(); ++idx) {
|
|
double m_max_flush_volume_t = (double)m_max_flush_volume, m_store_multipliers=store_multipliers[idx];
|
|
std::transform(store_matrixs[idx].begin(), store_matrixs[idx].end(),
|
|
store_matrixs[idx].begin(),
|
|
[m_max_flush_volume_t, m_store_multipliers](double inputx) {
|
|
return std::clamp(inputx, 0.0, m_max_flush_volume_t / m_store_multipliers);
|
|
});
|
|
}
|
|
}
|
|
}
|
|
this->StoreFlushData(extruder_num, store_matrixs, store_multipliers);
|
|
m_submit_flag = true;
|
|
this->Close();
|
|
}
|
|
else if (j["msg"].get<std::string>() == "quit") {
|
|
this->Close();
|
|
}
|
|
}
|
|
catch (...) {
|
|
BOOST_LOG_TRIVIAL(error) << __FUNCTION__<< "Failed to parse json message: " << message;
|
|
}
|
|
});
|
|
|
|
m_webview->Bind(wxEVT_CHAR_HOOK, [this](wxKeyEvent& e) {
|
|
if (e.GetKeyCode() == WXK_ESCAPE) {
|
|
if (IsModal()) EndModal(wxID_CANCEL);
|
|
else Close();
|
|
return;
|
|
}
|
|
e.Skip();
|
|
});
|
|
}
|
|
|
|
|
|
int WipingDialog::CalcFlushingVolume(const wxColour& from, const wxColour& to, int min_flush_volume , int nozzle_flush_dataset)
|
|
{
|
|
Slic3r::FlushVolCalculator calculator(min_flush_volume, Slic3r::g_max_flush_volume, nozzle_flush_dataset);
|
|
return calculator.calc_flush_vol(from.Alpha(), from.Red(), from.Green(), from.Blue(), to.Alpha(), to.Red(), to.Green(), to.Blue());
|
|
}
|
|
|
|
WipingDialog::VolumeMatrix WipingDialog::CalcFlushingVolumes(int extruder_id)
|
|
{
|
|
auto& preset_bundle = wxGetApp().preset_bundle;
|
|
auto full_config = preset_bundle->full_config();
|
|
auto& ams_multi_color_filament = preset_bundle->ams_multi_color_filment;
|
|
// Mixed-colour slots are virtual and never flushed: compute a p x p matrix over the physical
|
|
// slots only, laid out like the table; row/column k belongs to config slot physical_indices[k].
|
|
auto physical_indices = preset_bundle->physical_filament_config_indices();
|
|
|
|
std::vector<std::string> all_color_strs = full_config.option<ConfigOptionStrings>("filament_colour")->values;
|
|
int flush_dataset_value = full_config.option<ConfigOptionIntsNullable>("nozzle_flush_dataset")->values[extruder_id];
|
|
const std::vector<int> min_flush_volumes = get_min_flush_volumes(full_config, extruder_id);
|
|
|
|
// Support for multi-color filament
|
|
std::vector<std::vector<wxColour>> multi_colors;
|
|
for (size_t cfg_idx : physical_indices) {
|
|
std::vector<wxColour> single_filament;
|
|
if (cfg_idx < ams_multi_color_filament.size() && !ams_multi_color_filament[cfg_idx].empty()) {
|
|
for (const auto& c : ams_multi_color_filament[cfg_idx])
|
|
single_filament.push_back(wxColour(c));
|
|
} else if (cfg_idx < all_color_strs.size()) {
|
|
single_filament.push_back(wxColour(all_color_strs[cfg_idx]));
|
|
}
|
|
multi_colors.push_back(single_filament);
|
|
}
|
|
|
|
VolumeMatrix matrix;
|
|
for (size_t pi = 0; pi < physical_indices.size(); ++pi) {
|
|
int from_cfg = (int)physical_indices[pi];
|
|
bool is_from_support = is_support_filament(from_cfg);
|
|
matrix.emplace_back();
|
|
for (size_t pj = 0; pj < physical_indices.size(); ++pj) {
|
|
int to_cfg = (int)physical_indices[pj];
|
|
if (from_cfg == to_cfg) {
|
|
matrix.back().emplace_back(0);
|
|
continue;
|
|
}
|
|
|
|
bool is_to_support = is_support_filament(to_cfg);
|
|
int flushing_volume = 0;
|
|
if (is_to_support) {
|
|
flushing_volume = Slic3r::g_flush_volume_to_support;
|
|
}
|
|
else {
|
|
int min_flush_from = (from_cfg < (int)min_flush_volumes.size()) ? min_flush_volumes[from_cfg] : 0;
|
|
for (size_t i = 0; i < multi_colors[pi].size(); ++i) {
|
|
const wxColour& from = multi_colors[pi][i];
|
|
for (size_t j = 0; j < multi_colors[pj].size(); ++j) {
|
|
const wxColour& to = multi_colors[pj][j];
|
|
int volume = CalcFlushingVolume(from, to, min_flush_from, flush_dataset_value);
|
|
flushing_volume = std::max(flushing_volume, volume);
|
|
}
|
|
}
|
|
|
|
if (is_from_support) {
|
|
flushing_volume = std::max(Slic3r::g_min_flush_volume_from_support, flushing_volume);
|
|
}
|
|
}
|
|
matrix.back().emplace_back(flushing_volume);
|
|
}
|
|
}
|
|
return matrix;
|
|
}
|
|
|
|
void WipingDialog::StoreFlushData(int extruder_num, const std::vector<std::vector<double>>& flush_volume_vecs, const std::vector<double>&flush_multipliers)
|
|
{
|
|
m_flush_multipliers = flush_multipliers;
|
|
m_raw_matrixs = flush_volume_vecs;
|
|
}
|
|
|
|
// The table edits a physical-only sub-matrix; GetFlattenMatrix has to hand back a full-size
|
|
// matrix so the config layout stays indexed by config slot. Mixed-slot entries keep whatever
|
|
// the config already held.
|
|
std::vector<double> WipingDialog::ExpandToFullMatrix(const std::vector<double>& sub_matrix, int nozzle_idx) const
|
|
{
|
|
const auto& project_config = wxGetApp().preset_bundle->project_config;
|
|
const size_t full_n = project_config.option<ConfigOptionStrings>("filament_colour")->values.size();
|
|
if (m_physical_indices.size() == full_n)
|
|
return sub_matrix; // no mixed slots: sub-matrix already is the full matrix
|
|
|
|
auto raw = project_config.option<ConfigOptionFloats>("flush_volumes_matrix")->values;
|
|
int nozzle_num = (int)wxGetApp().preset_bundle->project_config.option<ConfigOptionFloats>("flush_multiplier")->values.size();
|
|
if (nozzle_num < 1) nozzle_num = 1;
|
|
auto original = get_flush_volumes_matrix(raw, nozzle_idx, nozzle_num);
|
|
return expand_physical_to_full_matrix(sub_matrix, m_physical_indices, full_n, original);
|
|
}
|
|
|
|
std::vector<double> WipingDialog::GetFlattenMatrix()const
|
|
{
|
|
std::vector<double> ret;
|
|
for (size_t idx = 0; idx < m_raw_matrixs.size(); ++idx) {
|
|
auto full = ExpandToFullMatrix(m_raw_matrixs[idx], (int)idx);
|
|
ret.insert(ret.end(), full.begin(), full.end());
|
|
}
|
|
return ret;
|
|
}
|
|
|
|
|
|
std::vector<double> WipingDialog::GetMultipliers()const
|
|
{
|
|
return m_flush_multipliers;
|
|
}
|