GitHub-Proxy/Slic3r
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/slic3r/Slic3r.git synced 2025-08-05 20:46:06 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added point_to_model_units() and clarified a couple comments.

Browse Source
This commit is contained in:
Joseph Lenox 2018-04-30 23:38:12 -05:00 committed by Joseph Lenox
parent 1ededf8481
commit 9efe92acaa
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/GUI/Plater/Plate2D.hpp
View File

@ -14,7 +14,6 @@
#include "Plater/Plater2DObject.hpp" #include "Plater/Plater2DObject.hpp"
#include "misc_ui.hpp" #include "misc_ui.hpp"
#include "Log.hpp" #include "Log.hpp"
@ -42,7 +41,7 @@ private:
std::shared_ptr<Slic3r::Config> config; std::shared_ptr<Slic3r::Config> config;
std::shared_ptr<Settings> settings; std::shared_ptr<Settings> settings;
// Different brushes to draw with // Different brushes to draw with, initialized from settings->Color during the constructor
wxBrush objects_brush {}; wxBrush objects_brush {};
wxBrush instance_brush {}; wxBrush instance_brush {};
wxBrush selected_brush {}; wxBrush selected_brush {};
@ -76,7 +75,7 @@ private:
std::vector<wxPoint> scaled_points_to_pixel(const Slic3r::Polygon& poly, bool unscale); std::vector<wxPoint> scaled_points_to_pixel(const Slic3r::Polygon& poly, bool unscale);
std::vector<wxPoint> scaled_points_to_pixel(const Slic3r::Polyline& poly, bool unscale); std::vector<wxPoint> scaled_points_to_pixel(const Slic3r::Polyline& poly, bool unscale);
// For a specific point, unscaled it /// For a specific point, unscale it relative to the origin
wxPoint unscaled_point_to_pixel(const wxPoint& in) { wxPoint unscaled_point_to_pixel(const wxPoint& in) {
const auto& canvas_height {this->GetSize().GetHeight()}; const auto& canvas_height {this->GetSize().GetHeight()};
const auto& zero = this->bed_origin; const auto& zero = this->bed_origin;
@ -103,6 +102,20 @@ private:
const std::string LogChannel {"GUI_2D"}; const std::string LogChannel {"GUI_2D"};
Slic3r::Point point_to_model_units(coordf_t x, coordf_t y) {
const auto& zero {this->bed_origin};
return Slic3r::Point(
scale_(x - zero.x) / this->scaling_factor,
scale_(y - zero.y) / this->scaling_factor
);
}
Slic3r::Point point_to_model_units(const wxPoint& pt) {
return this->point_to_model_units(pt.x, pt.y);
}
Slic3r::Point point_to_model_units(const Pointf& pt) {
return this->point_to_model_units(pt.x, pt.y);
}
}; };
} } // Namespace Slic3r::GUI } } // Namespace Slic3r::GUI