From 1d787a15a0cc3ef798bf993b8c1202d3c747bdd1 Mon Sep 17 00:00:00 2001 From: Lukas Matena Date: Thu, 1 Mar 2018 09:57:51 +0100 Subject: [PATCH] Fix for win builds --- xs/src/slic3r/GUI/RammingChart.cpp | 4 ++-- xs/src/slic3r/GUI/RammingChart.hpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xs/src/slic3r/GUI/RammingChart.cpp b/xs/src/slic3r/GUI/RammingChart.cpp index 3b5f4e41e..3b535aacf 100644 --- a/xs/src/slic3r/GUI/RammingChart.cpp +++ b/xs/src/slic3r/GUI/RammingChart.cpp @@ -17,13 +17,13 @@ void Chart::draw(wxDC& dc) { if (!m_line_to_draw->empty()) { - for (uint i=0;isize()-2;++i) { + for (unsigned int i=0;isize()-2;++i) { 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.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 ) ); - for (uint i=0;isize()-2;++i) { + for (unsigned int i=0;isize()-2;++i) { if (splines) dc.DrawLine(m_rect.GetLeft()+i,(*m_line_to_draw)[i],m_rect.GetLeft()+i+1,(*m_line_to_draw)[i+1]); else { diff --git a/xs/src/slic3r/GUI/RammingChart.hpp b/xs/src/slic3r/GUI/RammingChart.hpp index e04f4b52e..8274b96e6 100644 --- a/xs/src/slic3r/GUI/RammingChart.hpp +++ b/xs/src/slic3r/GUI/RammingChart.hpp @@ -111,7 +111,7 @@ private: 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) wxPoint m_previous_mouse; std::vector< std::vector > m_buttons;