GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-05-19 03:47:37 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Ramming chart is now drawn with double-buffering

Browse Source
This commit is contained in:
Lukas Matena 2018-04-09 14:49:32 +02:00
parent 9ebff9ce00
commit bbbb5c9a93
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
xs/src/slic3r/GUI/RammingChart.cpp
View File

@ -1,4 +1,6 @@
#include <algorithm> #include <algorithm>
#include <wx/dcbuffer.h>
#include "RammingChart.hpp" #include "RammingChart.hpp"
@ -11,7 +13,8 @@
wxDEFINE_EVENT(EVT_WIPE_TOWER_CHART_CHANGED, wxCommandEvent); wxDEFINE_EVENT(EVT_WIPE_TOWER_CHART_CHANGED, wxCommandEvent);
void Chart::draw(wxDC& dc) { void Chart::draw() {
wxAutoBufferedPaintDC dc(this); // unbuffered DC caused flickering on win
dc.SetPen(*wxBLACK_PEN); dc.SetPen(*wxBLACK_PEN);
dc.SetBrush(*wxWHITE_BRUSH); dc.SetBrush(*wxWHITE_BRUSH);
dc.DrawRectangle(m_rect); dc.DrawRectangle(m_rect);

5
xs/src/slic3r/GUI/RammingChart.hpp
View File

@ -16,6 +16,7 @@ public:
Chart(wxWindow* parent, wxRect rect,const std::vector<std::pair<float,float>>& initial_buttons,int ramming_speed_size, float sampling) : Chart(wxWindow* parent, wxRect rect,const std::vector<std::pair<float,float>>& initial_buttons,int ramming_speed_size, float sampling) :
wxWindow(parent,wxID_ANY,rect.GetTopLeft(),rect.GetSize()) wxWindow(parent,wxID_ANY,rect.GetTopLeft(),rect.GetSize())
{ {
SetBackgroundStyle(wxBG_STYLE_PAINT);
m_rect = wxRect(wxPoint(50,0),rect.GetSize()-wxSize(50,50)); m_rect = wxRect(wxPoint(50,0),rect.GetSize()-wxSize(50,50));
visible_area = wxRect2DDouble(0.0, 0.0, sampling*ramming_speed_size, 20.); visible_area = wxRect2DDouble(0.0, 0.0, sampling*ramming_speed_size, 20.);
m_buttons.clear(); m_buttons.clear();
@ -36,7 +37,7 @@ public:
std::vector<float> get_ramming_speed(float sampling) const; //returns sampled ramming speed 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 std::vector<std::pair<float,float>> get_buttons() const; // returns buttons position
void draw(wxDC& dc); void draw();
void mouse_clicked(wxMouseEvent& event); void mouse_clicked(wxMouseEvent& event);
void mouse_right_button_clicked(wxMouseEvent& event); void mouse_right_button_clicked(wxMouseEvent& event);
@ -44,7 +45,7 @@ public:
void mouse_double_clicked(wxMouseEvent& event); void mouse_double_clicked(wxMouseEvent& event);
void mouse_left_window(wxMouseEvent&) { m_dragged = nullptr; } void mouse_left_window(wxMouseEvent&) { m_dragged = nullptr; }
void mouse_released(wxMouseEvent&) { m_dragged = nullptr; } void mouse_released(wxMouseEvent&) { m_dragged = nullptr; }
void paint_event(wxPaintEvent&) { wxPaintDC dc(this); draw(dc); } void paint_event(wxPaintEvent&) { draw(); }
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()