-
-
-
+
| - |
|---|
+
-
+
+
+
+
+
+ | + |
|---|
+
+ Flushing volume (mm³) for each filament pair.
+
+
+ Suggestion: Flushing Volume in range [50, 999]
+
+
+
+
+
+
+ The multiplier should be in range [0.50, 3.00].
+
+
-
- Flushing volume (mm³) for each filament pair.
-
-
- Suggestion: Flushing Volume in range [50, 999]
-
-
-
-
-
-
- The multiplier should be in range [0.50, 3.00].
-
-
Save
diff --git a/resources/web/homepage/css/dark.css b/resources/web/homepage/css/dark.css
index ef94e20ce8..d4950c9c80 100644
--- a/resources/web/homepage/css/dark.css
+++ b/resources/web/homepage/css/dark.css
@@ -129,7 +129,12 @@ body
border: 1px solid rgba(129, 129, 131, 0.64);
}
+/*--- Account Sections ---*/
+.AccountSectionLabel { color: #818183; }
+.OrcaAccountText { color: #efeff0; }
+.AccountStatusText { color: #818183; }
+
/*--- Bambu Cloud Section ---*/
#BambuCloudHeader { color: #818183; }
#BambuCloudHeader:hover { color: #efeff0; }
-.bambu-chevron svg path { stroke: currentColor; }
\ No newline at end of file
+.bambu-chevron svg path { stroke: currentColor; }
diff --git a/resources/web/homepage/css/home.css b/resources/web/homepage/css/home.css
index 2bcc18451f..e99d22ec64 100644
--- a/resources/web/homepage/css/home.css
+++ b/resources/web/homepage/css/home.css
@@ -80,7 +80,6 @@ body
#LoginArea
{
- min-height: 180px;
display: flex;
flex-direction: column;
align-items: center;
@@ -89,6 +88,38 @@ body
width:262px;
}
+.AccountSectionLabel
+{
+ display: flex;
+ align-items: center;
+ gap: 8px;
+ font-size: 13px;
+ font-weight: 600;
+ color: var(--fg-color-text);
+ padding: 16px 20px 6px;
+ width: 262px;
+ box-sizing: border-box;
+}
+
+.AccountSectionIcon
+{
+ width: 18px;
+ height: 18px;
+ flex: 0 0 auto;
+}
+
+.AccountStatusText
+{
+ font-size: 12px;
+ color: #A8A8A8;
+ margin-top: 8px;
+}
+
+.OrcaAccountText
+{
+ font-weight: bold;
+}
+
#OrcaLoginSection
{
display: flex;
diff --git a/resources/web/homepage/index.html b/resources/web/homepage/index.html
index e768c6b953..24eb8285a7 100644
--- a/resources/web/homepage/index.html
+++ b/resources/web/homepage/index.html
@@ -24,11 +24,17 @@
-
-
- 
-
+ login / register
-
+ 
+ Orca Cloud
+
+
+
+ Orca Cloud
+
+
+
+
login / register
+ Not signed in
+
@@ -261,4 +267,3 @@
-
diff --git a/resources/web/homepage/js/home.js b/resources/web/homepage/js/home.js
index 72789cc088..f522c44bed 100644
--- a/resources/web/homepage/js/home.js
+++ b/resources/web/homepage/js/home.js
@@ -173,6 +173,7 @@ function GotoMenu( strMenu )
function SetOrcaLoginInfo( strAvatar, strName )
{
$("#OrcaLogin1").hide();
+ $("#OrcaStatusText").hide();
$("#UserName").text(strName);
@@ -196,6 +197,7 @@ function SetOrcaUserOffline()
$("#OrcaLogin1").show();
$("#OrcaLogin1").css("display","flex");
+ $("#OrcaStatusText").show();
}
function SetMallUrl( strUrl )
@@ -437,6 +439,8 @@ function SetBambuLoginInfo(strAvatar, strName) {
$("#BambuLogin2").show();
$("#BambuLogin2").css("display", "flex");
$(".bambu-status-dot").addClass("online");
+ $("#BambuStatusText").text("Connected");
+ $("#BambuStatusText").attr("tid", "orca11");
}
function SetBambuUserOffline() {
@@ -448,6 +452,8 @@ function SetBambuUserOffline() {
$("#BambuLogin1").css("display", "flex");
}
$(".bambu-status-dot").removeClass("online");
+ $("#BambuStatusText").text("Not connected");
+ $("#BambuStatusText").attr("tid", "orca10");
}
function OnBambuLoginOrRegister() { SendSimpleCommand("homepage_bambu_login_or_register"); }
diff --git a/src/libslic3r/Fill/Fill.cpp b/src/libslic3r/Fill/Fill.cpp
index 74e6d14d14..d47518bbca 100644
--- a/src/libslic3r/Fill/Fill.cpp
+++ b/src/libslic3r/Fill/Fill.cpp
@@ -271,6 +271,9 @@ struct SurfaceFillParams
// Params for Lateral honeycomb
float infill_overhang_angle = 60.f;
+ // For Gyroid: when true, use the parameterized "optimized" wave.
+ bool gyroid_optimized = false;
+
bool operator<(const SurfaceFillParams &rhs) const {
#define RETURN_COMPARE_NON_EQUAL(KEY) if (this->KEY < rhs.KEY) return true; if (this->KEY > rhs.KEY) return false;
#define RETURN_COMPARE_NON_EQUAL_TYPED(TYPE, KEY) if (TYPE(this->KEY) < TYPE(rhs.KEY)) return true; if (TYPE(this->KEY) > TYPE(rhs.KEY)) return false;
@@ -303,6 +306,7 @@ struct SurfaceFillParams
RETURN_COMPARE_NON_EQUAL(symmetric_infill_y_axis);
RETURN_COMPARE_NON_EQUAL(infill_lock_depth);
RETURN_COMPARE_NON_EQUAL(skin_infill_depth); RETURN_COMPARE_NON_EQUAL(infill_overhang_angle);
+ RETURN_COMPARE_NON_EQUAL(gyroid_optimized);
return false;
}
@@ -330,7 +334,8 @@ struct SurfaceFillParams
this->lateral_lattice_angle_2 == rhs.lateral_lattice_angle_2 &&
this->infill_lock_depth == rhs.infill_lock_depth &&
this->skin_infill_depth == rhs.skin_infill_depth &&
- this->infill_overhang_angle == rhs.infill_overhang_angle;
+ this->infill_overhang_angle == rhs.infill_overhang_angle &&
+ this->gyroid_optimized == rhs.gyroid_optimized;
}
};
@@ -920,6 +925,12 @@ std::vector group_fills(const Layer &layer, LockRegionParam &lock_p
// Orca: apply fill multiline only for sparse infill
params.multiline = params.extrusion_role == erInternalInfill ? int(region_config.fill_multiline) : 1;
+ // Pass through gyroid_optimized only when the effective pattern is Gyroid,
+ // so non-Gyroid fills do not differ in SurfaceFillParams by an irrelevant flag
+ // (which would unnecessarily split fill batching).
+ // Stored on SurfaceFillParams; copied to FillParams during conversion.
+ params.gyroid_optimized = (params.pattern == ipGyroid) && region_config.gyroid_optimized;
+
if (params.extrusion_role == erInternalInfill) {
params.angle = calculate_infill_rotation_angle(layer.object(), layer.id(), region_config.infill_direction.value,
region_config.sparse_infill_rotate_template.value);
@@ -1273,6 +1284,7 @@ void Layer::make_fills(FillAdaptive::Octree* adaptive_fill_octree, FillAdaptive:
params.lateral_lattice_angle_1 = surface_fill.params.lateral_lattice_angle_1;
params.lateral_lattice_angle_2 = surface_fill.params.lateral_lattice_angle_2;
params.infill_overhang_angle = surface_fill.params.infill_overhang_angle;
+ params.gyroid_optimized = surface_fill.params.gyroid_optimized;
// BBS
params.flow = surface_fill.params.flow;
@@ -1468,6 +1480,7 @@ Polylines Layer::generate_sparse_infill_polylines_for_anchoring(FillAdaptive::Oc
params.lateral_lattice_angle_2 = surface_fill.params.lateral_lattice_angle_2;
params.infill_overhang_angle = surface_fill.params.infill_overhang_angle;
params.multiline = surface_fill.params.multiline;
+ params.gyroid_optimized = surface_fill.params.gyroid_optimized;
for (ExPolygon &expoly : surface_fill.expolygons) {
// Spacing is modified by the filler to indicate adjustments. Reset it for each expolygon.
diff --git a/src/libslic3r/Fill/FillBase.hpp b/src/libslic3r/Fill/FillBase.hpp
index 47195c850d..ef6a6bc804 100644
--- a/src/libslic3r/Fill/FillBase.hpp
+++ b/src/libslic3r/Fill/FillBase.hpp
@@ -79,6 +79,9 @@ struct FillParams
// Layer height for Concentric infill with Arachne.
coordf_t layer_height { 0.f };
+ // For Gyroid: when true, use the parameterized "optimized" variant.
+ bool gyroid_optimized { false };
+
// For Lateral lattice
coordf_t lateral_lattice_angle_1 { 0.f };
coordf_t lateral_lattice_angle_2 { 0.f };
diff --git a/src/libslic3r/Fill/FillGyroid.cpp b/src/libslic3r/Fill/FillGyroid.cpp
index 8700c1746e..c740dd2b4b 100644
--- a/src/libslic3r/Fill/FillGyroid.cpp
+++ b/src/libslic3r/Fill/FillGyroid.cpp
@@ -1,4 +1,5 @@
#include "../ClipperUtils.hpp"
+#include "../MarchingSquares.hpp"
#include "../ShortestPath.hpp"
#include "../Surface.hpp"
#include
@@ -7,6 +8,99 @@
#include "FillBase.hpp"
#include "FillGyroid.hpp"
+// ---------------------------------------------------------------------------
+// Marching-squares scalar field for the optimized gyroid branch.
+// Modeled after FillTpmsFK.cpp's ScalarField.
+//
+// The gyroid scalar field is the standard implicit equation
+// F(x,y,z) = sin(fx*x)cos(fy*y) + sin(fy*y)cos(fz*z) + sin(fz*z)cos(fx*x)
+// Marching squares extracts the iso-zero contour, which gives smoother
+// transitions between vertical and horizontal regimes than the analytical
+// asin-based wave generator. Setting fz = omega * baseline anisotropically
+// tightens the wave along the layer-stacking axis, shortening the effective
+// vertical strand length and improving column-buckling resistance under
+// Z-axis compression.
+// ---------------------------------------------------------------------------
+namespace marchsq {
+using namespace Slic3r;
+
+using coordr_t = long;
+using Pointf = Vec2d;
+
+struct GyroidField
+{
+ static constexpr float gsizef = 0.40f;
+ static constexpr float rsizef = 0.004f;
+ const coord_t rsize = scaled(rsizef);
+ const coordr_t gsize = std::round(gsizef / rsizef);
+ Point size;
+ Point offs;
+ coordf_t z;
+ float fx;
+ float fy;
+ float fz;
+ float isoval = 0.0f;
+
+ explicit GyroidField(const BoundingBox bb, const coordf_t z, const float period, const float omega = 1.0f)
+ : size{bb.size()}, offs{bb.min}, z{z}
+ {
+ const float baseline = float(2.0 * PI) / std::max(period, 1e-3f);
+ fx = baseline;
+ fy = baseline;
+ fz = omega * baseline;
+ }
+
+ float get_scalar(coordf_t x, coordf_t y, coordf_t z_arg) const
+ {
+ const float a = fx * float(x);
+ const float b = fy * float(y);
+ const float c = fz * float(z_arg);
+ return std::sin(a) * std::cos(b) + std::sin(b) * std::cos(c) + std::sin(c) * std::cos(a);
+ }
+
+ float get_scalar(Coord p) const
+ {
+ Pointf pf = to_Pointf(p);
+ return get_scalar(pf.x(), pf.y(), z);
+ }
+
+ inline coord_t to_coord (const coordr_t& x) const { return x * rsize; }
+ inline coordr_t to_coordr(const coord_t& x) const { return x / rsize; }
+ inline Point to_Point (const Coord& p) const { return Point(to_coord(p.c) + offs.x(), to_coord(p.r) + offs.y()); }
+ inline Coord to_Coord (const Point& p) const { return Coord(to_coordr(p.y() - offs.y()), to_coordr(p.x() - offs.x())); }
+ inline Pointf to_Pointf(const Point& p) const { return Pointf(unscaled(p.x()), unscaled(p.y())); }
+ inline Pointf to_Pointf(const Coord& p) const { return to_Pointf(to_Point(p)); }
+};
+
+template<> struct _RasterTraits
+{
+ using ValueType = float;
+ static float get (const GyroidField& sf, size_t row, size_t col) { return sf.get_scalar(Coord(row, col)); }
+ static size_t rows(const GyroidField& sf) { return sf.to_coordr(sf.size.y()); }
+ static size_t cols(const GyroidField& sf) { return sf.to_coordr(sf.size.x()); }
+};
+
+inline Polylines get_gyroid_polylines(const GyroidField& sf, const double tolerance = SCALED_EPSILON)
+{
+ std::vector rings = execute_with_policy(ex_tbb, sf, sf.isoval, {sf.gsize, sf.gsize});
+ Polylines polys;
+ polys.reserve(rings.size());
+ for (const Ring& ring : rings) {
+ Polyline poly;
+ Points& pts = poly.points;
+ pts.reserve(ring.size() + 1);
+ for (const Coord& crd : ring)
+ pts.emplace_back(sf.to_Point(crd));
+ pts.push_back(pts.front());
+ if (tolerance >= 0.0)
+ poly.simplify(tolerance);
+ polys.emplace_back(poly);
+ }
+ return polys;
+}
+
+} // namespace marchsq
+
namespace Slic3r {
static inline double f(double x, double z_sin, double z_cos, bool vertical, bool flip)
@@ -102,6 +196,49 @@ static std::vector make_one_period(double width, double scaleFactor, doub
return points;
}
+// ---------------------------------------------------------------------------
+// "Optimized" gyroid wave: marching-squares variant gated on
+// params.gyroid_optimized. The wave shape is extracted from the gyroid
+// implicit scalar field (see marchsq::GyroidField above) at iso=0, with
+// the Z dimension's spatial frequency multiplied by an Euler-Bernoulli
+// buckling-derived factor so the vertical strands become shorter columns,
+// raising the critical buckling load against Z-axis compression.
+//
+// The formula is INVERTED from a naive "scale with density" derivation:
+// at LOW density the gyroid strands are long and slender (prime buckling
+// targets), so they need the most shortening; at high density the strands
+// are already short and need little extra help. omega is therefore the
+// inverse-square-root of density_adjusted:
+//
+// omega = sqrt(1 / density_adj) / sqrt(1 + layer_h/spacing),
+// clamped [1.0, 2.0]
+//
+// fx and fy are left at the baseline frequency, so the per-XY-slice line
+// length per unit area is preserved -> mass at the same `sparse_infill_density`
+// setting matches the standard gyroid path. Strength gain comes purely from
+// the shorter vertical column length (P_cr proportional to 1/L^2).
+//
+// Empirical Python sim (sim_gyroid_compare.py) at layer_h=0.20, spacing=0.45:
+//
+// density omega line/std strength/std strength_per_mass
+// 10% 2.00 1.00 2.84 2.84
+// 15% 1.38 1.00 1.89 1.89
+// 20% 1.19 1.00 1.42 1.42
+// 30% 1.00 1.00 1.00 1.00
+// 50%+ 1.00 1.00 1.00 1.00
+//
+// When gyroid_optimized is false, behavior is byte-identical to the
+// standard parametric gyroid path below.
+// ---------------------------------------------------------------------------
+
+static inline double compute_omega_factor(double density_adjusted, double line_spacing, double layer_height)
+{
+ double lh_ratio = (line_spacing > 0.) ? layer_height / line_spacing : 0.5;
+ double correction = 1.0 / std::sqrt(1.0 + lh_ratio);
+ double raw = std::sqrt(1.0 / std::max(density_adjusted, 0.1)) * correction;
+ return std::clamp(raw, 1.0, 2.0);
+}
+
static Polylines make_gyroid_waves(double gridZ, double density_adjusted, double line_spacing, double width, double height)
{
const double scaleFactor = scale_(line_spacing) / density_adjusted;
@@ -173,16 +310,41 @@ void FillGyroid::_fill_surface_single(
bb.offset(expand);
// generate pattern
- Polylines polylines = make_gyroid_waves(
- scale_(this->z),
- density_adjusted,
- this->spacing,
- ceil(bb.size()(0) / distance) + 1.,
- ceil(bb.size()(1) / distance) + 1.);
+ Polylines polylines;
+ if (params.gyroid_optimized) {
+ // Marching-squares path on the gyroid implicit field. Base period matches
+ // the standard parametric path's wavelength: 2*pi * spacing / density_adj.
+ // omega >= 1 always, so fz >= baseline -> shorter vertical wavelength ->
+ // shorter effective column length -> higher buckling resistance.
+ //
+ // Mass: fx and fy are left at baseline (same as standard), so the
+ // per-XY-slice line length per unit area is approximately preserved.
+ // Empirically (sim_gyroid_compare.py) the optimized line/std ratio is
+ // ~1.000 across densities, so no period compensation is needed.
+ const double lh = (params.layer_height > 0.) ? double(params.layer_height) : double(this->spacing);
+ const double omega = compute_omega_factor(density_adjusted, this->spacing * params.multiline, lh);
- // shift the polyline to the grid origin
- for (Polyline &pl : polylines)
- pl.translate(bb.min);
+ const float density_factor = std::max(0.001f, float(params.density * DensityAdjust / params.multiline));
+ const float period = float(2.0 * M_PI) * float(this->spacing) / density_factor;
+
+ // bb is already expanded above by 10 * scale_(spacing) for edge artifacts;
+ // skip a second offset here to avoid raster-area bloat in the marching squares pass.
+ marchsq::GyroidField sf(bb, this->z, period, float(omega));
+ polylines = marchsq::get_gyroid_polylines(sf, SCALED_SPARSE_INFILL_RESOLUTION);
+ } else {
+ polylines = make_gyroid_waves(
+ scale_(this->z),
+ density_adjusted,
+ this->spacing,
+ ceil(bb.size()(0) / distance) + 1.,
+ ceil(bb.size()(1) / distance) + 1.);
+
+ // The parametric generator produces wave coords relative to the grid origin;
+ // shift them into absolute layer coords. The marching-squares branch above
+ // already emits absolute coords via GyroidField::to_Point, so it skips this.
+ for (Polyline &pl : polylines)
+ pl.translate(bb.min);
+ }
// Apply multiline offset if needed
multiline_fill(polylines, params, spacing);
diff --git a/src/libslic3r/Preset.cpp b/src/libslic3r/Preset.cpp
index 68f103fdc2..ade6f42c29 100644
--- a/src/libslic3r/Preset.cpp
+++ b/src/libslic3r/Preset.cpp
@@ -1008,6 +1008,7 @@ static std::vector s_Preset_print_options{
"is_infill_first",
"sparse_infill_density",
"fill_multiline",
+ "gyroid_optimized",
"sparse_infill_pattern",
"lateral_lattice_angle_1",
"lateral_lattice_angle_2",
@@ -2259,6 +2260,10 @@ bool PresetCollection::load_user_preset(std::string name, std::mapname == m_edited_preset.name && iter->is_dirty) {
// Keep modifies when update from remote
new_config.apply_only(m_edited_preset.config, m_edited_preset.config.diff(iter->config));
+ } else if (iter->name == m_edited_preset.name) {
+ // Preset is not dirty (no local unsaved changes) — also update the edited preset
+ // to prevent a false "dirty" indication (orange highlight) after a silent cloud sync
+ m_edited_preset.config = new_config;
}
iter->config = new_config;
iter->updated_time = cloud_update_time;
diff --git a/src/libslic3r/PrintConfig.cpp b/src/libslic3r/PrintConfig.cpp
index 393198351b..be73c9d349 100644
--- a/src/libslic3r/PrintConfig.cpp
+++ b/src/libslic3r/PrintConfig.cpp
@@ -2912,6 +2912,19 @@ void PrintConfigDef::init_fff_params()
def->max = 10; // Maximum number of lines for infill pattern
def->set_default_value(new ConfigOptionInt(1));
+ // Z-buckling bias optimization (experimental). Tightens the gyroid wave along the Z
+ // (vertical) axis at low infill density to shorten the effective column length under
+ // Z-axis compression. Filament use at the same `sparse_infill_density` setting is
+ // preserved. No effect above ~30% density (formula clamps to no-op).
+ def = this->add("gyroid_optimized", coBool);
+ def->label = L("Z-buckling bias optimization (experimental)");
+ def->category = L("Strength");
+ def->tooltip = L("Tightens the gyroid wave along the Z (vertical) axis at low infill density "
+ "to shorten the effective vertical column length and improve Z-axis compression "
+ "buckling resistance. Filament use is preserved. No effect at ~30% sparse infill "
+ "density and above. Only applies when Sparse infill pattern is set to Gyroid.");
+ def->set_default_value(new ConfigOptionBool(false));
+
def = this->add("sparse_infill_pattern", coEnum);
def->label = L("Sparse infill pattern");
def->category = L("Strength");
diff --git a/src/libslic3r/PrintConfig.hpp b/src/libslic3r/PrintConfig.hpp
index b84e227c4c..cdde293cfa 100644
--- a/src/libslic3r/PrintConfig.hpp
+++ b/src/libslic3r/PrintConfig.hpp
@@ -1133,6 +1133,7 @@ PRINT_CONFIG_CLASS_DEFINE(
// Orca:
((ConfigOptionFloatOrPercent, infill_combination_max_layer_height))
((ConfigOptionInt, fill_multiline))
+ ((ConfigOptionBool, gyroid_optimized))
// Ironing options
((ConfigOptionEnum, ironing_type))
((ConfigOptionEnum, ironing_pattern))
diff --git a/src/slic3r/GUI/ConfigManipulation.cpp b/src/slic3r/GUI/ConfigManipulation.cpp
index dbb0e8d525..1df4dba9c2 100644
--- a/src/slic3r/GUI/ConfigManipulation.cpp
+++ b/src/slic3r/GUI/ConfigManipulation.cpp
@@ -605,6 +605,10 @@ void ConfigManipulation::toggle_print_fff_options(DynamicPrintConfig *config, co
bool have_multiline_infill_pattern = pattern == ipGyroid || pattern == ipGrid || pattern == ipRectilinear || pattern == ipTpmsD || pattern == ipTpmsFK || pattern == ipCrossHatch || pattern == ipHoneycomb || pattern == ipLateralLattice || pattern == ipLateralHoneycomb || pattern == ipConcentric ||
pattern == ipCubic || pattern == ipStars || pattern == ipAlignedRectilinear || pattern == ipLightning || pattern == ip3DHoneycomb || pattern == ipAdaptiveCubic || pattern == ipSupportCubic|| pattern == ipTriangles || pattern == ipQuarterCubic|| pattern == ipArchimedeanChords || pattern == ipHilbertCurve || pattern == ipOctagramSpiral;
+ // gyroid_optimized only applies when the sparse infill pattern is gyroid;
+ // hide the whole line otherwise.
+ toggle_line("gyroid_optimized", have_infill && pattern == ipGyroid);
+
// If there is infill, enable/disable fill_multiline according to whether the pattern supports multiline infill.
if (have_infill) {
toggle_field("fill_multiline", have_multiline_infill_pattern);
diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp
index 0339805304..f2c306d28c 100644
--- a/src/slic3r/GUI/GUI_App.cpp
+++ b/src/slic3r/GUI/GUI_App.cpp
@@ -5849,10 +5849,17 @@ void GUI_App::reload_settings()
load_pending_vendors();
preset_bundle->load_user_presets(*app_config, user_presets, ForwardCompatibilitySubstitutionRule::Enable);
preset_bundle->save_user_presets(*app_config, get_delete_cache_presets());
- if (is_main_thread_active())
+ if (is_main_thread_active()) {
mainframe->update_side_preset_ui();
- else
- CallAfter([this] { mainframe->update_side_preset_ui(); });
+ if (plater_)
+ plater_->sidebar().update_all_preset_comboboxes();
+ } else {
+ CallAfter([this] {
+ mainframe->update_side_preset_ui();
+ if (plater_)
+ plater_->sidebar().update_all_preset_comboboxes();
+ });
+ }
}
}
@@ -6577,8 +6584,8 @@ void GUI_App::start_sync_user_preset(bool with_progress_dlg)
dlg->Update(percent, _L("Loading user preset"));
});
};
- cancelFn = [this, dlg]() {
- return is_closing() || dlg->WasCanceled();
+ cancelFn = [this, dlg, t = std::weak_ptr(m_user_sync_token)]() {
+ return is_closing() || dlg->WasCanceled() || t.expired();
};
finishFn = [this, dlg](bool) {
CallAfter([=]{ dlg->Destroy(); });
@@ -6586,8 +6593,8 @@ void GUI_App::start_sync_user_preset(bool with_progress_dlg)
}
else {
finishFn = [](bool) {}; // reload_settings() is now triggered from the background thread
- cancelFn = [this]() {
- return is_closing();
+ cancelFn = [this, t = std::weak_ptr(m_user_sync_token)]() {
+ return is_closing() || t.expired();
};
}
@@ -6819,6 +6826,37 @@ void GUI_App::stop_sync_user_preset()
}
}
+void GUI_App::restart_sync_user_preset()
+{
+ if (!m_user_sync_token) {
+ // No sync running. If a restart helper is already in flight it will
+ // start the new sync once the old thread is joined — don't race it.
+ if (!m_restart_sync_pending)
+ start_sync_user_preset(true);
+ return;
+ }
+
+ // Resetting the token signals the old thread to stop (cancelFn checks
+ // t.expired(), so it exits after its current HTTP request completes).
+ // A helper thread joins the old thread off the UI thread — no freeze —
+ // then starts the new sync via CallAfter once the old one is fully done.
+ m_user_sync_token.reset();
+ m_restart_sync_pending = true;
+
+ auto old_thread = std::move(m_sync_update_thread);
+
+ std::thread([this, old_thread = std::move(old_thread)]() mutable {
+ if (old_thread.joinable())
+ old_thread.join();
+ m_restart_sync_pending = false;
+ if (!is_closing())
+ CallAfter([this]() {
+ if (!is_closing())
+ start_sync_user_preset(true);
+ });
+ }).detach();
+}
+
void GUI_App::on_stealth_mode_enter()
{
stop_sync_user_preset();
diff --git a/src/slic3r/GUI/GUI_App.hpp b/src/slic3r/GUI/GUI_App.hpp
index 3212c719f5..7244425cfb 100644
--- a/src/slic3r/GUI/GUI_App.hpp
+++ b/src/slic3r/GUI/GUI_App.hpp
@@ -321,6 +321,7 @@ private:
boost::thread m_sync_update_thread;
std::shared_ptr m_user_sync_token;
+ std::atomic m_restart_sync_pending {false};
bool m_is_dark_mode{ false };
bool m_adding_script_handler { false };
bool m_side_popup_status{false};
@@ -530,6 +531,7 @@ public:
void sync_preset(Preset* preset);
void start_sync_user_preset(bool with_progress_dlg = false);
void stop_sync_user_preset();
+ void restart_sync_user_preset();
void on_stealth_mode_enter();
// Bundle subscription sync
diff --git a/src/slic3r/GUI/MainFrame.cpp b/src/slic3r/GUI/MainFrame.cpp
index f4aeae01f6..6a8b276cce 100644
--- a/src/slic3r/GUI/MainFrame.cpp
+++ b/src/slic3r/GUI/MainFrame.cpp
@@ -2780,6 +2780,24 @@ void MainFrame::init_menubar_as_editor()
append_submenu(fileMenu, export_menu, wxID_ANY, _L("Export"), "");
fileMenu->AppendSeparator();
+ append_menu_item(fileMenu, wxID_ANY, _L("Sync Presets"), _L("Pull and apply the latest presets from OrcaCloud"),
+ [this](wxCommandEvent&) {
+ if (!wxGetApp().is_user_login()) {
+ MessageDialog info_dlg(this, _L("You must be logged in to sync presets from cloud."),
+ _L("Sync Presets"), wxOK | wxICON_INFORMATION);
+ info_dlg.ShowModal();
+ return;
+ }
+ if (m_plater)
+ m_plater->get_notification_manager()->push_notification(
+ into_u8(_L("Syncing presets from cloud\u2026")));
+ wxGetApp().restart_sync_user_preset();
+ }, "", nullptr,
+ [this]() {
+ return wxGetApp().is_user_login() && !wxGetApp().app_config->get_stealth_mode();
+ }, this);
+
+ fileMenu->AppendSeparator();
#ifndef __APPLE__
append_menu_item(fileMenu, wxID_EXIT, _L("Quit"), wxString::Format(_L("Quit")),
@@ -3253,6 +3271,25 @@ void MainFrame::init_menubar_as_editor()
plater()->get_current_canvas3D()->force_set_focus();
},
"", nullptr, []() { return true; }, this);
+
+ append_menu_item(
+ m_topbar->GetTopMenu(), wxID_ANY, _L("Sync Presets"), _L("Pull and apply the latest presets from OrcaCloud"),
+ [this](wxCommandEvent&) {
+ if (!wxGetApp().is_user_login()) {
+ MessageDialog info_dlg(this, _L("You must be logged in to sync presets from cloud."),
+ _L("Sync Presets"), wxOK | wxICON_INFORMATION);
+ info_dlg.ShowModal();
+ return;
+ }
+ if (m_plater)
+ m_plater->get_notification_manager()->push_notification(
+ into_u8(_L("Syncing presets from cloud\u2026")));
+ wxGetApp().restart_sync_user_preset();
+ }, "", nullptr,
+ [this]() {
+ return wxGetApp().is_user_login() && !wxGetApp().app_config->get_stealth_mode();
+ }, this);
+
//m_topbar->AddDropDownMenuItem(preference_item);
//m_topbar->AddDropDownMenuItem(printer_item);
//m_topbar->AddDropDownMenuItem(language_item);
diff --git a/src/slic3r/GUI/MediaPlayCtrl.cpp b/src/slic3r/GUI/MediaPlayCtrl.cpp
index 0a6902e11d..3478c91fa6 100644
--- a/src/slic3r/GUI/MediaPlayCtrl.cpp
+++ b/src/slic3r/GUI/MediaPlayCtrl.cpp
@@ -184,7 +184,7 @@ void MediaPlayCtrl::SetMachineObject(MachineObject* obj)
&& m_last_user_play + wxTimeSpan::Seconds(3) < wxDateTime::Now()) {
// resend ttcode to printer
if (auto agent = wxGetApp().getAgent())
- agent->get_camera_url(machine, [](auto) {});
+ agent->get_camera_url(machine, [](auto) {}, wxGetApp().get_printer_cloud_provider());
m_last_user_play = wxDateTime::Now();
}
return;
@@ -252,7 +252,7 @@ void refresh_agora_url(char const* device, char const* dev_ver, char const* chan
device2 += channel;
wxGetApp().getAgent()->get_camera_url(device2, [context, callback](std::string url) {
callback(context, url.c_str());
- });
+ }, wxGetApp().get_printer_cloud_provider());
}
void MediaPlayCtrl::Play()
@@ -378,7 +378,7 @@ void MediaPlayCtrl::Play()
BOOST_LOG_TRIVIAL(info) << "MediaPlayCtrl drop late ttcode for state: " << m_last_state;
}
});
- });
+ }, wxGetApp().get_printer_cloud_provider());
}
}
@@ -580,7 +580,7 @@ void MediaPlayCtrl::ToggleStream()
file.close();
m_streaming = true;
});
- });
+ }, wxGetApp().get_printer_cloud_provider());
}
void MediaPlayCtrl::msw_rescale() {
diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp
index f7877ad903..b18a7d0cc5 100644
--- a/src/slic3r/GUI/Plater.cpp
+++ b/src/slic3r/GUI/Plater.cpp
@@ -14904,7 +14904,8 @@ void Plater::export_gcode(bool prefer_removable)
unsigned int state = this->p->update_restart_background_process(false, false);
if (state & priv::UPDATE_BACKGROUND_PROCESS_INVALID)
return;
- default_output_file = this->p->background_process.output_filepath_for_project("");
+ default_output_file = this->p->background_process.output_filepath_for_project(
+ into_path(this->p->get_project_filename(".3mf")));
} catch (const Slic3r::PlaceholderParserError &ex) {
// Show the error with monospaced font.
show_error(this, ex.what(), true);
@@ -15007,7 +15008,8 @@ void Plater::export_gcode_3mf(bool export_all)
unsigned int state = this->p->update_restart_background_process(false, false);
if (state & priv::UPDATE_BACKGROUND_PROCESS_INVALID)
return;
- default_output_file = this->p->background_process.output_filepath_for_project("");
+ default_output_file = this->p->background_process.output_filepath_for_project(
+ into_path(this->p->get_project_filename(".3mf")));
}
catch (const Slic3r::PlaceholderParserError& ex) {
// Show the error with monospaced font.
@@ -16154,7 +16156,8 @@ void Plater::send_gcode_legacy(int plate_idx, Export3mfProgressFn proFn, bool us
unsigned int state = this->p->update_restart_background_process(false, false);
if (state & priv::UPDATE_BACKGROUND_PROCESS_INVALID)
return;
- default_output_file = this->p->background_process.output_filepath_for_project("");
+ default_output_file = this->p->background_process.output_filepath_for_project(
+ into_path(this->p->get_project_filename(".3mf")));
} catch (const Slic3r::PlaceholderParserError& ex) {
// Show the error with monospaced font.
show_error(this, ex.what(), true);
diff --git a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp
index 3bfdc39983..1affaebc5c 100644
--- a/src/slic3r/GUI/Tab.cpp
+++ b/src/slic3r/GUI/Tab.cpp
@@ -2445,6 +2445,7 @@ void TabPrint::build()
optgroup->append_single_option_line("sparse_infill_density", "strength_settings_infill#sparse-infill-density");
optgroup->append_single_option_line("fill_multiline", "strength_settings_infill#fill-multiline");
optgroup->append_single_option_line("sparse_infill_pattern", "strength_settings_infill#sparse-infill-pattern");
+ optgroup->append_single_option_line("gyroid_optimized", "strength_settings_patterns#gyroid_optimized");
optgroup->append_single_option_line("infill_direction", "strength_settings_infill#direction");
optgroup->append_single_option_line("sparse_infill_rotate_template", "strength_settings_infill_rotation_template_metalanguage");
optgroup->append_single_option_line("skin_infill_density", "strength_settings_patterns#locked-zag");
diff --git a/src/slic3r/GUI/WipeTowerDialog.cpp b/src/slic3r/GUI/WipeTowerDialog.cpp
index f7d679051a..abf8baf086 100644
--- a/src/slic3r/GUI/WipeTowerDialog.cpp
+++ b/src/slic3r/GUI/WipeTowerDialog.cpp
@@ -372,27 +372,31 @@ WipingDialog::WipingDialog(wxWindow* parent, const int max_flush_volume) :
wxBoxSizer* main_sizer = new wxBoxSizer(wxVERTICAL);
this->SetSizer(main_sizer);
this->SetBackgroundColour(*wxWHITE);
- auto filament_count= wxGetApp().preset_bundle->project_config.option("filament_colour")->values.size();
- wxSize extra_size = { FromDIP(100),FromDIP(235) };
- if (filament_count <= 2)
- extra_size.y += FromDIP(16) * 3 + FromDIP(32);
- else if (filament_count == 3)
- extra_size.y += FromDIP(16) * 3;
- else if (4 <= filament_count && filament_count <= 8)
- extra_size.y += FromDIP(16) * 2;
- else
- extra_size.y += FromDIP(16);
+ auto filament_count = wxGetApp().preset_bundle->project_config.option("filament_colour")->values.size();
- wxSize max_scroll_size = { FromDIP(1000),FromDIP(500) };
- wxSize estimate_size = { (int)(filament_count + 1) * FromDIP(60),(int)(filament_count + 1) * FromDIP(30)+FromDIP(2)};
- wxSize scroll_size ={ std::min(max_scroll_size.x,estimate_size.x),std::min(max_scroll_size.y,estimate_size.y) };
- wxSize applied_size = scroll_size + extra_size;
+ // Estimate table scroll area size based on filament count
+ // Each table cell is ~60x25 DIP, plus headers and borders
+ wxSize max_scroll_size = { FromDIP(1000), FromDIP(500) };
+ wxSize table_size = { (int)(filament_count + 1) * FromDIP(60), (int)(filament_count + 1) * FromDIP(25) + FromDIP(2) };
+ wxSize scroll_size = { std::min(max_scroll_size.x, table_size.x), std::min(max_scroll_size.y, table_size.y) };
+ // Fixed overhead: padding (~30), tip panel (~70), controls row (~50),
+ // description/multiplier section (~130), button row (~45) = ~325 DIP
+ wxSize fixed_overhead = { FromDIP(100), FromDIP(325) };
+ wxSize applied_size = scroll_size + fixed_overhead;
+
+ // Clamp to screen size (leave some margin for window decorations)
wxSize scaled_screen_size = wxGetDisplaySize();
double scale_factor = wxDisplay().GetScaleFactor();
- scaled_screen_size = { (int)(scaled_screen_size.x / scale_factor),(int)(scaled_screen_size.y / scale_factor) };
+ scaled_screen_size = { (int)(scaled_screen_size.x / scale_factor), (int)(scaled_screen_size.y / scale_factor) };
+ wxSize screen_margin = { FromDIP(40), FromDIP(60) };
+ scaled_screen_size -= screen_margin;
- applied_size = { std::min(applied_size.x,scaled_screen_size.x),std::min(applied_size.y,scaled_screen_size.y) };
+ applied_size = { std::min(applied_size.x, scaled_screen_size.x), std::min(applied_size.y, scaled_screen_size.y) };
+
+ // Ensure a reasonable minimum size so the dialog is usable even when clamped
+ applied_size.x = std::max(applied_size.x, FromDIP(350));
+ applied_size.y = std::max(applied_size.y, FromDIP(450));
m_webview = wxWebView::New(this, wxID_ANY,
wxEmptyString,
wxDefaultPosition,