juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-17 18:42:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'remote/main' into dev/bbl-network-upd

Browse Source
This commit is contained in:
Noisyfox
2025-05-05 19:22:34 +08:00
parent d40be52f18 4925f65fed
commit 9b9c9ba569
4 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
flatpak/io.github.softfever.OrcaSlicer.yml
View File

@@ -298,7 +298,7 @@ modules:
- |
mkdir -p build
CXXFLAGS=-std=gnu++20 cmake . -B build \
-DSLIC3R_PCH=ON \
-DSLIC3R_PCH=OFF \
-DSLIC3R_FHS=ON \
-DSLIC3R_GTK=3 \
-DSLIC3R_STATIC=ON \

10
src/slic3r/GUI/2DBed.cpp
View File

@@ -24,10 +24,10 @@ wxPanel(parent, wxID_ANY, wxDefaultPosition, wxSize(25 * wxGetApp().em_unit(), -
#endif /*__APPLE__*/
}
int Bed_2D::calculate_grid_step(const BoundingBox& bb)
int Bed_2D::calculate_grid_step(const BoundingBox& bb, const double& scale)
{
// Orca: use 500 x 500 bed size as baseline.
int min_edge = (bb.size() / ((coord_t) scale_(1)) ).minCoeff(); // Get short edge
int min_edge = (bb.size() * (1 / scale)).minCoeff(); // Get short edge
// if the grid is too dense, we increase the step
return min_edge >= 6000 ? 100 // Short edge >= 6000mm Main Grid: 5 x 100 = 500mm
: min_edge >= 1200 ? 50 // Short edge >= 1200mm Main Grid: 5 x 50 = 250mm
@@ -35,7 +35,7 @@ int Bed_2D::calculate_grid_step(const BoundingBox& bb)
: 10; // Short edge < 600mm Main Grid: 5 x 10 = 50mm
}
std::vector<Polylines> Bed_2D::generate_grid(const ExPolygon& poly, const BoundingBox& bb, const Vec2d& origin, const float& step, const float& scale)
std::vector<Polylines> Bed_2D::generate_grid(const ExPolygon& poly, const BoundingBox& bb, const Vec2d& origin, const double& step, const double& scale)
{
Polylines lines_thin, lines_bold;
int count = 0;
@@ -157,8 +157,8 @@ void Bed_2D::repaint(const std::vector<Vec2d>& shape)
for (const Vec2d& p : shape)
bed_poly.contour.append({p(0), p(1)});
auto bed_bb = bed_poly.contour.bounding_box();
int step = calculate_grid_step(bed_bb);
auto grid_lines = generate_grid(bed_poly, bed_bb, m_pos, step, 1.0f);
int step = calculate_grid_step(bed_bb, 1.00);
auto grid_lines = generate_grid(bed_poly, bed_bb, m_pos, step, 1.00);
// clip with a slightly grown expolygon because our lines lay on the contours and may get erroneously clipped
dc.SetPen(wxPen(wxColour(lines_thin_color), 1, wxPENSTYLE_SOLID));

6
src/slic3r/GUI/2DBed.hpp
View File

@@ -3,6 +3,8 @@
#include <wx/wx.h>
#include "libslic3r/Config.hpp"
#include "libslic3r/ExPolygon.hpp"
#include "libslic3r/Polyline.hpp"
namespace Slic3r {
namespace GUI {
@@ -24,9 +26,9 @@ class Bed_2D : public wxPanel
public:
explicit Bed_2D(wxWindow* parent);
static int calculate_grid_step(const BoundingBox& bb);
static int calculate_grid_step(const BoundingBox& bb, const double& scale);
static std::vector<Polylines> generate_grid(const ExPolygon& poly, const BoundingBox& pp_bbox, const Vec2d& origin, const float& step, const float& scale);
static std::vector<Polylines> generate_grid(const ExPolygon& poly, const BoundingBox& pp_bbox, const Vec2d& origin, const double& step, const double& scale);
void repaint(const std::vector<Vec2d>& shape);
};

2
src/slic3r/GUI/PartPlate.cpp
View File

@@ -468,7 +468,7 @@ void PartPlate::calc_gridlines(const ExPolygon& poly, const BoundingBox& pp_bbox
m_gridlines_bolder.reset();
// calculate and generate grid
int step = Bed_2D::calculate_grid_step(pp_bbox);
int step = Bed_2D::calculate_grid_step(pp_bbox, scale_(1.00));
Vec2d scaled_origin = Vec2d(scale_(m_origin.x()),scale_(m_origin.x()));
auto grid_lines = Bed_2D::generate_grid(poly, pp_bbox, scaled_origin, scale_(step), SCALED_EPSILON);