3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-10 00:07:52 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

ENH: CLI: check the compatability when not change the settings

Browse source 
Change-Id: I977e98fcdd8c6a84ad68d0a1cc6f8eef5075b537
(cherry picked from commit ce17360aba5a463cdec788e7cb0897e33dfa1042)
This commit is contained in:
lane.wei 2023-06-09 16:50:07 +08:00 • committed by Lane.Wei
parent ac57ac41ab
commit 535db60e70
1 changed files with 31 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

39
src/BambuStudio.cpp
View file

@ -849,7 +849,7 @@ int CLI::run(int argc, char **argv)
//use the original printer name in 3mf //use the original printer name in 3mf
std::string system_printer_path = resources_dir() + "/profiles/BBL/machine_full/"+current_printer_system_name+".json"; std::string system_printer_path = resources_dir() + "/profiles/BBL/machine_full/"+current_printer_system_name+".json";
if (! boost::filesystem::exists(system_printer_path)) { if (! boost::filesystem::exists(system_printer_path)) {
boost::nowide::cerr << __FUNCTION__<< ": can not find system preset file: " << system_printer_path << std::endl; BOOST_LOG_TRIVIAL(warning) << __FUNCTION__<< boost::format(":%1%, can not find system preset file: %2% ")%__LINE__ %system_printer_path;
//use original one //use original one
} }
else { else {
@ -870,7 +870,7 @@ int CLI::run(int argc, char **argv)
//use the original printer name in 3mf //use the original printer name in 3mf
std::string system_process_path = resources_dir() + "/profiles/BBL/process_full/"+current_process_system_name+".json"; std::string system_process_path = resources_dir() + "/profiles/BBL/process_full/"+current_process_system_name+".json";
if (! boost::filesystem::exists(system_process_path)) { if (! boost::filesystem::exists(system_process_path)) {
boost::nowide::cerr << __FUNCTION__<< ": can not find system preset file: " << system_process_path << std::endl; BOOST_LOG_TRIVIAL(warning) << __FUNCTION__<< boost::format(":%1%, can not find system preset file: %2% ")%__LINE__ %system_process_path;
//use original one //use original one
} }
else { else {
@ -892,7 +892,7 @@ int CLI::run(int argc, char **argv)
std::string system_filament_path = resources_dir() + "/profiles/BBL/filament_full/"+current_filaments_system_name[index]+".json"; std::string system_filament_path = resources_dir() + "/profiles/BBL/filament_full/"+current_filaments_system_name[index]+".json";
current_index++; current_index++;
if (! boost::filesystem::exists(system_filament_path)) { if (! boost::filesystem::exists(system_filament_path)) {
boost::nowide::cerr << __FUNCTION__<< ": can not find system preset file: " << system_filament_path << std::endl; BOOST_LOG_TRIVIAL(warning) << __FUNCTION__<< boost::format(":%1%, can not find system preset file: %2% ")%__LINE__ %system_filament_path;
continue; continue;
} }
DynamicPrintConfig config; DynamicPrintConfig config;
@ -919,7 +919,7 @@ int CLI::run(int argc, char **argv)
//use the original printer name in 3mf //use the original printer name in 3mf
std::string system_printer_path = resources_dir() + "/profiles/BBL/machine_full/"+current_printer_system_name+".json"; std::string system_printer_path = resources_dir() + "/profiles/BBL/machine_full/"+current_printer_system_name+".json";
if (! boost::filesystem::exists(system_printer_path)) { if (! boost::filesystem::exists(system_printer_path)) {
boost::nowide::cerr << __FUNCTION__<< ": can not find system preset file: " << system_printer_path << std::endl; BOOST_LOG_TRIVIAL(warning) << __FUNCTION__<< boost::format(":%1%, can not find system preset file: %2% ")%__LINE__ %system_printer_path;
//skip //skip
} }
else { else {
@ -939,7 +939,7 @@ int CLI::run(int argc, char **argv)
//use the original printer name in 3mf //use the original printer name in 3mf
std::string system_process_path = resources_dir() + "/profiles/BBL/process_full/"+current_process_system_name+".json"; std::string system_process_path = resources_dir() + "/profiles/BBL/process_full/"+current_process_system_name+".json";
if (! boost::filesystem::exists(system_process_path)) { if (! boost::filesystem::exists(system_process_path)) {
boost::nowide::cerr << __FUNCTION__<< ": can not find system preset file: " << system_process_path << std::endl; BOOST_LOG_TRIVIAL(warning) << __FUNCTION__<< boost::format(":%1%, can not find system preset file: %2% ")%__LINE__ %system_process_path;
//use original one //use original one
} }
else { else {
@ -954,9 +954,18 @@ int CLI::run(int argc, char **argv)
} }
//upwards check //upwards check
bool process_compatible = true, machine_upwards = false; bool process_compatible = false, machine_upwards = false;
BOOST_LOG_TRIVIAL(info) << boost::format("current printer %1%, new printer %2%, current process %3%, new process %4%")%current_printer_name %new_printer_name %current_process_name %new_process_name;
for (int index = 0; index < current_print_compatible_printers.size(); index++) {
BOOST_LOG_TRIVIAL(info) << boost::format("index %1%, current print compatible printer %2%")%index %current_print_compatible_printers[index];
}
for (int index = 0; index < new_print_compatible_printers.size(); index++) {
BOOST_LOG_TRIVIAL(info) << boost::format("index %1%, new print compatible printer %2%")%index %new_print_compatible_printers[index];
}
for (int index = 0; index < upward_compatible_printers.size(); index++) {
BOOST_LOG_TRIVIAL(info) << boost::format("index %1%, upward_compatible_printers %2%")%index %upward_compatible_printers[index];
}
if (!new_printer_name.empty()) { if (!new_printer_name.empty()) {
process_compatible = false;
if (!new_process_name.empty()) { if (!new_process_name.empty()) {
for (int index = 0; index < new_print_compatible_printers.size(); index++) { for (int index = 0; index < new_print_compatible_printers.size(); index++) {
if (new_print_compatible_printers[index] == new_printer_name) { if (new_print_compatible_printers[index] == new_printer_name) {
@ -977,7 +986,6 @@ int CLI::run(int argc, char **argv)
} }
} }
else if (!new_process_name.empty()) { else if (!new_process_name.empty()) {
process_compatible = false;
for (int index = 0; index < new_print_compatible_printers.size(); index++) { for (int index = 0; index < new_print_compatible_printers.size(); index++) {
if (new_print_compatible_printers[index] == current_printer_name) { if (new_print_compatible_printers[index] == current_printer_name) {
process_compatible = true; process_compatible = true;
@ -986,6 +994,21 @@ int CLI::run(int argc, char **argv)
} }
BOOST_LOG_TRIVIAL(info) << boost::format("old printer %1%, new process %2%, compatible %3%")%current_printer_name %new_process_name %process_compatible; BOOST_LOG_TRIVIAL(info) << boost::format("old printer %1%, new process %2%, compatible %3%")%current_printer_name %new_process_name %process_compatible;
} }
else {
//check the compatible of old printer&&process
for (int index = 0; index < current_print_compatible_printers.size(); index++) {
if (current_print_compatible_printers[index] == current_printer_name) {
process_compatible = true;
break;
}
}
if (!process_compatible && current_print_compatible_printers.empty())
{
BOOST_LOG_TRIVIAL(info) << boost::format("old 3mf, no compatible printers, set to compatible");
process_compatible = true;
}
BOOST_LOG_TRIVIAL(info) << boost::format("old printer %1%, old process %2%, compatible %3%")%current_printer_name %current_process_name %process_compatible;
}
if (!process_compatible && !new_printer_name.empty() && !current_printer_name.empty() && (new_printer_name != current_printer_name)) { if (!process_compatible && !new_printer_name.empty() && !current_printer_name.empty() && (new_printer_name != current_printer_name)) {
if (upward_compatible_printers.size() > 0) { if (upward_compatible_printers.size() > 0) {
for (int index = 0; index < upward_compatible_printers.size(); index++) { for (int index = 0; index < upward_compatible_printers.size(); index++) {