Commit Graph

7613 Commits

Author SHA1 Message Date
xin.zhang a67acd8f0c FIX: use different ext image for different machine
jira: [STUDIO-11133]
Change-Id: Ice69b4f33317e23a2c2d7b8fbdfc94402b4bba28
2025-03-28 21:13:34 +08:00
zhou.xu c526810717 ENH:add "is_blocking_printing" api
jira: github 6181
Change-Id: I8c8659da0b27204c53d03cbbd8d410504b3fd434
2025-03-28 21:13:34 +08:00
tao wang 956f1b9a59 ENH:auto switch use ams option
jira:[none]

Change-Id: Ia1d5231284515226277b16d771342141e654a23d
2025-03-28 21:13:34 +08:00
tao wang 1b0e8cdb31 ENH:direct connected devices support fram mode
jira:[none]

Change-Id: I539698e6440bf67b1951938c3c0b7d51ab74c1b3
2025-03-28 21:13:34 +08:00
gerrit 4191b08d54 ci: update build version to 02.00.00.96
Change-Id: I5c77e44275e940fdf091fa55e8a916d52c239e1e
2025-03-28 21:13:34 +08:00
zhou.xu 36692d649c FIX:fix dark mode show of right_tip
jira: none
Change-Id: I6ce7edec772c5d1bbdc372fcde25807a0a744916
2025-03-28 21:13:34 +08:00
xun.zhang 7e5b6c4274 ENH: add h2d in upward machines
jira: NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I4168311dd5e5779f1b3930c733c1b682a8c67fed
2025-03-28 21:13:34 +08:00
zhou.xu 28bdf64fef FIX:m_show_type should init default
jira: github 6146
Change-Id: Ie948a37cfda030a9e10efe0b8d260918b3fb9e4c
2025-03-28 21:13:34 +08:00
lane.wei 64d61695c5 ENH: remove redundant space in readme
Change-Id: I5d5fc8f18801754a8823bcfd3bfb9d021ad208e1
2025-03-26 15:56:51 +08:00
Bastien Nocera 7f24d51237 FIX: Fix missing wxDC declaration
/run/build/BambuStudio/src/slic3r/Utils/WxFontUtils.hpp: At global scope:
/run/build/BambuStudio/src/slic3r/Utils/WxFontUtils.hpp:44:56: error: ‘wxDC’ has not been declared
   44 |     static void get_suitable_font_size(int max_height, wxDC &dc);
      |                                                        ^~~~
2025-03-26 08:18:12 +08:00
Bastien Nocera ab34522143 FIX: Fix missing wxBitmap{,Button} declaration
In file included from /run/build/BambuStudio/src/slic3r/GUI/FilamentGroupPopup.cpp:1:
/run/build/BambuStudio/src/slic3r/GUI/FilamentGroupPopup.hpp:60:17: error: ‘wxBitmapButton’ was not declared in this scope
   60 |     std::vector<wxBitmapButton*> radio_btns;
      |                 ^~~~~~~~~~~~~~
/run/build/BambuStudio/src/slic3r/GUI/FilamentGroupPopup.hpp:60:32: error: template argument 2 is invalid
/run/build/BambuStudio/src/slic3r/GUI/FilamentGroupPopup.hpp:65:14: error: field ‘checked_bmp’ has incomplete type ‘wxBitmap’
   65 |     wxBitmap checked_bmp;
      |              ^~~~~~~~~~~
2025-03-26 08:18:12 +08:00
Bastien Nocera b890f0a39f FIX: Fix missing wxTimerEvent declaration
In file included from /run/build/BambuStudio/src/slic3r/GUI/FilamentGroupPopup.cpp:1:
/run/build/BambuStudio/src/slic3r/GUI/FilamentGroupPopup.hpp:33:18: error: ‘wxTimerEvent’ has not been declared
   33 |     void OnTimer(wxTimerEvent &event);
      |                  ^~~~~~~~~~~~
2025-03-26 08:18:12 +08:00
Bastien Nocera 13624fb941 fixup! FIX: Fix missing FilamentMapMode declaration 2025-03-26 08:18:12 +08:00
Bastien Nocera c6f2b0e950 FIX: Fix missing wxDisplay declaration
/run/build/BambuStudio/src/slic3r/GUI/WipeTowerDialog.cpp: In constructor ‘WipingDialog::WipingDialog(wxWindow*, const std::vector<std::vector<int>, std::allocator<std::vector<int> > >&, int)’:
/run/build/BambuStudio/src/slic3r/GUI/WipeTowerDialog.cpp:123: error: ‘wxDisplay’ was not declared in this scope; did you mean ‘wxGetDisplay’?
  123 |     double scale_factor = wxDisplay().GetScaleFactor();
2025-03-26 08:18:12 +08:00
Bastien Nocera de2b5b74ce FIX: Fix missing Slic3r::intersection declaration
/run/build/BambuStudio/src/slic3r/GUI/ImGuiWrapper.cpp: In static member function ‘static ImVec2 Slic3r::GUI::ImGuiWrapper::suggest_location(const ImVec2&, const Slic3r::Polygon&, const ImVec2&)’:
/run/build/BambuStudio/src/slic3r/GUI/ImGuiWrapper.cpp:2201: error: ‘intersection’ is not a member of ‘Slic3r’; did you mean ‘PrinterFunction’?
 2201 |         if (Slic3r::intersection(interest, Polygon(moved_polygon)).empty())
2025-03-26 08:18:12 +08:00
Bastien Nocera 989d9f36b5 FIX: Fix missing wxDialog declaration
In file included from /run/build/BambuStudio/src/slic3r/GUI/WipeTowerDialog.cpp:4:
/run/build/BambuStudio/src/slic3r/GUI/WipeTowerDialog.hpp:8:1: error: expected class-name before ‘{’ token
    8 | {
      | ^
2025-03-26 08:18:12 +08:00
Bastien Nocera 05d977b553 FIX: Fix missing wxAutoBufferedPaintDC declaration
/run/build/BambuStudio/src/slic3r/GUI/CapsuleButton.cpp: In member function ‘void Slic3r::GUI::CapsuleButton::OnPaint(wxPaintEvent&)’:
/run/build/BambuStudio/src/slic3r/GUI/CapsuleButton.cpp:63: error: ‘wxAutoBufferedPaintDC’ was not declared in this scope
   63 |     wxAutoBufferedPaintDC dc(this);
/run/build/BambuStudio/src/slic3r/GUI/FilamentMapPanel.cpp: In member function ‘void Slic3r::GUI::FilamentMapBtnPanel::OnPaint(wxPaintEvent&)’:
/run/build/BambuStudio/src/slic3r/GUI/FilamentMapPanel.cpp:182: error: ‘wxAutoBufferedPaintDC’ was not declared in this scope
  182 |     wxAutoBufferedPaintDC dc(this);
2025-03-26 08:18:12 +08:00
Bastien Nocera 06a146e20c FIX: Fix missing wxGridSizer declaration
/run/build/BambuStudio/src/slic3r/GUI/DragDropPanel.hpp:36:5: error: ‘wxGridSizer’ does not name a type; did you mean ‘wxSizer’?
   36 |     wxGridSizer *m_grid_item_sizer;
      |     ^~~~~~~~~~~
      |     wxSizer
2025-03-26 08:18:12 +08:00
Bastien Nocera eaec4c997e FIX: Fix missing FilamentMapMode declaration
/run/build/BambuStudio/src/slic3r/GUI/3DScene.hpp: At global scope:
/run/build/BambuStudio/src/slic3r/GUI/3DScene.hpp:65:5: error: ‘FilamentMapMode’ does not name a type
   65 |     FilamentMapMode         mode;
      |     ^~~~~~~~~~~~~~~
2025-03-26 08:18:12 +08:00
Bastien Nocera bba6fa71a4 FIX: Fix missing std::regex declaration
/run/build/BambuStudio/src/libslic3r/FilamentGroupUtils.cpp: In lambda function:
/run/build/BambuStudio/src/libslic3r/FilamentGroupUtils.cpp:92:18: error: ‘regex’ is not a member of ‘std’
   92 |             std::regex r1(R"(^Sup.(\w+)$)");
      |                  ^~~~~
2025-03-26 08:18:12 +08:00
Bastien Nocera 842152b65a FIX: Fix missing std::set declaration
/run/build/BambuStudio/src/slic3r/GUI/Widgets/DropDown.cpp:281:10: error: ‘set’ is not a member of ‘std’
  281 |     std::set<wxString> groups;
      |          ^~~
2025-03-26 08:18:12 +08:00
Bastien Nocera 059e18aa38 FIX: Fix missing std:: declarations in ToolOrderUtils
/run/build/BambuStudio/src/libslic3r/GCode/ToolOrderUtils.hpp:14:26: error: ‘numeric_limits’ is not a member of ‘std’
   14 |     const int INF = std::numeric_limits<int>::max();
      |                          ^~~~~~~~~~~~~~
/run/build/BambuStudio/src/libslic3r/GCode/ToolOrderUtils.cpp:545:66: error: ‘unordered_set’ in namespace ‘std’ does not name a template type
  545 |     static std::vector<T> collect_filaments_in_groups(const std::unordered_set<unsigned int>& group, const std::vector<unsigned int>& filament_list) {
      |                                                                  ^~~~~~~~~~~~~
2025-03-26 08:18:12 +08:00
Bastien Nocera 58754264c6 FIX: Fix missing union_ex/offset_ex declaration
/run/build/BambuStudio/src/libslic3r/Interlocking/InterlockingGenerator.cpp: In member function ‘std::pair<std::vector<Slic3r::ExPolygon>, std::vector<Slic3r::ExPolygon> > Slic3r::InterlockingGenerator::growBorderAreasPerpendicular(const Slic3r::ExPolygons&, const Slic3r::ExPolygons&, const coord_t&) const’:
/run/build/BambuStudio/src/libslic3r/Interlocking/InterlockingGenerator.cpp:70:56: error: ‘offset_ex’ was not declared in this scope; did you mean ‘offsetof’?
   70 |     const ExPolygons total_shrunk = offset_ex(union_ex(offset_ex(a, min_line), offset_ex(b, min_line)), 2 * -min_line);
      |                                                        ^~~~~~~~~
      |                                                        offsetof
/run/build/BambuStudio/src/libslic3r/Interlocking/InterlockingGenerator.cpp:70:47: error: ‘union_ex’ was not declared in this scope; did you mean ‘union’?
   70 |     const ExPolygons total_shrunk = offset_ex(union_ex(offset_ex(a, min_line), offset_ex(b, min_line)), 2 * -min_line);
      |                                               ^~~~~~~~
      |                                               union
2025-03-26 08:18:12 +08:00
Bastien Nocera d51243b089 FIX: Fix missing std::ofstream/std::ifstream declaration
/run/build/BambuStudio/src/libslic3r/SVG.cpp: In function ‘void Slic3r::dumpExPolygonToJson(const ExPolygon&, const std::string&)’:
/run/build/BambuStudio/src/libslic3r/SVG.cpp:620:32: error: variable ‘std::ofstream file’ has initializer but incomplete type
  620 |     std::ofstream file(filePath);
      |                                ^
/run/build/BambuStudio/src/libslic3r/SVG.cpp:6:1: note: ‘std::ofstream’ is defined in header ‘<fstream>’; this is probably fixable by adding ‘#include <fstream>’
    5 | #include "nlohmann/json.hpp"
  +++ |+#include <fstream>
    6 |
2025-03-26 08:18:12 +08:00
Bastien Nocera bf32b5a489 FIX: Fix missing boost::algorithm::split declaration
/run/build/BambuStudio/src/libslic3r/PrintConfig.cpp: In function ‘std::vector<std::map<int, int> > Slic3r::get_extruder_ams_count(const std::vector<std::__cxx11::basic_string<char> >&)’:
/run/build/BambuStudio/src/libslic3r/PrintConfig.cpp:454:27: error: ‘split’ is not a member of ‘boost::algorithm’
  454 |         boost::algorithm::split(ams_infos, str, boost::algorithm::is_any_of("|"));
      |                           ^~~~~
2025-03-26 08:18:12 +08:00
Bastien Nocera a8d792ecf8 FIX: Fix missing L() localisation helper
/run/build/BambuStudio/src/libslic3r/PresetBundle.cpp: In member function ‘unsigned int Slic3r::PresetBundle::sync_ams_list(std::vector<std::pair<Slic3r::DynamicPrintConfig*, std::__cxx11::basic_string<char> > >&, bool, std::map<int, Slic3r::AMSMapInfo>&, bool, Slic3r::MergeFilamentInfo&)’:
/run/build/BambuStudio/src/libslic3r/PresetBundle.cpp:1973:49: error: ‘L’ was not declared in this scope
 1973 |                     unknowns.emplace_back(&ams, L("The filament model is unknown. Still using the previous filament preset."));
      |                                                 ^
2025-03-26 08:18:12 +08:00
Bastien Nocera c77afa7096 FIX: Fix missing offset() helper declaration
/run/build/BambuStudio/src/libslic3r/GCode/WipeTower.cpp:3327:26: error: ‘offset’ was not declared in this scope; did you mean ‘off_t’?
 3327 |             outer_wall = offset(outer_wall, scaled(spacing)).front();
      |                          ^~~~~~
      |                          off_t
2025-03-26 08:18:12 +08:00
Bastien Nocera ea2c021427 FIX: Fix missing polygon primitives declaration
/run/build/BambuStudio/src/libslic3r/GCode/WipeTower.hpp:31:12: error: ‘TriangleMesh’ does not name a type
   31 |     static TriangleMesh                 its_make_rib_tower(float width, float depth, float height, float rib_length, float rib_width, bool fillet_wall);
      |            ^~~~~~~~~~~~
<snip>
/run/build/BambuStudio/src/libslic3r/GCode/WipeTower.hpp:33:12: error: ‘Polygon’ does not name a type
   33 |     static Polygon                      rib_section(float width, float depth, float rib_length, float rib_width, bool fillet_wall);
      |            ^~~~~~~
<snip>
/run/build/BambuStudio/src/libslic3r/GCode/WipeTower.hpp:200:21: error: ‘Polylines’ was not declared in this scope
  200 |     std::map<float, Polylines> get_outer_wall() const
      |                     ^~~~~~~~~
<snip>
2025-03-26 08:18:12 +08:00
Bastien Nocera f90ab037be FIX: Fix missing Slic3r::format declaration
/run/build/BambuStudio/src/libslic3r/Fill/FillFloatingConcentric.cpp: In lambda function:
/run/build/BambuStudio/src/libslic3r/Fill/FillFloatingConcentric.cpp:430:49: error: ‘format’ is not a member of ‘Slic3r’; did you mean ‘boost::format’?
  430 |             BOOST_LOG_TRIVIAL(error) << Slic3r::format("ZFiller: both point in subject : %d, %d, %d, %d ", e1_a.z(), e1_b.z(), e2_a.z(), e2_b.z());
      |                                                 ^~~~~~
2025-03-26 08:18:12 +08:00
Bastien Nocera 208fc3185b FIX: Fix missing std::stack declaration
/run/build/BambuStudio/src/libslic3r/Fill/FillRectilinear.cpp: In function ‘void Slic3r::adjust_sort_for_segment_intersections(std::vector<SegmentIntersection>&)’:
/run/build/BambuStudio/src/libslic3r/Fill/FillRectilinear.cpp:371:10: error: ‘stack’ is not a member of ‘std’
  371 |     std::stack<IntersectionType> stack;
      |          ^~~~~
/run/build/BambuStudio/src/libslic3r/Fill/FillRectilinear.cpp:36:1: note: ‘std::stack’ is defined in header ‘<stack>’; this is probably fixable by adding ‘#include <stack>’
   35 | #include <cassert>
  +++ |+#include <stack>
   36 |
2025-03-26 08:18:12 +08:00
Bastien Nocera c15d402bde FIX: Fix missing std::accumulate declaration
/run/build/BambuStudio/src/libslic3r/ExPolygon.cpp: In function ‘double Slic3r::get_expolygons_area(const ExPolygons&)’:
/run/build/BambuStudio/src/libslic3r/ExPolygon.cpp:437:17: error: ‘accumulate’ is not a member of ‘std’
  437 |     return std::accumulate(expolys.begin(), expolys.end(), (double)(0), [](double val, const ExPolygon& expoly) {
      |                 ^~~~~~~~~~

/run/build/BambuStudio/src/libslic3r/Polygon.cpp: In member function ‘bool Slic3r::Polygon::is_approx_circle(double, double, Slic3r::Point&, double&) const’:
/run/build/BambuStudio/src/libslic3r/Polygon.cpp:122:28: error: ‘accumulate’ is not a member of ‘std’
  122 |     double avg_dist = std::accumulate(distances.begin(), distances.end(), 0.0) / distances.size();
      |                            ^~~~~~~~~~
2025-03-26 08:18:12 +08:00
Bastien Nocera 159de8dc65 FIX: Fix missing Slic3r::BoundingBox type declaration
In file included from /run/build/BambuStudio/src/libslic3r/ExtrusionEntityCollection.hpp:6,
                 from /run/build/BambuStudio/src/libslic3r/CurveAnalyzer.hpp:4,
                 from /run/build/BambuStudio/src/libslic3r/CurveAnalyzer.cpp:1:
/run/build/BambuStudio/src/libslic3r/ExtrusionEntity.hpp:33:17: error: field ‘bbox’ has incomplete type ‘Slic3r::BoundingBox’
   33 |     BoundingBox bbox;
      |                 ^~~~
2025-03-26 08:18:12 +08:00
Bastien Nocera 864ad1715d FIX: Fix missing ExPolygons type declaration
In file included from /run/build/BambuStudio/src/libslic3r/Clipper2Utils.cpp:1:
/run/build/BambuStudio/src/libslic3r/Clipper2Utils.hpp:11:1: error: ‘ExPolygons’ does not name a type; did you mean ‘Polygons’?
   11 | ExPolygons         union_ex_2(const Polygons &expolygons);
      | ^~~~~~~~~~
      | Polygons
2025-03-26 08:18:12 +08:00
xun.zhang 35e4db07e9 ENH: update gcode for H2D
jira: NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I069c988454658f06148f62607eef1bfa2a2d7106
2025-03-25 22:13:45 +08:00
zhou.xu d22a2e91e5 FIX:FIX:material item check parent name in mac
jira: STUDIO-11117
Change-Id: Icf155f04eb0e1fcc995d04c6f4646a6d729cb1cb
2025-03-25 22:13:27 +08:00
xun.zhang d9b9e41625 ENH: update params in process profiles
jira: NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I167ed97df565256c592b56a2389985afbe24cbe3
2025-03-25 22:13:27 +08:00
BBL\chuan.he 5afce754f2 ci: update translate file 2025_03_25_14_25_57 2025-03-25 22:13:26 +08:00
BBL\chuan.he 34fbb6eb10 ci: update translate file 2025_03_25_13_34_04 2025-03-25 22:13:26 +08:00
xun.zhang c7864db1c8 ENH: update process profile for H2D
jira: none

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I851852c36d5602ac3e97740ae357cadef6fa0903
2025-03-25 22:13:26 +08:00
zhou.xu f3f6032de9 ENH:modify text
jira: none
Change-Id: I7bb2bc5fa0a1a14afce822b67c3dd095c4bf6549
2025-03-25 22:13:26 +08:00
gerrit e842cb0f6f ci: update translate file 2025_03_25_12_27_22 2025-03-25 22:13:26 +08:00
gerrit eb3f165cef ci: update translate file 2025_03_25_12_16_25 2025-03-25 22:13:25 +08:00
zhou.xu 645d843dd9 ENH:When software is full screen in mac, the sub frame uses the wxSTAYBON_TOP style
jira: none
Change-Id: I338576d77e61a436615e70372b4564c38be0c7dc
2025-03-25 22:13:25 +08:00
lane.wei a598ce8d61 FIX: gui: fix the crash after first loading configs
caused by printer_model missed in the setup stage
jira: STUDIO-10966

Change-Id: I3a887de800c62c5dd355c9dce554e2b5828a1c55
2025-03-25 22:13:25 +08:00
gerrit 956c3d6d84 ci: update build version to 02.00.00.95
Change-Id: Ibc97347bb07f10042817c483a14a633a3da678bb
2025-03-25 08:15:51 +08:00
xin.zhang 319313fc2d FIX: remove the restriction
jira: [STUDIO-11094]
Change-Id: Ic13f07abaf5eda5d3077275d74071e5e342b2c77
2025-03-25 08:15:51 +08:00
xun.zhang cfa54c5505 ENH: update flush table
1. For cases where light color switch to dark color, multiply the value
with 1.3

jira : NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I6b5b2f8e9578d031bbf830ecf18f0069865af2e6
2025-03-25 08:15:51 +08:00
xun.zhang eb24f6be07 ENH: update gcode for H2D
jira: NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I98291af3fa439ac1b6f933f06112582edb9d9dc2
2025-03-25 08:15:51 +08:00
xun.zhang 2e071908b6 ENH: remove some profiles and do renaming
jira: none

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I21d4915ec487b77c8e87afd49be2694ec32372e6
2025-03-25 08:15:50 +08:00
xun.zhang 1ad2aed3a0 ENH: add high quality process profile
jira: NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I7e4f12e7a15b022c0dfb8cbefd4f13552e00d149
2025-03-25 08:15:50 +08:00