3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2026-01-29 12:20:50 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

fix build errors

Browse source
This commit is contained in:
SoftFever 2026-01-06 16:31:54 +08:00
parent 1b355be432
commit 39df09be8b
1 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/slic3r/GUI/GCodeViewer.cpp
View file

@ -808,9 +808,9 @@ void GCodeViewer::init(ConfigOptionMode mode, PresetBundle* preset_bundle)
// Default view type at first slice.
// May be overridden in load() once we know how many tools are actually used in the G-code.
m_nozzle_nums = preset_bundle ? preset_bundle->get_printer_extruder_count() : 1;
auto it = std::find(view_type_items.begin(), view_type_items.end(), EViewType::FeatureType);
auto it = std::find(view_type_items.begin(), view_type_items.end(), libvgcode::EViewType::FeatureType);
m_view_type_sel = (it != view_type_items.end()) ? std::distance(view_type_items.begin(), it) : 0;
set_view_type(EViewType::FeatureType);
set_view_type(libvgcode::EViewType::FeatureType);
BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << boost::format(": finished");
}
@ -1083,20 +1083,20 @@ void GCodeViewer::load_as_gcode(const GCodeProcessorResult& gcode_result, const
m_max_print_height = gcode_result.printable_height;
m_z_offset = gcode_result.z_offset;
load_toolpaths(gcode_result, build_volume, exclude_bounding_box);
// load_toolpaths(gcode_result, build_volume, exclude_bounding_box);
// ORCA: Only show filament/color print preview if more than one tool/extruder is actually used in the toolpaths.
// Only reset back to Toolpaths (FeatureType) if we are currently in ColorPrint and this load is single-tool.
if (m_extruder_ids.size() > 1) {
auto it = std::find(view_type_items.begin(), view_type_items.end(), EViewType::ColorPrint);
if (m_viewer.get_used_extruders_count() > 1) {
auto it = std::find(view_type_items.begin(), view_type_items.end(), libvgcode::EViewType::ColorPrint);
if (it != view_type_items.end())
m_view_type_sel = std::distance(view_type_items.begin(), it);
set_view_type(EViewType::ColorPrint);
} else if (m_view_type == EViewType::ColorPrint) {
auto it = std::find(view_type_items.begin(), view_type_items.end(), EViewType::FeatureType);
set_view_type(libvgcode::EViewType::ColorPrint);
} else if (get_view_type() == libvgcode::EViewType::ColorPrint) {
auto it = std::find(view_type_items.begin(), view_type_items.end(), libvgcode::EViewType::FeatureType);
if (it != view_type_items.end())
m_view_type_sel = std::distance(view_type_items.begin(), it);
set_view_type(EViewType::FeatureType);
set_view_type(libvgcode::EViewType::FeatureType);
}
// BBS: data for rendering color arrangement recommendation