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

finished pushing through changes from InstanceIdx.

Browse Source
This commit is contained in:
Joseph Lenox 2018-05-08 23:14:39 -05:00 committed by Joseph Lenox
parent 702da13458
commit a1e8aa94fd
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/GUI/Plater/Plate2D.cpp
View File

@ -264,7 +264,7 @@ void Plate2D::nudge_key(wxKeyEvent& e) {
} }
void Plate2D::nudge(MoveDirection dir) { void Plate2D::nudge(MoveDirection dir) {
if (this->selected_instance < this->objects.size()) { if (this->selected_instance.obj < this->objects.size()) {
auto i = 0U; auto i = 0U;
for (auto& obj : this->objects) { for (auto& obj : this->objects) {
if (obj.selected) { if (obj.selected) {
@ -274,7 +274,7 @@ void Plate2D::nudge(MoveDirection dir) {
i++; i++;
} }
} }
if (selected_instance >= this->objects.size()) { if (selected_instance.obj >= this->objects.size()) {
Slic3r::Log::warn(LogChannel, L"Nudge failed because there is no selected instance."); Slic3r::Log::warn(LogChannel, L"Nudge failed because there is no selected instance.");
return; // Abort return; // Abort
} }
@ -294,6 +294,7 @@ void Plate2D::update_bed_size() {
const auto& size = bb.size(); const auto& size = bb.size();
// calculate the scaling factor needed for constraining print bed area inside preview
this->scaling_factor = std::min(static_cast<double>(canvas_w) / unscale(size.x), static_cast<double>(canvas_h) / unscale(size.y)); this->scaling_factor = std::min(static_cast<double>(canvas_w) / unscale(size.x), static_cast<double>(canvas_h) / unscale(size.y));
this->bed_origin = wxPoint( this->bed_origin = wxPoint(
canvas_w / 2 - (unscale(bb.max.x + bb.min.x)/2 * this->scaling_factor), canvas_w / 2 - (unscale(bb.max.x + bb.min.x)/2 * this->scaling_factor),