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

fix linux build

Browse Source
This commit is contained in:
supermerill 2020-05-21 00:18:38 +02:00
parent cad02c7464
commit 9821da6609
4 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/slic3r/GUI/CalibrationBedDialog.cpp
View File

@ -7,7 +7,6 @@
#include <wx/scrolwin.h>
#include <wx/display.h>
#include <wx/file.h>
#include <cmath>
#include "wxExtensions.hpp"
#if ENABLE_SCROLLABLE
@ -121,8 +120,8 @@ void CalibrationBedDialog::create_geometry(wxCommandEvent& event_args) {
float offsetx = 10 + 10 * xyScale;
float offsety = 10 + 10 * xyScale;
if (bed_shape->values.size() > 4) {
offsetx = bed_size.x() / 2 - bed_size.x() * std::sqrtf(2) / 4 + 10 * xyScale;
offsety = bed_size.y() / 2 - bed_size.y() * std::sqrtf(2) / 4 + 10 * xyScale;
offsetx = bed_size.x() / 2 - bed_size.x() * 1.414 / 4 + 10 * xyScale;
offsety = bed_size.y() / 2 - bed_size.y() * 1.414 / 4 + 10 * xyScale;
}
bool large_enough = bed_shape->values.size() == 4 ?
(bed_size.x() > offsetx * 3 && bed_size.y() > offsety * 3) :

6
src/slic3r/GUI/CalibrationBridgeDialog.cpp
View File

@ -2,7 +2,7 @@
#include "I18N.hpp"
#include "libslic3r/Utils.hpp"
#include "GUI.hpp"
#include "tab.hpp"
#include "Tab.hpp"
#include <wx/scrolwin.h>
#include <wx/display.h>
#include <wx/file.h>
@ -105,8 +105,8 @@ void CalibrationBridgeDialog::create_geometry(wxCommandEvent& event_args) {
float offsetx = 10 + 10 * xyScale;
float offsety = 10 + 10 * xyScale;
if (bed_shape->values.size() > 4) {
offsetx = bed_size.x() / 2 - bed_size.x() * std::sqrtf(2) / 4 + 10 * xyScale;
offsety = bed_size.y() / 2 - bed_size.y() * std::sqrtf(2) / 4 + 10 * xyScale;
offsetx = bed_size.x() / 2 - bed_size.x() * 1.412 / 4 + 10 * xyScale;
offsety = bed_size.y() / 2 - bed_size.y() * 1.412 / 4 + 10 * xyScale;
}
bool large_enough = bed_shape->values.size() == 4 ?
(bed_size.x() > offsetx * 3 && bed_size.y() > offsety * 3) :

1
src/slic3r/GUI/CalibrationFlowDialog.cpp
View File

@ -1,7 +1,6 @@
#include "CalibrationFlowDialog.hpp"
#include "I18N.hpp"
#include "libslic3r/Utils.hpp"
#include "GLCanvas3D.hpp "
#include "GUI.hpp"
#include "GUI_ObjectList.hpp"
#include "Tab.hpp"

1
src/slic3r/GUI/CalibrationTempDialog.cpp
View File

@ -1,7 +1,6 @@
#include "CalibrationTempDialog.hpp"
#include "I18N.hpp"
#include "libslic3r/Utils.hpp"
#include "GLCanvas3D.hpp "
#include "GUI.hpp"
#include "GUI_ObjectList.hpp"
#include "Tab.hpp"