juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-10-14 19:31:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge main branch

Browse Source
This commit is contained in:
Lam Wei Lun
2026-10-08 11:12:25 +08:00
parent 987b1b2b63 e729dbf142
commit faa64ab089
505 changed files with 19826 additions and 14837 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/slic3r/GUI/SyncAmsInfoDialog.cpp
+4 -6
View File
@@ -15,7 +15,7 @@
#include "libslic3r/Utils.hpp"
#include <string>
#include "slic3r/GUI/BBLStatusBarPrint.hpp"
#include "slic3r/GUI/Printer/PrinterFileSystem.h"
#include <nlohmann/json.hpp>
#include <cassert>
#include "libslic3r/PrintConfig.hpp"
#include <cstdlib>
@@ -85,9 +85,7 @@
#include "slic3r/Utils/NetworkAgent.hpp"
namespace fs = boost::filesystem;
using namespace Slic3r;
using namespace Slic3r::GUI;
using json = nlohmann::json;
#define OK_BUTTON_SIZE wxSize(FromDIP(90), FromDIP(24))
#define CANCEL_BUTTON_SIZE wxSize(FromDIP(58), FromDIP(24))
@@ -1584,7 +1582,7 @@ bool SyncAmsInfoDialog::is_nozzle_type_match(DevExtderSystem data, wxString &err
}
}
vector<int> map_extruders = {1, 0};
std::vector<int> map_extruders = {1, 0};
// The default two extruders are left, right, but the order of the extruders on the machine is right, left.
std::vector<std::string> flow_type_of_machine;
@@ -1684,7 +1682,7 @@ void SyncAmsInfoDialog::stripWhiteSpace(std::string &str)
{
if (str == "") { return; }
string::iterator cur_it;
std::string::iterator cur_it;
cur_it = str.begin();
while (cur_it != str.end()) {