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

Started to move ramming dialog into filament settings

Browse source
This commit is contained in:
Lukas Matena 2018-03-13 15:54:29 +01:00
parent 27ab8ff4e1
commit cf5dfb9673
5 changed files with 135 additions and 159 deletions
Download patch file Download diff file Expand all files Collapse all files

61
xs/src/slic3r/GUI/RammingChart.hpp
View file

@ -13,39 +13,28 @@ wxDECLARE_EVENT(EVT_WIPE_TOWER_CHART_CHANGED, wxCommandEvent);
class Chart : public wxWindow {
public:
Chart(wxWindow* parent, wxRect rect,const std::vector<std::vector<std::pair<float,float>>>& initial_buttons,std::vector<std::vector<float>> ramming_speed, float sampling) :
Chart(wxWindow* parent, wxRect rect,const std::vector<std::pair<float,float>>& initial_buttons,std::vector<float> ramming_speed, float sampling) :
wxWindow(parent,wxID_ANY,rect.GetTopLeft(),rect.GetSize())
{
m_rect=wxRect(wxPoint(30,0),rect.GetSize()-wxSize(30,30));
for (int i=0;i<4;++i) {
visible_areas.push_back(wxRect2DDouble(0.0, 0.0, sampling*ramming_speed[i].size(), 20.));
m_buttons.push_back(std::vector<ButtonToDrag>());
m_lines_to_draw.push_back(std::vector<int>());
if (initial_buttons.size()>0)
for (const auto& pair : initial_buttons[i])
m_buttons.back().push_back(wxPoint2DDouble(pair.first,pair.second));
set_extruder(i); // to calculate all interpolating splines
}
set_extruder(0);
}
void set_extruder(unsigned ext) {
if (ext>=4) return;
m_current_extruder = ext;
visible_area = &(visible_areas[ext]);
m_line_to_draw = &(m_lines_to_draw[ext]);
visible_area = wxRect2DDouble(0.0, 0.0, sampling*ramming_speed.size(), 20.);
m_buttons.clear();
if (initial_buttons.size()>0)
for (const auto& pair : initial_buttons)
m_buttons.push_back(wxPoint2DDouble(pair.first,pair.second));
recalculate_line();
}
void set_xy_range(float x,float y) {
x = int(x/0.5) * 0.5;
if (x>=0) visible_area->SetRight(x);
if (y>=0) visible_area->SetBottom(y);
if (x>=0) visible_area.SetRight(x);
if (y>=0) visible_area.SetBottom(y);
recalculate_line();
}
float get_volume() const { return m_total_volume; }
float get_time() const { return visible_area->m_width; }
std::vector<std::vector<float>> get_ramming_speeds(float sampling) const; //returns sampled ramming speed for all extruders
std::vector<std::vector<std::pair<float,float>>> get_buttons() const; // returns buttons position for all extruders
float get_time() const { return visible_area.m_width; }
std::vector<float> get_ramming_speed(float sampling) const; //returns sampled ramming speed
std::vector<std::pair<float,float>> get_buttons() const; // returns buttons position
void draw(wxDC& dc);
@ -80,8 +69,8 @@ private:
wxPoint math_to_screen(const wxPoint2DDouble& math) const {
wxPoint screen;
screen.x = (math.m_x-visible_area->m_x) * (m_rect.GetWidth() / visible_area->m_width );
screen.y = (math.m_y-visible_area->m_y) * (m_rect.GetHeight() / visible_area->m_height );
screen.x = (math.m_x-visible_area.m_x) * (m_rect.GetWidth() / visible_area.m_width );
screen.y = (math.m_y-visible_area.m_y) * (m_rect.GetHeight() / visible_area.m_height );
screen.y *= -1;
screen += m_rect.GetLeftBottom();
return screen;
@ -90,16 +79,16 @@ private:
wxPoint2DDouble math = screen;
math -= m_rect.GetLeftBottom();
math.m_y *= -1;
math.m_x *= visible_area->m_width / m_rect.GetWidth(); // scales to [0;1]x[0,1]
math.m_y *= visible_area->m_height / m_rect.GetHeight();
return (math+visible_area->GetLeftTop());
math.m_x *= visible_area.m_width / m_rect.GetWidth(); // scales to [0;1]x[0,1]
math.m_y *= visible_area.m_height / m_rect.GetHeight();
return (math+visible_area.GetLeftTop());
}
int which_button_is_clicked(const wxPoint& point) const {
if (!m_rect.Contains(point))
return -1;
for (unsigned int i=0;i<m_buttons[m_current_extruder].size();++i) {
wxRect rect(math_to_screen(m_buttons[m_current_extruder][i].get_pos())-wxPoint(side/2.,side/2.),wxSize(side,side)); // bounding rectangle of this button
for (unsigned int i=0;i<m_buttons.size();++i) {
wxRect rect(math_to_screen(m_buttons[i].get_pos())-wxPoint(side/2.,side/2.),wxSize(side,side)); // bounding rectangle of this button
if ( rect.Contains(point) )
return i;
}
@ -111,17 +100,13 @@ private:
void recalculate_volume();
unsigned int m_current_extruder = 0;
wxRect m_rect; // rectangle on screen the chart is mapped into (screen coordinates)
wxPoint m_previous_mouse;
std::vector< std::vector<ButtonToDrag> > m_buttons;
std::vector< std::vector<int> > m_lines_to_draw;
std::vector< wxRect2DDouble > visible_areas;
wxRect2DDouble* visible_area = nullptr;
std::vector<int>* m_line_to_draw = nullptr;
std::vector<ButtonToDrag> m_buttons;
std::vector<int> m_line_to_draw;
wxRect2DDouble visible_area;
ButtonToDrag* m_dragged = nullptr;
float m_total_volume = 0.f;
float m_total_volume = 0.f;
};