mirror of
https://github.com/SoftFever/OrcaSlicer.git
synced 2025-07-09 07:56:24 -06:00
ENH: modify naming rule
Change-Id: I6baa5f72c3da4772c34940ce820ee2e84e3ccf0f (cherry picked from commit 6c833991eff638294d4136c26b4286b49a4a2af6)
This commit is contained in:
parent
2e5474418c
commit
ce9561c6f8
1 changed files with 17 additions and 7 deletions
|
@ -7,26 +7,36 @@
|
||||||
namespace Slic3r { namespace GUI {
|
namespace Slic3r { namespace GUI {
|
||||||
|
|
||||||
|
|
||||||
static wxString get_default_name(wxString filament_type, CalibMode mode){
|
static wxString get_default_name(wxString filament_name, CalibMode mode){
|
||||||
|
PresetBundle* preset_bundle = wxGetApp().preset_bundle;
|
||||||
|
for (auto it = preset_bundle->filaments.begin(); it != preset_bundle->filaments.end(); it++) {
|
||||||
|
if (filament_name.compare(it->name) == 0) {
|
||||||
|
if (!it->alias.empty())
|
||||||
|
filament_name = it->alias;
|
||||||
|
else
|
||||||
|
filament_name = it->name;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
switch (mode)
|
switch (mode)
|
||||||
{
|
{
|
||||||
case Slic3r::CalibMode::Calib_None:
|
case Slic3r::CalibMode::Calib_None:
|
||||||
break;
|
break;
|
||||||
case Slic3r::CalibMode::Calib_PA_Line:
|
case Slic3r::CalibMode::Calib_PA_Line:
|
||||||
if (filament_type.StartsWith("Generic")) {
|
if (filament_name.StartsWith("Generic")) {
|
||||||
filament_type.Replace("Generic", "Brand", true);
|
filament_name.Replace("Generic", "Brand", false);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case Slic3r::CalibMode::Calib_PA_Tower:
|
case Slic3r::CalibMode::Calib_PA_Tower:
|
||||||
break;
|
break;
|
||||||
case Slic3r::CalibMode::Calib_Flow_Rate:
|
case Slic3r::CalibMode::Calib_Flow_Rate:
|
||||||
filament_type += "Flow_Rate_Calibrated";
|
filament_name += " Flow Rate Calibrated";
|
||||||
break;
|
break;
|
||||||
case Slic3r::CalibMode::Calib_Temp_Tower:
|
case Slic3r::CalibMode::Calib_Temp_Tower:
|
||||||
filament_type += "Temperature_Calibrated";
|
filament_name += " Temperature Calibrated";
|
||||||
break;
|
break;
|
||||||
case Slic3r::CalibMode::Calib_Vol_speed_Tower:
|
case Slic3r::CalibMode::Calib_Vol_speed_Tower:
|
||||||
filament_type += "Max_Volumetric_Speed_Calibrated";
|
filament_name += " Max Vol Speed Calibrated";
|
||||||
break;
|
break;
|
||||||
case Slic3r::CalibMode::Calib_VFA_Tower:
|
case Slic3r::CalibMode::Calib_VFA_Tower:
|
||||||
break;
|
break;
|
||||||
|
@ -35,7 +45,7 @@ static wxString get_default_name(wxString filament_type, CalibMode mode){
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
return filament_type;
|
return filament_name;
|
||||||
}
|
}
|
||||||
|
|
||||||
CalibrationCommonSavePage::CalibrationCommonSavePage(wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style)
|
CalibrationCommonSavePage::CalibrationCommonSavePage(wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style)
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue