Fix for win builds
This commit is contained in:
parent
c76c075569
commit
1d787a15a0
2 changed files with 3 additions and 3 deletions
|
@ -17,13 +17,13 @@ void Chart::draw(wxDC& dc) {
|
||||||
|
|
||||||
|
|
||||||
if (!m_line_to_draw->empty()) {
|
if (!m_line_to_draw->empty()) {
|
||||||
for (uint i=0;i<m_line_to_draw->size()-2;++i) {
|
for (unsigned int i=0;i<m_line_to_draw->size()-2;++i) {
|
||||||
int color = 510*((m_rect.GetBottom()-(*m_line_to_draw)[i])/double(m_rect.GetHeight()));
|
int color = 510*((m_rect.GetBottom()-(*m_line_to_draw)[i])/double(m_rect.GetHeight()));
|
||||||
dc.SetPen( wxPen( wxColor(std::min(255,color),255-std::max(color-255,0),0), 1 ) );
|
dc.SetPen( wxPen( wxColor(std::min(255,color),255-std::max(color-255,0),0), 1 ) );
|
||||||
dc.DrawLine(m_rect.GetLeft()+1+i,(*m_line_to_draw)[i],m_rect.GetLeft()+1+i,m_rect.GetBottom());
|
dc.DrawLine(m_rect.GetLeft()+1+i,(*m_line_to_draw)[i],m_rect.GetLeft()+1+i,m_rect.GetBottom());
|
||||||
}
|
}
|
||||||
dc.SetPen( wxPen( wxColor(0,0,0), 1 ) );
|
dc.SetPen( wxPen( wxColor(0,0,0), 1 ) );
|
||||||
for (uint i=0;i<m_line_to_draw->size()-2;++i) {
|
for (unsigned int i=0;i<m_line_to_draw->size()-2;++i) {
|
||||||
if (splines)
|
if (splines)
|
||||||
dc.DrawLine(m_rect.GetLeft()+i,(*m_line_to_draw)[i],m_rect.GetLeft()+i+1,(*m_line_to_draw)[i+1]);
|
dc.DrawLine(m_rect.GetLeft()+i,(*m_line_to_draw)[i],m_rect.GetLeft()+i+1,(*m_line_to_draw)[i+1]);
|
||||||
else {
|
else {
|
||||||
|
|
|
@ -111,7 +111,7 @@ private:
|
||||||
void recalculate_volume();
|
void recalculate_volume();
|
||||||
|
|
||||||
|
|
||||||
unsigned m_current_extruder = 0;
|
unsigned int m_current_extruder = 0;
|
||||||
wxRect m_rect; // rectangle on screen the chart is mapped into (screen coordinates)
|
wxRect m_rect; // rectangle on screen the chart is mapped into (screen coordinates)
|
||||||
wxPoint m_previous_mouse;
|
wxPoint m_previous_mouse;
|
||||||
std::vector< std::vector<ButtonToDrag> > m_buttons;
|
std::vector< std::vector<ButtonToDrag> > m_buttons;
|
||||||
|
|
Loading…
Reference in a new issue