mirror of
https://github.com/SoftFever/OrcaSlicer.git
synced 2025-07-08 23:46:24 -06:00
parent
657954901f
commit
e29cba2eff
8 changed files with 22 additions and 45 deletions
35
.github/workflows/build_all.yml
vendored
35
.github/workflows/build_all.yml
vendored
|
@ -60,21 +60,20 @@ jobs:
|
||||||
arch: ${{ matrix.arch }}
|
arch: ${{ matrix.arch }}
|
||||||
build-deps-only: ${{ inputs.build-deps-only || false }}
|
build-deps-only: ${{ inputs.build-deps-only || false }}
|
||||||
secrets: inherit
|
secrets: inherit
|
||||||
flatpak:
|
# flatpak:
|
||||||
name: "Flatpak"
|
# name: "Flatpak"
|
||||||
runs-on: ubuntu-latest
|
# runs-on: ubuntu-latest
|
||||||
container:
|
# container:
|
||||||
image: bilelmoussaoui/flatpak-github-actions:gnome-45
|
# image: bilelmoussaoui/flatpak-github-actions:gnome-45
|
||||||
options: --privileged
|
# options: --privileged
|
||||||
steps:
|
# steps:
|
||||||
# maybe i'm too dumb and fucked up to do CI. OH WELL :D -ppd
|
# # maybe i'm too dumb and fucked up to do CI. OH WELL :D -ppd
|
||||||
- name: "Remove unneeded stuff to free disk space"
|
# - name: "Remove unneeded stuff to free disk space"
|
||||||
run:
|
# run:
|
||||||
sudo rm -rf /usr/share/dotnet /opt/ghc "/usr/local/share/boost" "$AGENT_TOOLSDIRECTORY"
|
# sudo rm -rf /usr/share/dotnet /opt/ghc "/usr/local/share/boost" "$AGENT_TOOLSDIRECTORY"
|
||||||
- uses: actions/checkout@v4
|
# - uses: actions/checkout@v4
|
||||||
- uses: flatpak/flatpak-github-actions/flatpak-builder@v6
|
# - uses: flatpak/flatpak-github-actions/flatpak-builder@v6
|
||||||
with:
|
# with:
|
||||||
bundle: orcaslicer.flatpak
|
# bundle: orcaslicer.flatpak
|
||||||
manifest-path: flatpak/io.github.softfever.OrcaSlicer.yml
|
# manifest-path: flatpak/io.github.softfever.OrcaSlicer.yml
|
||||||
cache-key: flatpak-builder-${{ github.sha }}
|
# cache-key: flatpak-builder-${{ github.sha }}
|
||||||
cache: false
|
|
||||||
|
|
1
deps/OCCT/OCCT.cmake
vendored
1
deps/OCCT/OCCT.cmake
vendored
|
@ -22,7 +22,6 @@ orcaslicer_add_cmake_project(OCCT
|
||||||
#-DUSE_FREETYPE=OFF
|
#-DUSE_FREETYPE=OFF
|
||||||
-DUSE_FFMPEG=OFF
|
-DUSE_FFMPEG=OFF
|
||||||
-DUSE_VTK=OFF
|
-DUSE_VTK=OFF
|
||||||
-DBUILD_DOC_Overview=OFF
|
|
||||||
-DBUILD_MODULE_ApplicationFramework=OFF
|
-DBUILD_MODULE_ApplicationFramework=OFF
|
||||||
#-DBUILD_MODULE_DataExchange=OFF
|
#-DBUILD_MODULE_DataExchange=OFF
|
||||||
-DBUILD_MODULE_Draw=OFF
|
-DBUILD_MODULE_Draw=OFF
|
||||||
|
|
|
@ -44,22 +44,6 @@ modules:
|
||||||
- type: archive
|
- type: archive
|
||||||
url: http://mirrors.ircam.fr/pub/x.org/individual/app/xprop-1.2.5.tar.gz
|
url: http://mirrors.ircam.fr/pub/x.org/individual/app/xprop-1.2.5.tar.gz
|
||||||
sha256: b7bf6b6be6cf23e7966a153fc84d5901c14f01ee952fbd9d930aa48e2385d670
|
sha256: b7bf6b6be6cf23e7966a153fc84d5901c14f01ee952fbd9d930aa48e2385d670
|
||||||
- name: python-flit_core
|
|
||||||
buildsystem: simple
|
|
||||||
build-commands:
|
|
||||||
- pip3 install --no-deps --no-build-isolation --verbose --prefix=${FLATPAK_DEST} .
|
|
||||||
sources:
|
|
||||||
- type: archive
|
|
||||||
url: https://files.pythonhosted.org/packages/c4/e6/c1ac50fe3eebb38a155155711e6e864e254ce4b6e17fe2429b4c4d5b9e80/flit_core-3.9.0.tar.gz
|
|
||||||
sha256: 72ad266176c4a3fcfab5f2930d76896059851240570ce9a98733b658cb786eba
|
|
||||||
- name: python-packaging
|
|
||||||
buildsystem: simple
|
|
||||||
build-commands:
|
|
||||||
- pip3 install --no-deps --no-build-isolation --verbose --prefix=${FLATPAK_DEST} .
|
|
||||||
sources:
|
|
||||||
- type: archive
|
|
||||||
url: https://files.pythonhosted.org/packages/51/65/50db4dda066951078f0a96cf12f4b9ada6e4b811516bf0262c0f4f7064d4/packaging-24.1.tar.gz
|
|
||||||
sha256: 026ed72c8ed3fcce5bf8950572258698927fd1dbda10a5e981cdf0ac37f4f002
|
|
||||||
- name: python-setuptools_scm
|
- name: python-setuptools_scm
|
||||||
buildsystem: simple
|
buildsystem: simple
|
||||||
build-commands:
|
build-commands:
|
||||||
|
|
|
@ -580,10 +580,6 @@ target_link_libraries(libslic3r
|
||||||
opencv_world
|
opencv_world
|
||||||
)
|
)
|
||||||
|
|
||||||
if(NOT SLIC3R_STATIC)
|
|
||||||
target_compile_definitions(libslic3r PUBLIC BOOST_ALL_DYN_LINK)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if(NOT WIN32)
|
if(NOT WIN32)
|
||||||
target_link_libraries(libslic3r freetype)
|
target_link_libraries(libslic3r freetype)
|
||||||
if (NOT APPLE)
|
if (NOT APPLE)
|
||||||
|
|
|
@ -2,7 +2,6 @@
|
||||||
#include "../miniz_extension.hpp"
|
#include "../miniz_extension.hpp"
|
||||||
#include "format.hpp"
|
#include "format.hpp"
|
||||||
|
|
||||||
#include <boost/algorithm/string/case_conv.hpp>
|
|
||||||
#include <qoi/qoi.h>
|
#include <qoi/qoi.h>
|
||||||
#include <jpeglib.h>
|
#include <jpeglib.h>
|
||||||
#include <jerror.h>
|
#include <jerror.h>
|
||||||
|
@ -595,7 +594,7 @@ std::string get_error_string(const ThumbnailErrors& errors)
|
||||||
std::string error_str;
|
std::string error_str;
|
||||||
|
|
||||||
if (errors.has(ThumbnailError::InvalidVal))
|
if (errors.has(ThumbnailError::InvalidVal))
|
||||||
error_str += "\n - " + Slic3r::format("Invalid input format. Expected vector of dimensions in the following format: \"%1%\"", "XxY/EXT, XxY/EXT, ...");
|
error_str += "\n - " + format("Invalid input format. Expected vector of dimensions in the following format: \"%1%\"", "XxY/EXT, XxY/EXT, ...");
|
||||||
if (errors.has(ThumbnailError::OutOfRange))
|
if (errors.has(ThumbnailError::OutOfRange))
|
||||||
error_str += "\n - Input value is out of range";
|
error_str += "\n - Input value is out of range";
|
||||||
if (errors.has(ThumbnailError::InvalidExt))
|
if (errors.has(ThumbnailError::InvalidExt))
|
||||||
|
|
|
@ -3,7 +3,6 @@
|
||||||
|
|
||||||
#include "../Point.hpp"
|
#include "../Point.hpp"
|
||||||
#include "../PrintConfig.hpp"
|
#include "../PrintConfig.hpp"
|
||||||
#include "../enum_bitmask.hpp"
|
|
||||||
#include "ThumbnailData.hpp"
|
#include "ThumbnailData.hpp"
|
||||||
#include "../enum_bitmask.hpp"
|
#include "../enum_bitmask.hpp"
|
||||||
|
|
||||||
|
|
|
@ -6,7 +6,6 @@
|
||||||
#undef PI
|
#undef PI
|
||||||
|
|
||||||
#include <boost/next_prior.hpp>
|
#include <boost/next_prior.hpp>
|
||||||
#include "boost/log/trivial.hpp"
|
|
||||||
// Include igl first. It defines "L" macro which then clashes with our localization
|
// Include igl first. It defines "L" macro which then clashes with our localization
|
||||||
#include <igl/copyleft/cgal/mesh_boolean.h>
|
#include <igl/copyleft/cgal/mesh_boolean.h>
|
||||||
#undef L
|
#undef L
|
||||||
|
@ -28,6 +27,7 @@
|
||||||
#include <CGAL/boost/graph/Face_filtered_graph.h>
|
#include <CGAL/boost/graph/Face_filtered_graph.h>
|
||||||
// BBS: for boolean using mcut
|
// BBS: for boolean using mcut
|
||||||
#include "mcut/include/mcut/mcut.h"
|
#include "mcut/include/mcut/mcut.h"
|
||||||
|
#include "boost/log/trivial.hpp"
|
||||||
|
|
||||||
namespace Slic3r {
|
namespace Slic3r {
|
||||||
namespace MeshBoolean {
|
namespace MeshBoolean {
|
||||||
|
|
|
@ -12,6 +12,7 @@
|
||||||
#include <boost/lexical_cast.hpp>
|
#include <boost/lexical_cast.hpp>
|
||||||
#include <boost/log/trivial.hpp>
|
#include <boost/log/trivial.hpp>
|
||||||
#include <boost/thread.hpp>
|
#include <boost/thread.hpp>
|
||||||
|
|
||||||
#include <float.h>
|
#include <float.h>
|
||||||
|
|
||||||
namespace {
|
namespace {
|
||||||
|
@ -6070,7 +6071,7 @@ void PrintConfigDef::handle_legacy_composite(DynamicPrintConfig &config)
|
||||||
auto [thumbnails_list, errors] = GCodeThumbnails::make_and_check_thumbnail_list(thumbnails_str, extention);
|
auto [thumbnails_list, errors] = GCodeThumbnails::make_and_check_thumbnail_list(thumbnails_str, extention);
|
||||||
|
|
||||||
if (errors != enum_bitmask<ThumbnailError>()) {
|
if (errors != enum_bitmask<ThumbnailError>()) {
|
||||||
std::string error_str = "\n" + Slic3r::format("Invalid value provided for parameter %1%: %2%", "thumbnails", thumbnails_str);
|
std::string error_str = "\n" + format("Invalid value provided for parameter %1%: %2%", "thumbnails", thumbnails_str);
|
||||||
error_str += GCodeThumbnails::get_error_string(errors);
|
error_str += GCodeThumbnails::get_error_string(errors);
|
||||||
throw BadOptionValueException(error_str);
|
throw BadOptionValueException(error_str);
|
||||||
}
|
}
|
||||||
|
@ -6079,7 +6080,7 @@ void PrintConfigDef::handle_legacy_composite(DynamicPrintConfig &config)
|
||||||
const auto& extentions = ConfigOptionEnum<GCodeThumbnailsFormat>::get_enum_names();
|
const auto& extentions = ConfigOptionEnum<GCodeThumbnailsFormat>::get_enum_names();
|
||||||
thumbnails_str.clear();
|
thumbnails_str.clear();
|
||||||
for (const auto& [ext, size] : thumbnails_list)
|
for (const auto& [ext, size] : thumbnails_list)
|
||||||
thumbnails_str += Slic3r::format("%1%x%2%/%3%, ", size.x(), size.y(), extentions[int(ext)]);
|
thumbnails_str += format("%1%x%2%/%3%, ", size.x(), size.y(), extentions[int(ext)]);
|
||||||
thumbnails_str.resize(thumbnails_str.length() - 2);
|
thumbnails_str.resize(thumbnails_str.length() - 2);
|
||||||
|
|
||||||
config.set_key_value("thumbnails", new ConfigOptionString(thumbnails_str));
|
config.set_key_value("thumbnails", new ConfigOptionString(thumbnails_str));
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue