diff --git a/src/.vscode/settings.json b/src/.vscode/settings.json new file mode 100644 index 0000000..a5dcbef --- /dev/null +++ b/src/.vscode/settings.json @@ -0,0 +1,70 @@ +{ + "files.associations": { + "typeinfo": "cpp", + "any": "cpp", + "array": "cpp", + "atomic": "cpp", + "*.tcc": "cpp", + "bitset": "cpp", + "cctype": "cpp", + "cfenv": "cpp", + "charconv": "cpp", + "chrono": "cpp", + "cinttypes": "cpp", + "clocale": "cpp", + "cmath": "cpp", + "codecvt": "cpp", + "complex": "cpp", + "condition_variable": "cpp", + "csignal": "cpp", + "cstdarg": "cpp", + "cstddef": "cpp", + "cstdint": "cpp", + "cstdio": "cpp", + "cstdlib": "cpp", + "cstring": "cpp", + "ctime": "cpp", + "cwchar": "cpp", + "cwctype": "cpp", + "deque": "cpp", + "forward_list": "cpp", + "list": "cpp", + "unordered_map": "cpp", + "unordered_set": "cpp", + "vector": "cpp", + "exception": "cpp", + "algorithm": "cpp", + "functional": "cpp", + "iterator": "cpp", + "map": "cpp", + "memory": "cpp", + "memory_resource": "cpp", + "numeric": "cpp", + "optional": "cpp", + "random": "cpp", + "ratio": "cpp", + "regex": "cpp", + "set": "cpp", + "string": "cpp", + "string_view": "cpp", + "system_error": "cpp", + "tuple": "cpp", + "type_traits": "cpp", + "utility": "cpp", + "fstream": "cpp", + "future": "cpp", + "initializer_list": "cpp", + "iomanip": "cpp", + "iosfwd": "cpp", + "iostream": "cpp", + "istream": "cpp", + "limits": "cpp", + "mutex": "cpp", + "new": "cpp", + "ostream": "cpp", + "sstream": "cpp", + "stdexcept": "cpp", + "streambuf": "cpp", + "thread": "cpp" + } +} \ No newline at end of file diff --git a/src/libslic3r/Format/STEP.hpp b/src/libslic3r/Format/STEP.hpp index fe5fc70..e08695c 100644 --- a/src/libslic3r/Format/STEP.hpp +++ b/src/libslic3r/Format/STEP.hpp @@ -1,6 +1,5 @@ // Original implementation of STEP format import created by Bambulab. // https://github.com/bambulab/BambuStudio -// Forked off commit 1555904, modified by QIDI Research. #ifndef slic3r_Format_STEP_hpp_ #define slic3r_Format_STEP_hpp_ diff --git a/src/libslic3r/Preset.cpp b/src/libslic3r/Preset.cpp index 443206d..c17babf 100644 --- a/src/libslic3r/Preset.cpp +++ b/src/libslic3r/Preset.cpp @@ -168,7 +168,7 @@ VendorProfile VendorProfile::from_ini(const ptree &tree, const boost::filesystem } model.family = section.second.get("family", std::string()); - if (model.family.empty() && res.name == "QIDI Research") { + if (model.family.empty() && res.name == "QIDI Technology") { // If no family is specified, it can be inferred for known printers const auto from_pre_map = pre_family_model_map.find(model.id); if (from_pre_map != pre_family_model_map.end()) { model.family = from_pre_map->second; } diff --git a/src/platform/msw/QIDISlicer-gcodeviewer.rc.in b/src/platform/msw/QIDISlicer-gcodeviewer.rc.in index a11a728..3b08d4a 100644 --- a/src/platform/msw/QIDISlicer-gcodeviewer.rc.in +++ b/src/platform/msw/QIDISlicer-gcodeviewer.rc.in @@ -6,13 +6,13 @@ PRODUCTVERSION @SLIC3R_RC_VERSION@ { BLOCK "040904E4" { - VALUE "CompanyName", "QIDI Research" + VALUE "CompanyName", "QIDI Technology" VALUE "FileDescription", "@SLIC3R_APP_NAME@ G-code Viewer" VALUE "FileVersion", "@SLIC3R_BUILD_ID@" VALUE "ProductName", "@SLIC3R_APP_NAME@ G-code Viewer" VALUE "ProductVersion", "@SLIC3R_BUILD_ID@" VALUE "InternalName", "@SLIC3R_APP_NAME@ G-code Viewer" - VALUE "LegalCopyright", "Copyright \251 2016-2023 QIDI Research, \251 2011-2018 Alessandro Ranellucci" + VALUE "LegalCopyright", "Copyright \251 2016-2023 Prusa Research, \251 2011-2018 Alessandro Ranellucci" VALUE "OriginalFilename", "qidi-gcodeviewer.exe" } } diff --git a/src/platform/msw/QIDISlicer.rc.in b/src/platform/msw/QIDISlicer.rc.in index 97a3816..5d3df8a 100644 --- a/src/platform/msw/QIDISlicer.rc.in +++ b/src/platform/msw/QIDISlicer.rc.in @@ -6,13 +6,13 @@ PRODUCTVERSION @SLIC3R_RC_VERSION@ { BLOCK "040904E4" { - VALUE "CompanyName", "QIDI Research" + VALUE "CompanyName", "QIDI Technology" VALUE "FileDescription", "@SLIC3R_APP_NAME@" VALUE "FileVersion", "@SLIC3R_BUILD_ID@" VALUE "ProductName", "@SLIC3R_APP_NAME@" VALUE "ProductVersion", "@SLIC3R_BUILD_ID@" VALUE "InternalName", "@SLIC3R_APP_NAME@" - VALUE "LegalCopyright", "Copyright \251 2016-2023 QIDI Research, \251 2011-2018 Alessandro Ranellucci" + VALUE "LegalCopyright", "Copyright \251 2016-2023 Prusa Research, \251 2011-2018 Alessandro Ranellucci" VALUE "OriginalFilename", "qidi-slicer.exe" } } diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp index 8bf45dc..138e87c 100644 --- a/src/slic3r/GUI/GUI_App.cpp +++ b/src/slic3r/GUI/GUI_App.cpp @@ -290,7 +290,7 @@ private: // B11 _L("is based on Slic3r by Alessandro Ranellucci and the RepRap community.") + "\n"; //+ - // _L("Developed by QIDI Research.") + "\n\n" + + // _L("Developed by QIDI Technology.") + "\n\n" + // title + " " + _L("is licensed under the") + " " + _L("GNU Affero General Public License, version 3") + ".\n\n" + // _L("Contributions by Vojtech Bubnik, Enrico Turri, Oleksandra Iushchenko, Tamas Meszaros, Lukas Matena, Vojtech Kral, David Kocik and numerous others.") + "\n\n" + // _L("Artwork model by Creative Tools"); @@ -3083,7 +3083,7 @@ int GUI_App::extruders_edited_cnt() const wxString GUI_App::current_language_code_safe() const { - // Translate the language code to a code, for which QIDI Research maintains translations. + // Translate the language code to a code, for which QIDI Technology maintains translations. const std::map mapping { { "cs", "cs_CZ", }, { "sk", "cs_CZ", }, diff --git a/src/slic3r/GUI/GUI_App.hpp b/src/slic3r/GUI/GUI_App.hpp index 2d23f98..a40ccbe 100644 --- a/src/slic3r/GUI/GUI_App.hpp +++ b/src/slic3r/GUI/GUI_App.hpp @@ -295,7 +295,7 @@ public: void load_current_presets(bool check_printer_presets = true); wxString current_language_code() const { return m_wxLocale->GetCanonicalName(); } - // Translate the language code to a code, for which QIDI Research maintains translations. Defaults to "en_US". + // Translate the language code to a code, for which QIDI Technology maintains translations. Defaults to "en_US". wxString current_language_code_safe() const; bool is_localized() const { return m_wxLocale->GetLocale() != "English"; } diff --git a/src/slic3r/GUI/PhysicalPrinterDialog.cpp b/src/slic3r/GUI/PhysicalPrinterDialog.cpp index 6f91771..fcee581 100644 --- a/src/slic3r/GUI/PhysicalPrinterDialog.cpp +++ b/src/slic3r/GUI/PhysicalPrinterDialog.cpp @@ -504,7 +504,7 @@ void PhysicalPrinterDialog::update(bool printer_change) // Hide Browse and Test buttons for Connect if (opt->value == htQIDIConnect) { m_printhost_browse_btn->Hide(); - // hide show hostname and PrusaConnect address + // hide show hostname and QIDIConnect address Field* printhost_field = m_optgroup->get_field("print_host"); text_ctrl* printhost_win = printhost_field ? dynamic_cast(printhost_field->getWindow()) : nullptr; if (!m_opened_as_connect && printhost_win && m_last_host_type != htQIDIConnect){ @@ -513,7 +513,7 @@ void PhysicalPrinterDialog::update(bool printer_change) } } else { m_printhost_browse_btn->Show(); - // hide PrusaConnect address and show hostname + // hide QIDIConnect address and show hostname Field* printhost_field = m_optgroup->get_field("print_host"); text_ctrl* printhost_win = printhost_field ? dynamic_cast(printhost_field->getWindow()) : nullptr; if (!m_opened_as_connect && printhost_win && m_last_host_type == htQIDIConnect) { @@ -579,13 +579,13 @@ void PhysicalPrinterDialog::update_host_type(bool printer_change) ); }; - // set all_presets_are_prusalink_supported + // set all_presets_are_qidilink_supported for (PresetForPrinter* prstft : m_presets) { std::string preset_name = prstft->get_preset_name(); if (Preset* preset = wxGetApp().preset_bundle->printers.find_preset(preset_name)) { std::string model_id = preset->config.opt_string("printer_model"); if (preset->vendor) { - if (preset->vendor->name == "QIDI Research") { + if (preset->vendor->name == "QIDI Technology") { const std::vector& models = preset->vendor->models; auto it = std::find_if(models.begin(), models.end(), [model_id](const VendorProfile::PrinterModel& model) { return model.id == model_id; }); @@ -609,11 +609,11 @@ void PhysicalPrinterDialog::update_host_type(bool printer_change) break; } std::string model_id = preset->config.opt_string("printer_model"); - if (preset->vendor && preset->vendor->name != "QIDI Research") { + if (preset->vendor && preset->vendor->name != "QIDI Technology") { connect.supported = false; break; } - if (preset->vendor && preset->vendor->name != "QIDI Research") { + if (preset->vendor && preset->vendor->name != "QIDI Technology") { connect.supported = false; break; } diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp index 5a55915..37ce8e9 100644 --- a/src/slic3r/GUI/Plater.cpp +++ b/src/slic3r/GUI/Plater.cpp @@ -7959,8 +7959,8 @@ void Plater::send_gcode() upload_job.upload_data.group = dlg.group(); upload_job.upload_data.storage = dlg.storage(); - // Show "Is printer clean" dialog for PrusaConnect - Upload and print. - if (std::string(upload_job.printhost->get_name()) == "PrusaConnect" && + // Show "Is printer clean" dialog for QIDIConnect - Upload and print. + if (std::string(upload_job.printhost->get_name()) == "QIDIConnect" && upload_job.upload_data.post_action == PrintHostPostUploadAction::StartPrint) { GUI::MessageDialog dlg(nullptr, _L("Is the printer ready? Is the print sheet in place, empty and clean?"), _L("Upload and Print"), wxOK | wxCANCEL);