mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-10-14 03:11:19 +00:00
merge main
This commit is contained in:
@@ -2,6 +2,7 @@
|
||||
#include "CalibUtils.hpp"
|
||||
#include "GUI.hpp"
|
||||
#include "I18N.hpp"
|
||||
#include "format.hpp"
|
||||
#include "Widgets/Label.hpp"
|
||||
#include "MsgDialog.hpp"
|
||||
#include "DeviceCore/DevConfigUtil.h"
|
||||
@@ -67,13 +68,13 @@ static wxString get_default_name(wxString filament_name, CalibMode mode){
|
||||
case Slic3r::CalibMode::Calib_PA_Tower:
|
||||
break;
|
||||
case Slic3r::CalibMode::Calib_Flow_Rate:
|
||||
filament_name += " Flow Rate Calibrated";
|
||||
filament_name = format_wxstr(_L("%1% Flow Rate Calibrated"), filament_name);
|
||||
break;
|
||||
case Slic3r::CalibMode::Calib_Temp_Tower:
|
||||
filament_name += " Temperature Calibrated";
|
||||
filament_name = format_wxstr(_L("%1% Temperature Calibrated"), filament_name);
|
||||
break;
|
||||
case Slic3r::CalibMode::Calib_Vol_speed_Tower:
|
||||
filament_name += " Max Vol Speed Calibrated";
|
||||
filament_name = format_wxstr(_L("%1% Max Vol Speed Calibrated"), filament_name);
|
||||
break;
|
||||
case Slic3r::CalibMode::Calib_VFA_Tower:
|
||||
break;
|
||||
@@ -95,7 +96,7 @@ static wxString get_tray_name_by_tray_id(int tray_id)
|
||||
{
|
||||
wxString tray_name;
|
||||
if (tray_id == VIRTUAL_TRAY_MAIN_ID || tray_id == VIRTUAL_TRAY_DEPUTY_ID) {
|
||||
tray_name = "Ext";
|
||||
tray_name = _L("Ext");
|
||||
}
|
||||
else {
|
||||
int ams_id = tray_id / 4;
|
||||
|
||||
Reference in New Issue
Block a user