mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX:only show the material used in the actual printing 

Change-Id: I44edd5ffb54376da91077e2e3d990851af050949
This commit is contained in:
tao wang 2022-09-13 14:41:09 +08:00 committed by Lane.Wei
parent 07d234825e
commit b9b3f7b4c1
3 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/slic3r/GUI/GCodeViewer.cpp
View File

@ -831,6 +831,11 @@ void GCodeViewer::update_by_mode(ConfigOptionMode mode)
} }
} }
std::vector<int> GCodeViewer::get_plater_extruder()
{
return m_plater_extruder;
}
//BBS: always load shell at preview //BBS: always load shell at preview
void GCodeViewer::load(const GCodeProcessorResult& gcode_result, const Print& print, const BuildVolume& build_volume, void GCodeViewer::load(const GCodeProcessorResult& gcode_result, const Print& print, const BuildVolume& build_volume,
const std::vector<BoundingBoxf3>& exclude_bounding_box, bool initialized, ConfigOptionMode mode, bool only_gcode) const std::vector<BoundingBoxf3>& exclude_bounding_box, bool initialized, ConfigOptionMode mode, bool only_gcode)
@ -2924,6 +2929,14 @@ void GCodeViewer::load_toolpaths(const GCodeProcessorResult& gcode_result, const
sort_remove_duplicates(m_extruder_ids); sort_remove_duplicates(m_extruder_ids);
m_extruder_ids.shrink_to_fit(); m_extruder_ids.shrink_to_fit();
std::vector<int> plater_extruder;
for (auto mid : m_extruder_ids){
int eid = mid;
plater_extruder.push_back(++eid);
}
m_plater_extruder = plater_extruder;
// set layers z range // set layers z range
if (!m_layers.empty()) if (!m_layers.empty())
m_layers_z_range = { 0, static_cast<unsigned int>(m_layers.size() - 1) }; m_layers_z_range = { 0, static_cast<unsigned int>(m_layers.size() - 1) };

2
src/slic3r/GUI/GCodeViewer.hpp
View File

@ -711,6 +711,7 @@ public:
}; };
private: private:
std::vector<int> m_plater_extruder;
bool m_gl_data_initialized{ false }; bool m_gl_data_initialized{ false };
unsigned int m_last_result_id{ 0 }; unsigned int m_last_result_id{ 0 };
size_t m_moves_count{ 0 }; size_t m_moves_count{ 0 };
@ -800,6 +801,7 @@ public:
bool has_data() const { return !m_roles.empty(); } bool has_data() const { return !m_roles.empty(); }
bool can_export_toolpaths() const; bool can_export_toolpaths() const;
std::vector<int> get_plater_extruder();
const BoundingBoxf3& get_paths_bounding_box() const { return m_paths_bounding_box; } const BoundingBoxf3& get_paths_bounding_box() const { return m_paths_bounding_box; }
const BoundingBoxf3& get_max_bounding_box() const { return m_max_bounding_box; } const BoundingBoxf3& get_max_bounding_box() const { return m_max_bounding_box; }

4
src/slic3r/GUI/SelectMachine.cpp
View File

@ -2214,7 +2214,9 @@ void SelectMachineDialog::set_default()
} }
// material info // material info
auto extruders = m_plater->get_partplate_list().get_curr_plate()->get_extruders();
//auto extruders1 = m_plater->get_partplate_list().get_curr_plate()->get_extruders();
auto extruders = wxGetApp().plater()->get_current_canvas3D()->get_gcode_viewer().get_plater_extruder();
BitmapCache bmcache; BitmapCache bmcache;
MaterialHash::iterator iter = m_materialList.begin(); MaterialHash::iterator iter = m_materialList.begin();