QIDITECH/QIDISlicer
1
0
Fork 0
mirror of https://github.com/QIDITECH/QIDISlicer.git synced 2026-01-30 15:38:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

QIDI Prusa

Browse Source
This commit is contained in:
sunsets
2024-03-21 11:29:09 +08:00
parent 470b3a19ed
commit 516d3a3313
9 changed files with 86 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
src/.vscode/settings.json vendored Normal file
View File

@@ -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"
}
}

1
src/libslic3r/Format/STEP.hpp
View File

@@ -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_

2
src/libslic3r/Preset.cpp
View File

@@ -168,7 +168,7 @@ VendorProfile VendorProfile::from_ini(const ptree &tree, const boost::filesystem
}
model.family = section.second.get<std::string>("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; }

4
src/platform/msw/QIDISlicer-gcodeviewer.rc.in
View File

@@ -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"
}
}

4
src/platform/msw/QIDISlicer.rc.in
View File

@@ -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"
}
}

4
src/slic3r/GUI/GUI_App.cpp
View File

@@ -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<wxString, wxString> mapping {
{ "cs", "cs_CZ", },
{ "sk", "cs_CZ", },

2
src/slic3r/GUI/GUI_App.hpp
View File

@@ -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"; }

12
src/slic3r/GUI/PhysicalPrinterDialog.cpp
View File

@@ -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<text_ctrl*>(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<text_ctrl*>(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<VendorProfile::PrinterModel>& 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;
}

4
src/slic3r/GUI/Plater.cpp
View File

@@ -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);