From dd20cc575019851e9d1ef77ad8e9f60e7d5193f7 Mon Sep 17 00:00:00 2001 From: YuSanka Date: Tue, 7 Nov 2023 14:34:11 +0100 Subject: [PATCH] StatusBar: Removed commented code --- src/slic3r/GUI/MainFrame.cpp | 14 ------------ src/slic3r/GUI/MainFrame.hpp | 3 --- src/slic3r/GUI/Plater.cpp | 43 ------------------------------------ src/slic3r/GUI/Plater.hpp | 1 - 4 files changed, 61 deletions(-) diff --git a/src/slic3r/GUI/MainFrame.cpp b/src/slic3r/GUI/MainFrame.cpp index 33c9c9e0a6..c3c45c5715 100644 --- a/src/slic3r/GUI/MainFrame.cpp +++ b/src/slic3r/GUI/MainFrame.cpp @@ -34,7 +34,6 @@ #include "libslic3r/PresetBundle.hpp" #include "Tab.hpp" -#include "ProgressStatusBar.hpp" #include "3DScene.hpp" #include "PrintHostDialogs.hpp" #include "wxExtensions.hpp" @@ -167,15 +166,6 @@ DPIFrame(NULL, wxID_ANY, "", wxDefaultPosition, wxDefaultSize, wxDEFAULT_FRAME_S // Load the icon either from the exe, or from the ico file. SetIcon(main_frame_icon(wxGetApp().get_app_mode())); - // initialize status bar -// m_statusbar = std::make_shared(this); -// m_statusbar->set_font(GUI::wxGetApp().normal_font()); -// if (wxGetApp().is_editor()) -// m_statusbar->embed(this); -// m_statusbar->set_status_text(_L("Version") + " " + -// SLIC3R_VERSION + " - " + -// _L("Remember to check for updates at https://github.com/prusa3d/PrusaSlicer/releases")); - // initialize tabpanel and menubar init_tabpanel(); if (wxGetApp().is_gcode_viewer()) @@ -1338,10 +1328,6 @@ void MainFrame::init_menubar_as_editor() append_menu_item(export_menu, wxID_ANY, _L("Export Plate as STL/OBJ &Including Supports") + dots, _L("Export current plate as STL/OBJ including supports"), [this](wxCommandEvent&) { if (m_plater) m_plater->export_stl_obj(true); }, "export_plater", nullptr, [this](){return can_export_supports(); }, this); -// Deprecating AMF export. Let's wait for user feedback. -// append_menu_item(export_menu, wxID_ANY, _L("Export Plate as &AMF") + dots, _L("Export current plate as AMF"), -// [this](wxCommandEvent&) { if (m_plater) m_plater->export_amf(); }, "export_plater", nullptr, -// [this](){return can_export_model(); }, this); export_menu->AppendSeparator(); append_menu_item(export_menu, wxID_ANY, _L("Export &Toolpaths as OBJ") + dots, _L("Export toolpaths as OBJ"), [this](wxCommandEvent&) { if (m_plater) m_plater->export_toolpaths_to_obj(); }, "export_plater", nullptr, diff --git a/src/slic3r/GUI/MainFrame.hpp b/src/slic3r/GUI/MainFrame.hpp index ded0799b9b..8b49331295 100644 --- a/src/slic3r/GUI/MainFrame.hpp +++ b/src/slic3r/GUI/MainFrame.hpp @@ -33,8 +33,6 @@ class wxProgressDialog; namespace Slic3r { -class ProgressStatusBar; - namespace GUI { @@ -217,7 +215,6 @@ public: // wxProgressDialog* m_progress_dialog { nullptr }; PreferencesDialog* preferences_dialog { nullptr }; PrintHostQueueDialog* m_printhost_queue_dlg; -// std::shared_ptr m_statusbar; GalleryDialog* m_gallery_dialog{ nullptr }; #ifdef __APPLE__ diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp index bdd24944db..a1c8634121 100644 --- a/src/slic3r/GUI/Plater.cpp +++ b/src/slic3r/GUI/Plater.cpp @@ -393,7 +393,6 @@ struct Plater::priv void apply_free_camera_correction(bool apply = true); void update_ui_from_settings(); void update_main_toolbar_tooltips(); -// std::shared_ptr statusbar(); bool get_config_bool(const std::string &key) const; std::vector load_files(const std::vector& input_files, bool load_model, bool load_config, bool used_inches = false); @@ -974,12 +973,6 @@ void Plater::priv::update_main_toolbar_tooltips() view3D->get_canvas3d()->update_tooltip_for_settings_item_in_main_toolbar(); } -//std::shared_ptr Plater::priv::statusbar() -//{ -// return nullptr; -// return main_frame->m_statusbar; -//} - bool Plater::priv::get_config_bool(const std::string &key) const { return wxGetApp().app_config->get_bool(key); @@ -1312,7 +1305,6 @@ std::vector Plater::priv::load_files(const std::vector& input_ if (load_model && !in_temp) { wxGetApp().app_config->update_skein_dir(input_files[input_files.size() - 1].parent_path().make_preferred().string()); // XXX: Plater.pm had @loaded_files, but didn't seem to fill them with the filenames... - // statusbar()->set_status_text(_L("Loaded")); } // automatic selection of added objects @@ -1965,9 +1957,6 @@ unsigned int Plater::priv::update_background_process(bool force_validation, bool else { // Background data is valid. -// if ((return_state & UPDATE_BACKGROUND_PROCESS_RESTART) != 0 || -// (return_state & UPDATE_BACKGROUND_PROCESS_REFRESH_SCENE) != 0 ) -// this->statusbar()->set_status_text(_L("Ready to slice")); if ((return_state & UPDATE_BACKGROUND_PROCESS_RESTART) != 0 || (return_state & UPDATE_BACKGROUND_PROCESS_REFRESH_SCENE) != 0 ) notification_manager->set_slicing_progress_hidden(); @@ -2008,10 +1997,6 @@ bool Plater::priv::restart_background_process(unsigned int state) (state & UPDATE_BACKGROUND_PROCESS_RESTART) != 0 ) ) { // The print is valid and it can be started. if (this->background_process.start()) { -// this->statusbar()->set_cancel_callback([this]() { -// this->statusbar()->set_status_text(_L("Cancelling")); -// this->background_process.stop(); -// }); if (!show_warning_dialog) on_slicing_began(); return true; @@ -2798,8 +2783,6 @@ void Plater::priv::on_process_completed(SlicingProcessCompletedEvent &evt) // At this point of time the thread should be either finished or canceled, // so the following call just confirms, that the produced data were consumed. this->background_process.stop(); -// this->statusbar()->reset_cancel_callback(); -// this->statusbar()->stop_busy(); notification_manager->set_slicing_progress_export_possible(); // Reset the "export G-code path" name, so that the automatic background processing will be enabled again. @@ -2820,7 +2803,6 @@ void Plater::priv::on_process_completed(SlicingProcessCompletedEvent &evt) } } else notification_manager->push_slicing_error_notification(message.first); -// this->statusbar()->set_status_text(from_u8(message.first)); if (evt.invalidate_plater()) { const wxString invalid_str = _L("Invalid data"); @@ -2831,7 +2813,6 @@ void Plater::priv::on_process_completed(SlicingProcessCompletedEvent &evt) has_error = true; } if (evt.cancelled()) { -// this->statusbar()->set_status_text(_L("Cancelled")); this->notification_manager->set_slicing_progress_canceled(_u8L("Slicing Cancelled.")); } @@ -5408,28 +5389,6 @@ void Plater::export_stl_obj(bool extended, bool selection_only) Slic3r::store_stl(path_u8.c_str(), &mesh, true); else if (path.Lower().EndsWith(".obj")) Slic3r::store_obj(path_u8.c_str(), &mesh); -// p->statusbar()->set_status_text(format_wxstr(_L("STL file exported to %s"), path)); -} - -void Plater::export_amf() -{ - if (p->model.objects.empty()) { return; } - - wxString path = p->get_export_file(FT_AMF); - if (path.empty()) { return; } - const std::string path_u8 = into_u8(path); - - wxBusyCursor wait; - bool export_config = true; - DynamicPrintConfig cfg = wxGetApp().preset_bundle->full_config_secure(); - bool full_pathnames = wxGetApp().app_config->get_bool("export_sources_full_pathnames"); - if (Slic3r::store_amf(path_u8.c_str(), &p->model, export_config ? &cfg : nullptr, full_pathnames)) { - // Success -// p->statusbar()->set_status_text(format_wxstr(_L("AMF file exported to %s"), path)); - } else { - // Failure -// p->statusbar()->set_status_text(format_wxstr(_L("Error exporting AMF file %s"), path)); - } } namespace { @@ -5579,13 +5538,11 @@ bool Plater::export_3mf(const boost::filesystem::path& output_path) } if (ret) { // Success -// p->statusbar()->set_status_text(format_wxstr(_L("3MF file exported to %s"), path)); BOOST_LOG_TRIVIAL(info) << "3MF file exported to " << path; p->set_project_filename(path); } else { // Failure -// p->statusbar()->set_status_text(format_wxstr(_L("Error exporting 3MF file %s"), path)); const wxString what = GUI::format_wxstr("%1%: %2%", _L("Unable to save file") , path_u8); show_error(this, what); } diff --git a/src/slic3r/GUI/Plater.hpp b/src/slic3r/GUI/Plater.hpp index b772d9f786..ac596a9dcb 100644 --- a/src/slic3r/GUI/Plater.hpp +++ b/src/slic3r/GUI/Plater.hpp @@ -203,7 +203,6 @@ public: void export_gcode(bool prefer_removable); void export_stl_obj(bool extended = false, bool selection_only = false); - void export_amf(); bool export_3mf(const boost::filesystem::path& output_path = boost::filesystem::path()); void reload_from_disk(); void replace_with_stl();