Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

1.10.0 beta fixes #5025

Merged
merged 14 commits into from
Oct 28, 2024
Merged

Conversation

hadess
Copy link
Contributor

@hadess hadess commented Oct 17, 2024

No description provided.

hadess added 14 commits October 15, 2024 21:50
src/libslic3r/Brim.cpp: In function ‘Slic3r::ExPolygons Slic3r::outer_inner_brim_area(const Print&, float, std::map<ObjectID, std::vector<ExPolygon> >&, std::map<ObjectID, std::vector<ExPolygon> >&, std::vector<std::pair<ObjectID, unsigned int> >&, std::vector<unsigned int>&)’:
src/libslic3r/Brim.cpp:1084:18: error: ‘spin_mutex’ is not a member of ‘tbb’
 1084 |             tbb::spin_mutex brimMutex;
      |                  ^~~~~~~~~~
In file included from src/libslic3r/FlushVolPredictor.cpp:1:
src/libslic3r/FlushVolPredictor.hpp:44:34: error: ‘string’ in namespace ‘std’ does not name a type
   44 |     FlushVolPredictor(const std::string& data_file);
      |                                  ^~~~~~

src/libslic3r/FlushVolPredictor.hpp:49:5: error: ‘uint64_t’ does not name a type
   49 |     uint64_t generate_hash_key(const RGB& from, const RGB& to);
      |     ^~~~~~~~

In file included from src/libslic3r/FlushVolPredictor.cpp:1:
src/libslic3r/FlushVolPredictor.hpp:44:34: error: ‘string’ in namespace ‘std’ does not name a type
   44 |     FlushVolPredictor(const std::string& data_file);
      |                                  ^~~~~~
src/libslic3r/Support/TreeSupport.cpp:3204:41: error: ‘format’ was not declared in this scope; did you mean ‘boost::format’?
 3204 |             BOOST_LOG_TRIVIAL(trace) << format("plan_layer_heights0 (%.2f,%.2f)->(%.2f,%.2f): ", z1, h1, z2, h2);
      |                                         ^~~~~~
      |                                         boost::format
src/slic3r/GUI/wxMediaCtrl3.h:80:10: error: ‘condition_variable’ in namespace ‘std’ does not name a type
   80 |     std::condition_variable m_cond;
      |          ^~~~~~~~~~~~~~~~~~
src/slic3r/GUI/wxMediaCtrl3.h:27:1: note: ‘std::condition_variable’ is defined in header ‘<condition_variable>’; did you forget to ‘#include <condition_variable>’?
   26 | #include "Printer/BambuTunnel.h"
  +++ |+#include <condition_variable>
   27 |
src/slic3r/GUI/wxMediaCtrl3.h:81:10: error: ‘thread’ in namespace ‘std’ does not name a type
   81 |     std::thread m_thread;
      |          ^~~~~~
src/slic3r/GUI/wxMediaCtrl3.h:27:1: note: ‘std::thread’ is defined in header ‘<thread>’; did you forget to ‘#include <thread>’?
   26 | #include "Printer/BambuTunnel.h"
  +++ |+#include <thread>
   27 |

In file included from src/slic3r/GUI/MediaPlayCtrl.h:17,
                 from src/slic3r/GUI/MediaPlayCtrl.cpp:1:
src/slic3r/GUI/wxMediaCtrl3.h:77:13: error: field ‘m_frame’ has incomplete type ‘wxImage’
   77 |     wxImage m_frame;
      |             ^~~~~~~
src/slic3r/GUI/Gizmos/GLGizmoFlatten.cpp: In member function ‘virtual void Slic3r::GUI::GLGizmoFlatten::on_render_input_window(float, float, float)’:
src/slic3r/GUI/Gizmos/GLGizmoFlatten.cpp:45:27: error: ‘wxDisplay’ was not declared in this scope; did you mean ‘wxGetDisplay’?
   45 |     double screen_scale = wxDisplay(wxGetApp().plater()).GetScaleFactor();
      |                           ^~~~~~~~~
      |                           wxGetDisplay
src/slic3r/GUI/BitmapCache.cpp: In static member function ‘static NSVGimage* Slic3r::GUI::BitmapCache::nsvgParseFromFileWithReplace(const char*, const char*, float, const std::map<std::__cxx11::basic_string<char>, std::__cxx11::basic_string<char> >&)’:
src/slic3r/GUI/BitmapCache.cpp:279:17: error: ‘boost::nowide’ has not been declared
  279 |     fp = boost::nowide::fopen(filename, "rb");
      |                 ^~~~~~
src/slic3r/GUI/MediaFilePanel.cpp: In lambda function:
src/slic3r/GUI/MediaFilePanel.cpp:508:49: error: ‘lexical_cast’ is not a member of ‘boost’
  508 |                 url += "&refresh_url=" + boost::lexical_cast<std::string>(&refresh_agora_url);
      |                                                 ^~~~~~~~~~~~
src/slic3r/GUI/Gizmos/GLGizmoBrimEars.cpp: In member function ‘void Slic3r::GUI::GLGizmoBrimEars::first_layer_slicer()’:
src/slic3r/GUI/Gizmos/GLGizmoBrimEars.cpp:870:27: error: ‘union_ex’ was not declared in this scope; did you mean ‘union’?
  870 |                 part_ex = union_ex(part_ex, sliced_layer);
      |                           ^~~~~~~~
      |                           union
src/slic3r/GUI/Gizmos/GLGizmoBrimEars.cpp:876:21: error: ‘diff_ex’ was not declared in this scope
  876 |     m_first_layer = diff_ex(part_ex, negative_ex);
      |                     ^~~~~~~
src/libslic3r/Format/STEP.hpp:39:41: error: ‘Model’ has not been declared
   39 | extern bool load_step(const char *path, Model *model,
      |                                         ^~~~~
src/slic3r/GUI/StepMeshDialog.hpp:40:10: error: ‘future’ in namespace ‘std’ does not name a template type
   40 |     std::future<unsigned int> task;
      |          ^~~~~~
src/slic3r/GUI/StepMeshDialog.hpp:8:1: note: ‘std::future’ is defined in header ‘<future>’; did you forget to ‘#include <future>’?
    7 | #include "Widgets/Button.hpp"
  +++ |+#include <future>
    8 | class Button;
In file included from src/slic3r/GUI/AVVideoDecoder.cpp:1:
src/slic3r/GUI/AVVideoDecoder.hpp:28:20: error: ‘wxImage’ has not been declared
   28 |     bool toWxImage(wxImage &image, wxSize const &size);
      |                    ^~~~~~~
src/slic3r/GUI/AVVideoDecoder.hpp:28:36: error: ‘wxSize’ has not been declared
   28 |     bool toWxImage(wxImage &image, wxSize const &size);
      |                                    ^~~~~~
src/slic3r/GUI/AVVideoDecoder.hpp:38:10: error: ‘vector’ in namespace ‘std’ does not name a template type
   38 |     std::vector<uint8_t> bits_;
      |          ^~~~~~
src/slic3r/GUI/AVVideoDecoder.hpp:9:1: note: ‘std::vector’ is defined in header ‘<vector>’; did you forget to ‘#include <vector>’?
    8 |     #include <libswscale/swscale.h>
  +++ |+#include <vector>
    9 | }

src/slic3r/GUI/AVVideoDecoder.cpp:145:89: error: invalid use of incomplete type ‘class wxBitmap’
  145 |     bitmap = wxBitmap((char const *) bits_.data(), size.GetWidth(), size.GetHeight(), 32);
      |                                                                                         ^
src/slic3r/GUI/wxMediaCtrl2.cpp: In lambda function:
src/slic3r/GUI/wxMediaCtrl2.cpp:170:13: error: ‘wxMessageBox’ was not declared in this scope; did you mean ‘wxInfoMessageBox’?
  170 |             wxMessageBox(_L("Your system is missing H.264 codecs for GStreamer, which are required to play video.  (Try installing the gstreamer1.0-plugins-bad or gstreamer1.0-libav packages, then restart Bambu Studio?)"), _L("Error"), wxOK);
      |             ^~~~~~~~~~~~
      |             wxInfoMessageBox
src/slic3r/GUI/wxMediaCtrl2.cpp: In member function ‘void wxMediaCtrl2::Load(wxURI)’:
src/slic3r/GUI/wxMediaCtrl2.cpp:179:5: error: ‘wxLog’ has not been declared
  179 |     wxLog::EnableLogging(false);
      |     ^~~~~
src/slic3r/GUI/wxMediaCtrl3.cpp: In member function ‘void wxMediaCtrl3::paintEvent(wxPaintEvent&)’:
src/slic3r/GUI/wxMediaCtrl3.cpp:121:5: error: ‘wxPaintDC’ was not declared in this scope; did you mean ‘wxPoint’?
  121 |     wxPaintDC dc(this);
      |     ^~~~~~~~~
      |     wxPoint
src/slic3r/GUI/wxMediaCtrl3.cpp:181:23: error: ‘info’ was not declared in this scope
  181 |     BOOST_LOG_TRIVIAL(info) << msg.ToUTF8().data();
      |                       ^~~~
src/slic3r/GUI/wxMediaCtrl3.cpp:181:5: error: ‘BOOST_LOG_TRIVIAL’ was not declared in this scope
  181 |     BOOST_LOG_TRIVIAL(info) << msg.ToUTF8().data();
      |     ^~~~~~~~~~~~~~~~~
@hadess
Copy link
Contributor Author

hadess commented Oct 17, 2024

The windows and macos failures look unrelated to this patchset.

@MackBambu
Copy link
Contributor

Thanks, I'll test it

@MackBambu MackBambu self-assigned this Oct 18, 2024
Copy link
Contributor

@MackBambu MackBambu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://github.com/MackBambu/BambuStudio/actions/runs/11432253373
The build is successful, and the pr are ready to be merged.

@lanewei120 lanewei120 merged commit c5c41e2 into bambulab:master Oct 28, 2024
12 of 14 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants