3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-10 08:17:51 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

NEW:show speed and flow in gcodeviewer

Browse source 
Change-Id: I107f8be06820bc7859aee5654f264397331726b6
This commit is contained in:
liz.li 2022-09-07 17:57:38 +08:00 • committed by Lane.Wei
parent 31ba41ec3e
commit df321f8cd9
2 changed files with 41 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -302,7 +302,7 @@ void GCodeViewer::SequentialView::Marker::set_world_position(const Vec3f& positi
} }
//BBS: GUI refactor: add canvas size from parameters //BBS: GUI refactor: add canvas size from parameters
void GCodeViewer::SequentialView::Marker::render(int canvas_width, int canvas_height) const void GCodeViewer::SequentialView::Marker::render(int canvas_width, int canvas_height, const EViewType& view_type, const std::vector<GCodeProcessorResult::MoveVertex>& moves, uint64_t curr_line_id) const
{ {
if (!m_visible) if (!m_visible)
return; return;
@ -331,7 +331,7 @@ void GCodeViewer::SequentialView::Marker::render(int canvas_width, int canvas_he
static float last_window_width = 0.0f; static float last_window_width = 0.0f;
static size_t last_text_length = 0; static size_t last_text_length = 0;
if (wxGetApp().get_mode() == ConfigOptionMode::comDevelop) { //if (wxGetApp().get_mode() == ConfigOptionMode::comDevelop) {
ImGuiWrapper& imgui = *wxGetApp().imgui(); ImGuiWrapper& imgui = *wxGetApp().imgui();
//BBS: GUI refactor: add canvas size from parameters //BBS: GUI refactor: add canvas size from parameters
//Size cnv_size = wxGetApp().plater()->get_current_canvas3D()->get_canvas_size(); //Size cnv_size = wxGetApp().plater()->get_current_canvas3D()->get_canvas_size();
@ -339,9 +339,9 @@ void GCodeViewer::SequentialView::Marker::render(int canvas_width, int canvas_he
imgui.set_next_window_pos(0.5f * static_cast<float>(canvas_width), static_cast<float>(canvas_height), ImGuiCond_Always, 0.5f, 1.0f); imgui.set_next_window_pos(0.5f * static_cast<float>(canvas_width), static_cast<float>(canvas_height), ImGuiCond_Always, 0.5f, 1.0f);
ImGui::PushStyleVar(ImGuiStyleVar_WindowRounding, 0.0f); ImGui::PushStyleVar(ImGuiStyleVar_WindowRounding, 0.0f);
ImGui::SetNextWindowBgAlpha(0.25f); ImGui::SetNextWindowBgAlpha(0.25f);
imgui.begin(std::string("ExtruderPosition"), ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoMove); imgui.begin(std::string("ExtruderPosition"), ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoTitleBar);
imgui.text_colored(ImGuiWrapper::COL_ORANGE_LIGHT, _u8L("Extruder position") + ":"); //imgui.text_colored(ImGuiWrapper::COL_ORANGE_LIGHT, _u8L("Extruder position") + ":");
ImGui::SameLine(); //ImGui::SameLine();
char buf[1024]; char buf[1024];
//BBS: minus the plate offset when show tool position //BBS: minus the plate offset when show tool position
PartPlateList& partplate_list = wxGetApp().plater()->get_partplate_list(); PartPlateList& partplate_list = wxGetApp().plater()->get_partplate_list();
@ -349,7 +349,35 @@ void GCodeViewer::SequentialView::Marker::render(int canvas_width, int canvas_he
const Vec3f position = m_world_position + m_world_offset; const Vec3f position = m_world_position + m_world_offset;
sprintf(buf, "X: %.3f, Y: %.3f, Z: %.3f", position.x() - plate->get_origin().x(), position.y() - plate->get_origin().y(), position.z()); sprintf(buf, "X: %.3f, Y: %.3f, Z: %.3f", position.x() - plate->get_origin().x(), position.y() - plate->get_origin().y(), position.z());
imgui.text(std::string(buf)); imgui.text(std::string(buf));
//gcode_result.moves[i];
if (view_type == EViewType::Feedrate) {
auto it = std::find_if(moves.begin(), moves.end(), [&curr_line_id](auto move) {
if (move.gcode_id == curr_line_id)
return true;
else
return false;
});
if (it != moves.end()) {
sprintf(buf, _u8L("Speed: %.f").c_str(), it->feedrate);
ImGui::NewLine();
ImGui::SameLine((ImGui::GetWindowWidth() - ImGui::CalcTextSize(buf).x) / 2);
imgui.text(buf);
}
}
if (view_type == EViewType::VolumetricRate) {
auto it = std::find_if(moves.begin(), moves.end(), [&curr_line_id](auto move) {
if (move.gcode_id == curr_line_id)
return true;
else
return false;
});
if (it != moves.end()) {
sprintf(buf, _u8L("Flow: %.f").c_str(), it->volumetric_rate());
ImGui::NewLine();
ImGui::SameLine((ImGui::GetWindowWidth() - ImGui::CalcTextSize(buf).x) / 2);
imgui.text(buf);
}
}
// force extra frame to automatically update window size // force extra frame to automatically update window size
float width = ImGui::GetWindowWidth(); float width = ImGui::GetWindowWidth();
size_t length = strlen(buf); size_t length = strlen(buf);
@ -366,7 +394,7 @@ void GCodeViewer::SequentialView::Marker::render(int canvas_width, int canvas_he
imgui.end(); imgui.end();
ImGui::PopStyleVar(); ImGui::PopStyleVar();
} //}
} }
void GCodeViewer::SequentialView::GCodeWindow::load_gcode(const std::string& filename, std::vector<size_t> &&lines_ends) void GCodeViewer::SequentialView::GCodeWindow::load_gcode(const std::string& filename, std::vector<size_t> &&lines_ends)
@ -561,11 +589,10 @@ void GCodeViewer::SequentialView::GCodeWindow::stop_mapping_file()
BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << ": finished mapping file " << m_filename; BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << ": finished mapping file " << m_filename;
} }
} }
//BBS: GUI refactor: move to the right //BBS: GUI refactor: move to the right
void GCodeViewer::SequentialView::render(float legend_height, int canvas_width, int canvas_height) const void GCodeViewer::SequentialView::render(float legend_height, int canvas_width, int canvas_height, const EViewType& view_type, const std::vector<GCodeProcessorResult::MoveVertex>& moves) const
{ {
marker.render(canvas_width, canvas_height); marker.render(canvas_width, canvas_height, view_type, moves, static_cast<uint64_t>(gcode_ids[current.last]));
//float bottom = wxGetApp().plater()->get_current_canvas3D()->get_canvas_size().get_height(); //float bottom = wxGetApp().plater()->get_current_canvas3D()->get_canvas_size().get_height();
// BBS // BBS
#if 0 #if 0
@ -1125,7 +1152,7 @@ void GCodeViewer::render(int canvas_width, int canvas_height, int right_margin)
m_sequential_view.marker.set_world_position(m_sequential_view.current_position); m_sequential_view.marker.set_world_position(m_sequential_view.current_position);
m_sequential_view.marker.set_world_offset(m_sequential_view.current_offset); m_sequential_view.marker.set_world_offset(m_sequential_view.current_offset);
//BBS fixed buttom margin. m_moves_slider.pos_y //BBS fixed buttom margin. m_moves_slider.pos_y
m_sequential_view.render(legend_height, canvas_width - right_margin, canvas_height - bottom_margin); m_sequential_view.render(legend_height, canvas_width - right_margin, canvas_height - bottom_margin, m_view_type, m_gcode_result->moves);
//} //}
#if ENABLE_GCODE_VIEWER_STATISTICS #if ENABLE_GCODE_VIEWER_STATISTICS
render_statistics(); render_statistics();

5
src/slic3r/GUI/GCodeViewer.hpp
View file

@ -600,6 +600,7 @@ class GCodeViewer
#endif // ENABLE_GCODE_VIEWER_STATISTICS #endif // ENABLE_GCODE_VIEWER_STATISTICS
public: public:
enum class EViewType : unsigned char;
struct SequentialView struct SequentialView
{ {
class Marker class Marker
@ -626,7 +627,7 @@ public:
void set_visible(bool visible) { m_visible = visible; } void set_visible(bool visible) { m_visible = visible; }
//BBS: GUI refactor: add canvas size //BBS: GUI refactor: add canvas size
void render(int canvas_width, int canvas_height) const; void render(int canvas_width, int canvas_height, const EViewType& view_type, const std::vector<GCodeProcessorResult::MoveVertex>& moves, uint64_t curr_line_id) const;
}; };
class GCodeWindow class GCodeWindow
@ -685,7 +686,7 @@ public:
std::vector<unsigned int> gcode_ids; std::vector<unsigned int> gcode_ids;
//BBS: GUI refactor: add canvas size //BBS: GUI refactor: add canvas size
void render(float legend_height, int canvas_width, int canvas_height) const; void render(float legend_height, int canvas_width, int canvas_height, const EViewType& view_type, const std::vector<GCodeProcessorResult::MoveVertex>& moves) const;
}; };
struct ETools struct ETools