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

Merge branch 'main' of https://github.com/QIDITECH/QIDISlicer

Browse Source
This commit is contained in:
76Octane
2023-06-26 17:01:40 +08:00
parent fb5f0c9278 db45fc10ff
commit ea8bd92e15
11 changed files with 698 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/CMakeLists.txt
View File

@@ -62,14 +62,7 @@ if (SLIC3R_GUI)
include(${wxWidgets_USE_FILE})
else ()
find_package(wxWidgets 3.1 COMPONENTS html adv gl core base)
if (NOT wxWidgets_FOUND)
message(STATUS "Trying to find wxWidgets in CONFIG mode...")
find_package(wxWidgets 3.2 CONFIG REQUIRED COMPONENTS html adv gl core base)
slic3r_remap_configs(wx::wxhtml wx::wxadv wx::wxgl wx::wxcore wx::wxbase RelWithDebInfo Release)
else ()
include(${wxWidgets_USE_FILE})
endif ()
find_package(wxWidgets 3.2 REQUIRED COMPONENTS html adv gl core base webview aui net media)
endif ()
if(UNIX)

2
src/slic3r/GUI/PresetHints.cpp
View File

@@ -342,7 +342,7 @@ std::string PresetHints::anneal_temperature_description(const Preset &preset)
else {
int filament_property_anneal_temperature = preset.config.option<ConfigOptionIntsNullable>("filament_property_anneal_temperature")->get_at(0);
int filament_property_anneal_temperature_max = filament_property_anneal_temperature + 20;
out += GUI::format(_L("Annealing the model immediately after printing can further improve the mechanical properties of %1%.\n"
out += GUI::format(_L("Annealing the model immediately after printing can further improve the physical properties of %1%.\n"
"Put the model in a drying oven and set it at %2%-%3% °C for 4-6 hours."),
filament_type, filament_property_anneal_temperature, filament_property_anneal_temperature_max);
}