From 07d6fd8f7ec84d1077752f676827aa774224d1f8 Mon Sep 17 00:00:00 2001 From: foxox Date: Mon, 2 Dec 2019 22:48:01 -0500 Subject: [PATCH] Platter->Plater --- src/libslic3r/Model.cpp | 2 +- src/libslic3r/Model.hpp | 2 +- src/slic3r/GUI/BackgroundSlicingProcess.hpp | 8 +++--- src/slic3r/GUI/Gizmos/GLGizmosManager.cpp | 2 +- src/slic3r/GUI/MainFrame.cpp | 4 +-- src/slic3r/GUI/MainFrame.hpp | 2 +- src/slic3r/GUI/Plater.cpp | 28 ++++++++++----------- src/slic3r/GUI/Preset.cpp | 2 +- src/slic3r/GUI/Preset.hpp | 4 +-- src/slic3r/GUI/PresetBundle.cpp | 2 +- src/slic3r/GUI/PresetBundle.hpp | 4 +-- src/slic3r/GUI/Tab.cpp | 6 ++--- src/slic3r/GUI/Tab.hpp | 2 +- 13 files changed, 34 insertions(+), 34 deletions(-) diff --git a/src/libslic3r/Model.cpp b/src/libslic3r/Model.cpp index 8699eed7f..d5a40e79f 100644 --- a/src/libslic3r/Model.cpp +++ b/src/libslic3r/Model.cpp @@ -843,7 +843,7 @@ TriangleMesh ModelObject::mesh() const } // Non-transformed (non-rotated, non-scaled, non-translated) sum of non-modifier object volumes. -// Currently used by ModelObject::mesh(), to calculate the 2D envelope for 2D platter +// Currently used by ModelObject::mesh(), to calculate the 2D envelope for 2D plater // and to display the object statistics at ModelObject::print_info(). TriangleMesh ModelObject::raw_mesh() const { diff --git a/src/libslic3r/Model.hpp b/src/libslic3r/Model.hpp index d7c813113..fa5d8f155 100644 --- a/src/libslic3r/Model.hpp +++ b/src/libslic3r/Model.hpp @@ -236,7 +236,7 @@ public: // A mesh containing all transformed instances of this object. TriangleMesh mesh() const; // Non-transformed (non-rotated, non-scaled, non-translated) sum of non-modifier object volumes. - // Currently used by ModelObject::mesh() and to calculate the 2D envelope for 2D platter. + // Currently used by ModelObject::mesh() and to calculate the 2D envelope for 2D plater. TriangleMesh raw_mesh() const; // Non-transformed (non-rotated, non-scaled, non-translated) sum of all object volumes. TriangleMesh full_raw_mesh() const; diff --git a/src/slic3r/GUI/BackgroundSlicingProcess.hpp b/src/slic3r/GUI/BackgroundSlicingProcess.hpp index 984686e35..c8ece38f0 100644 --- a/src/slic3r/GUI/BackgroundSlicingProcess.hpp +++ b/src/slic3r/GUI/BackgroundSlicingProcess.hpp @@ -53,11 +53,11 @@ public: void set_thumbnail_cb(ThumbnailsGeneratorCallback cb) { m_thumbnail_cb = cb; } #endif // ENABLE_THUMBNAIL_GENERATOR - // The following wxCommandEvent will be sent to the UI thread / Platter window, when the slicing is finished + // The following wxCommandEvent will be sent to the UI thread / Plater window, when the slicing is finished // and the background processing will transition into G-code export. // The wxCommandEvent is sent to the UI thread asynchronously without waiting for the event to be processed. void set_slicing_completed_event(int event_id) { m_event_slicing_completed_id = event_id; } - // The following wxCommandEvent will be sent to the UI thread / Platter window, when the G-code export is finished. + // The following wxCommandEvent will be sent to the UI thread / Plater window, when the G-code export is finished. // The wxCommandEvent is sent to the UI thread asynchronously without waiting for the event to be processed. void set_finished_event(int event_id) { m_event_finished_id = event_id; } @@ -186,9 +186,9 @@ private: void throw_if_canceled() const { if (m_print->canceled()) throw CanceledException(); } void prepare_upload(); - // wxWidgets command ID to be sent to the platter to inform that the slicing is finished, and the G-code export will continue. + // wxWidgets command ID to be sent to the plater to inform that the slicing is finished, and the G-code export will continue. int m_event_slicing_completed_id = 0; - // wxWidgets command ID to be sent to the platter to inform that the task finished. + // wxWidgets command ID to be sent to the plater to inform that the task finished. int m_event_finished_id = 0; }; diff --git a/src/slic3r/GUI/Gizmos/GLGizmosManager.cpp b/src/slic3r/GUI/Gizmos/GLGizmosManager.cpp index 31822354f..e639e3d89 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmosManager.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmosManager.cpp @@ -555,7 +555,7 @@ bool GLGizmosManager::on_mouse(wxMouseEvent& evt) update_data(); wxGetApp().obj_manipul()->set_dirty(); - // Let the platter know that the dragging finished, so a delayed refresh + // Let the plater know that the dragging finished, so a delayed refresh // of the scene with the background processing data should be performed. m_parent.post_event(SimpleEvent(EVT_GLCANVAS_MOUSE_DRAGGING_FINISHED)); // updates camera target constraints diff --git a/src/slic3r/GUI/MainFrame.cpp b/src/slic3r/GUI/MainFrame.cpp index 2b7fc3740..9fc74bcb8 100644 --- a/src/slic3r/GUI/MainFrame.cpp +++ b/src/slic3r/GUI/MainFrame.cpp @@ -124,7 +124,7 @@ DPIFrame(NULL, wxID_ANY, "", wxDefaultPosition, wxDefaultSize, wxDEFAULT_FRAME_S _3DScene::remove_all_canvases(); // Slic3r::GUI::deregister_on_request_update_callback(); - // set to null tabs and a platter + // set to null tabs and a plater // to avoid any manipulations with them from App->wxEVT_IDLE after of the mainframe closing wxGetApp().tabs_list.clear(); wxGetApp().plater_ = nullptr; @@ -1006,7 +1006,7 @@ void MainFrame::load_configbundle(wxString file/* = wxEmptyString, const bool re } // Load a provied DynamicConfig into the Print / Filament / Printer tabs, thus modifying the active preset. -// Also update the platter with the new presets. +// Also update the plater with the new presets. void MainFrame::load_config(const DynamicPrintConfig& config) { PrinterTechnology printer_technology = wxGetApp().preset_bundle->printers.get_edited_preset().printer_technology(); diff --git a/src/slic3r/GUI/MainFrame.hpp b/src/slic3r/GUI/MainFrame.hpp index 28bd0242b..7b93e70cb 100644 --- a/src/slic3r/GUI/MainFrame.hpp +++ b/src/slic3r/GUI/MainFrame.hpp @@ -125,7 +125,7 @@ public: void load_config(const DynamicPrintConfig& config); void select_tab(size_t tab) const; void select_view(const std::string& direction); - // Propagate changed configuration from the Tab to the Platter and save changes to the AppConfig + // Propagate changed configuration from the Tab to the Plater and save changes to the AppConfig void on_config_changed(DynamicPrintConfig* cfg) const ; void add_to_recent_projects(const wxString& filename); diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp index 83570ae74..25ce50c7b 100644 --- a/src/slic3r/GUI/Plater.cpp +++ b/src/slic3r/GUI/Plater.cpp @@ -323,7 +323,7 @@ wxBitmapComboBox(parent, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(15 * cfg_new.set_key_value("extruder_colour", colors); wxGetApp().get_tab(Preset::TYPE_PRINTER)->load_config(cfg_new); - wxGetApp().preset_bundle->update_platter_filament_ui(extruder_idx, this); + wxGetApp().preset_bundle->update_plater_filament_ui(extruder_idx, this); wxGetApp().plater()->on_config_change(cfg_new); } }); @@ -949,18 +949,18 @@ void Sidebar::update_all_preset_comboboxes() // Update the print choosers to only contain the compatible presets, update the dirty flags. if (print_tech == ptFFF) - preset_bundle.prints.update_platter_ui(p->combo_print); + preset_bundle.prints.update_plater_ui(p->combo_print); else { - preset_bundle.sla_prints.update_platter_ui(p->combo_sla_print); - preset_bundle.sla_materials.update_platter_ui(p->combo_sla_material); + preset_bundle.sla_prints.update_plater_ui(p->combo_sla_print); + preset_bundle.sla_materials.update_plater_ui(p->combo_sla_material); } // Update the printer choosers, update the dirty flags. - preset_bundle.printers.update_platter_ui(p->combo_printer); + preset_bundle.printers.update_plater_ui(p->combo_printer); // Update the filament choosers to only contain the compatible presets, update the color preview, // update the dirty flags. if (print_tech == ptFFF) { for (size_t i = 0; i < p->combos_filament.size(); ++i) - preset_bundle.update_platter_filament_ui(i, p->combos_filament[i]); + preset_bundle.update_plater_filament_ui(i, p->combos_filament[i]); } } @@ -983,22 +983,22 @@ void Sidebar::update_presets(Preset::Type preset_type) } for (size_t i = 0; i < filament_cnt; i++) { - preset_bundle.update_platter_filament_ui(i, p->combos_filament[i]); + preset_bundle.update_plater_filament_ui(i, p->combos_filament[i]); } break; } case Preset::TYPE_PRINT: - preset_bundle.prints.update_platter_ui(p->combo_print); + preset_bundle.prints.update_plater_ui(p->combo_print); break; case Preset::TYPE_SLA_PRINT: - preset_bundle.sla_prints.update_platter_ui(p->combo_sla_print); + preset_bundle.sla_prints.update_plater_ui(p->combo_sla_print); break; case Preset::TYPE_SLA_MATERIAL: - preset_bundle.sla_materials.update_platter_ui(p->combo_sla_material); + preset_bundle.sla_materials.update_plater_ui(p->combo_sla_material); break; case Preset::TYPE_PRINTER: @@ -2072,7 +2072,7 @@ Plater::priv::priv(Plater *q, MainFrame *main_frame) background_process.set_finished_event(EVT_PROCESS_COMPLETED); // Default printer technology for default config. background_process.select_technology(this->printer_technology); - // Register progress callback from the Print class to the Platter. + // Register progress callback from the Print class to the Plater. auto statuscb = [this](const Slic3r::PrintBase::SlicingStatus &status) { wxQueueEvent(this->q, new Slic3r::SlicingStatusEvent(EVT_SLICING_UPDATE, 0, status)); @@ -3473,8 +3473,8 @@ void Plater::priv::on_select_preset(wxCommandEvent &evt) // TODO: ? if (preset_type == Preset::TYPE_FILAMENT && sidebar->is_multifilament()) { - // Only update the platter UI for the 2nd and other filaments. - wxGetApp().preset_bundle->update_platter_filament_ui(idx, combo); + // Only update the plater UI for the 2nd and other filaments. + wxGetApp().preset_bundle->update_plater_filament_ui(idx, combo); } else { wxWindowUpdateLocker noUpdates(sidebar->presets_panel()); @@ -5128,7 +5128,7 @@ void Plater::on_extruders_change(size_t num_extruders) choices.push_back(choice); // initialize selection - wxGetApp().preset_bundle->update_platter_filament_ui(i, choice); + wxGetApp().preset_bundle->update_plater_filament_ui(i, choice); ++i; } diff --git a/src/slic3r/GUI/Preset.cpp b/src/slic3r/GUI/Preset.cpp index b89000891..797fa28f8 100644 --- a/src/slic3r/GUI/Preset.cpp +++ b/src/slic3r/GUI/Preset.cpp @@ -1026,7 +1026,7 @@ size_t PresetCollection::update_compatible_internal(const PresetWithVendorProfil // Update the wxChoice UI component from this list of presets. // Hide the -void PresetCollection::update_platter_ui(GUI::PresetComboBox *ui) +void PresetCollection::update_plater_ui(GUI::PresetComboBox *ui) { if (ui == nullptr) return; diff --git a/src/slic3r/GUI/Preset.hpp b/src/slic3r/GUI/Preset.hpp index 0a26f90cc..742d3e01d 100644 --- a/src/slic3r/GUI/Preset.hpp +++ b/src/slic3r/GUI/Preset.hpp @@ -442,7 +442,7 @@ public: // Update the choice UI from the list of presets. // Only the compatible presets are shown. // If an incompatible preset is selected, it is shown as well. - void update_platter_ui(GUI::PresetComboBox *ui); + void update_plater_ui(GUI::PresetComboBox *ui); // Update a dirty floag of the current preset, update the labels of the UI component accordingly. // Return true if the dirty flag changed. @@ -531,7 +531,7 @@ private: // Is the "- default -" preset suppressed? bool m_default_suppressed = true; size_t m_num_default_presets = 0; - // Compatible & incompatible marks, to be placed at the wxBitmapComboBox items of a Platter. + // Compatible & incompatible marks, to be placed at the wxBitmapComboBox items of a Plater. // These bitmaps are not owned by PresetCollection, but by a PresetBundle. const wxBitmap *m_bitmap_compatible = nullptr; const wxBitmap *m_bitmap_incompatible = nullptr; diff --git a/src/slic3r/GUI/PresetBundle.cpp b/src/slic3r/GUI/PresetBundle.cpp index 8f5d58bc1..bb08ce2d0 100644 --- a/src/slic3r/GUI/PresetBundle.cpp +++ b/src/slic3r/GUI/PresetBundle.cpp @@ -1572,7 +1572,7 @@ void PresetBundle::load_default_preset_bitmaps(wxWindow *window) this->load_compatible_bitmaps(window); } -void PresetBundle::update_platter_filament_ui(unsigned int idx_extruder, GUI::PresetComboBox *ui) +void PresetBundle::update_plater_filament_ui(unsigned int idx_extruder, GUI::PresetComboBox *ui) { if (ui == nullptr || this->printers.get_edited_preset().printer_technology() == ptSLA || this->filament_presets.size() <= idx_extruder ) diff --git a/src/slic3r/GUI/PresetBundle.hpp b/src/slic3r/GUI/PresetBundle.hpp index 5205042c5..ff27d0023 100644 --- a/src/slic3r/GUI/PresetBundle.hpp +++ b/src/slic3r/GUI/PresetBundle.hpp @@ -109,8 +109,8 @@ public: // Export a config bundle file containing all the presets and the names of the active presets. void export_configbundle(const std::string &path, bool export_system_settings = false); - // Update a filament selection combo box on the platter for an idx_extruder. - void update_platter_filament_ui(unsigned int idx_extruder, GUI::PresetComboBox *ui); + // Update a filament selection combo box on the plater for an idx_extruder. + void update_plater_filament_ui(unsigned int idx_extruder, GUI::PresetComboBox *ui); // Enable / disable the "- default -" preset. void set_default_suppressed(bool default_suppressed); diff --git a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp index c518ede80..bd0d7b81f 100644 --- a/src/slic3r/GUI/Tab.cpp +++ b/src/slic3r/GUI/Tab.cpp @@ -905,7 +905,7 @@ void Tab::update_wiping_button_visibility() { } -// Call a callback to update the selection of presets on the platter: +// Call a callback to update the selection of presets on the plater: // To update the content of the selection boxes, // to update the filament colors of the selection boxes, // to update the "dirty" flags of the selection boxes, @@ -2825,7 +2825,7 @@ void Tab::select_preset(std::string preset_name, bool delete_current) if (canceled) { update_tab_ui(); // Trigger the on_presets_changed event so that we also restore the previous value in the plater selector, - // if this action was initiated from the platter. + // if this action was initiated from the plater. on_presets_changed(); } else { if (current_dirty) @@ -3053,7 +3053,7 @@ void Tab::save_preset(std::string name /*= ""*/) m_preset_bundle->update_compatible(false); // Add the new item into the UI component, remove dirty flags and activate the saved item. update_tab_ui(); - // Update the selection boxes at the platter. + // Update the selection boxes at the plater. on_presets_changed(); // If current profile is saved, "delete preset" button have to be enabled m_btn_delete_preset->Enable(true); diff --git a/src/slic3r/GUI/Tab.hpp b/src/slic3r/GUI/Tab.hpp index ee6937652..4345f196c 100644 --- a/src/slic3r/GUI/Tab.hpp +++ b/src/slic3r/GUI/Tab.hpp @@ -231,7 +231,7 @@ public: // Counter for the updating (because of an update() function can have a recursive behavior): // 1. increase value from the very beginning of an update() function // 2. decrease value at the end of an update() function - // 3. propagate changed configuration to the Platter when (m_update_cnt == 0) only + // 3. propagate changed configuration to the Plater when (m_update_cnt == 0) only int m_update_cnt = 0; public: