3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-10-21 07:41:09 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 6
3124 commits 10 branches 72 tags 3.3 GiB
Commit graph

1699 commits

Author SHA1 Message Date
Zhaofeng Li
8d7bb97eb9 GUI_ObjectTable: Fix casting of wxGridCellEditorEvtHandler 
Fixes linking errors like:

/nix/store/039g378vc3pc3dvi9dzdlrd0i4q93qwf-binutils-2.39/bin/ld: slic3r/liblibslic3r_gui.a(GUI_ObjectTable.cpp.o): in function `wxClassInfo::IsKindOf(wxClassInfo const*) const':
/nix/store/hzl7rsdq0k6affzy2rz35lhn51lq6zh3-wxwidgets-3.1.5/include/wx-3.1/wx/rtti.h:88: undefined reference to `wxGridCellEditorEvtHandler::ms_classInfo'
/nix/store/039g378vc3pc3dvi9dzdlrd0i4q93qwf-binutils-2.39/bin/ld: /nix/store/hzl7rsdq0k6affzy2rz35lhn51lq6zh3-wxwidgets-3.1.5/include/wx-3.1/wx/rtti.h:93: undefined reference to `wxGridCellEditorEvtHandler::ms_classInfo'
/nix/store/039g378vc3pc3dvi9dzdlrd0i4q93qwf-binutils-2.39/bin/ld: /nix/store/hzl7rsdq0k6affzy2rz35lhn51lq6zh3-wxwidgets-3.1.5/include/wx-3.1/wx/rtti.h:99: undefined reference to `wxGridCellEditorEvtHandler::ms_classInfo'
/nix/store/039g378vc3pc3dvi9dzdlrd0i4q93qwf-binutils-2.39/bin/ld: /nix/store/hzl7rsdq0k6affzy2rz35lhn51lq6zh3-wxwidgets-3.1.5/include/wx-3.1/wx/rtti.h:93: undefined reference to `wxGridCellEditorEvtHandler::ms_classInfo'
/nix/store/039g378vc3pc3dvi9dzdlrd0i4q93qwf-binutils-2.39/bin/ld: /nix/store/hzl7rsdq0k6affzy2rz35lhn51lq6zh3-wxwidgets-3.1.5/include/wx-3.1/wx/rtti.h:88: undefined reference to `wxGridCellEditorEvtHandler::ms_classInfo'
 2022-12-25 14:30:12 +08:00
Zhaofeng Li
5e543837c1 WebView: Only include webview_edge.h when enabled 2022-12-25 14:30:04 +08:00
SoftFever
473b1805ed Merge branch 'feature/calib_pa' into SoftFever 2022-12-25 14:25:32 +08:00
SoftFever
a688719e72 Revert "Merge branch 'SoftFever' into feature/calib" 
This reverts commit f5b28201fe, reversing
changes made to d9e9fb2206.

# Conflicts:
#	version.inc
 2022-12-25 12:39:45 +08:00
SoftFever
de33c24b0a exit pa calib mode when new model is added. 2022-12-24 19:59:47 +08:00
SoftFever
47c744ceb0 export 3mf file with proper file name. 
Issue #32
 2022-12-24 13:36:04 +08:00
SoftFever
40c7baae83 Merge branch 'SoftFever' into feature/calib_pa 2022-12-24 12:48:13 +08:00
SoftFever
191a04be16 Add skirt height 2022-12-24 12:21:32 +08:00
SoftFever
693c044047 change workflow 2022-12-24 00:02:53 +08:00
SoftFever
a8cf77a2b0 small changes 2022-12-23 17:25:04 +08:00
SoftFever
a3bae2f9a5 draft version 2022-12-23 11:12:44 +08:00
SoftFever
1df89650e9 pa works 2022-12-22 22:41:45 +08:00
SoftFever
8c46a57036 wip 2022-12-22 16:09:03 +08:00
SoftFever
f5b28201fe Merge branch 'SoftFever' into feature/calib 2022-12-21 17:09:45 +08:00
SoftFever
d9e9fb2206 init 2022-12-21 17:05:27 +08:00
SoftFever
d733ab7e7b Merge branch 'master' into SoftFever 
Signed-off-by: SoftFever <103989404+SoftFever@users.noreply.github.com>

# Conflicts:
#	resources/i18n/zh_cn/BambuStudio.mo
#	src/libslic3r/TreeSupport.cpp
#	version.inc
 2022-12-21 16:54:14 +08:00
SoftFever
41078e6555 refactor and improve layer time display 2022-12-20 22:24:42 +08:00
SoftFever
1eb54c49a6 revert changes for min_layer_height check, there was legacy config on user's machine that won't pass this check. (why?) 2022-12-20 11:41:11 +08:00
SoftFever
92360f75ed remove redundant send button for 3rd printers 
Signed-off-by: SoftFever <103989404+SoftFever@users.noreply.github.com>
 2022-12-20 11:27:40 +08:00
SoftFever
daf5384b5a Add Layer Time/Layer time(Log). 
Main logic is ported from SuperSlicer

Signed-off-by: SoftFever <103989404+SoftFever@users.noreply.github.com>
 2022-12-19 23:58:24 +08:00
chunmao.guo
78f6c429c1 FIX: [STUDIO-1800] enable_user_preset_folder before load preset 
Change-Id: I3b877db994440359e56aa2fa13d13b1d9a98f978
 2022-12-19 19:34:08 +08:00
chunmao.guo
e32792c305 FIX: [STUDIO-1800] enable_user_preset_folder before load preset 
Change-Id: I3b877db994440359e56aa2fa13d13b1d9a98f978
 2022-12-19 06:13:10 -05:00
Stone Li
55b6bc5563 ENH: do not show the functions if it is not supported 
Change-Id: Iaee9c756f40fd26c376160e9cda305bee88d713b
Signed-off-by: Stone Li <stone.li@bambulab.com>
 2022-12-19 06:13:10 -05:00
tao wang
c1ad24d660 FIX:fixed cant not set cover img of 3mf 
Change-Id: I3beabd0ccd9fad1e5c48b8c92cc58aba9a4c4210
 2022-12-19 06:13:10 -05:00
Stone Li
c6152a70e9 FIX: add get_used_extruders interface 
Change-Id: I03f0dca933c0aa9de893bc86b268ea727eeee9fb
Signed-off-by: Stone Li <stone.li@bambulab.com>
 2022-12-19 06:13:10 -05:00
SoftFever
030063c8d5 Skip AMS filaments for 3rd party printers 2022-12-18 20:32:56 +08:00
SoftFever
85f774a72d fix max layer height issue when open the app for the first time 2022-12-18 11:51:25 +08:00
SoftFever
0e64b47f9d expose bed_exclude_area feature to thirdparty printer 2022-12-18 10:30:41 +08:00
SoftFever
32364ee7ee fix a small ui issue 2022-12-18 10:30:15 +08:00
lane.wei
c25c1ba4eb ENH: linux: create data dir when not exists 
Change-Id: Icaf5f3a74b52e3ada5db6a4354df6584bbf669cf
 2022-12-17 03:21:09 -05:00
tao wang
ee59ac76a9 FIX:fixed display wrong color of the color picker button 
Change-Id: I09f955545f5e1adf28842f51394ae63ec1fe3576
 2022-12-17 03:21:09 -05:00
salt.wei
1e5c746429 ENH: disable smooth timelapse in vase mode 
Smooth timelaps has wipe tower and cause seam in vase
mode. Don't support

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: I7aef1fc1ec2f5d57713fcc01e45ce99f385471c1
(cherry picked from commit 671203ada7c5d48a4eabad156d68d7cb1bb37b54)
 2022-12-17 03:21:09 -05:00
zhimin.zeng
915e5a0e69 FIX: model copy problem 
Change-Id: I1e32a5a89271a4bdc100599bb6a513e48c545313
(cherry picked from commit eb3755126a2df23045857e4081ba50a42ca5168c)
 2022-12-17 03:21:09 -05:00
SoftFever
c08fc0c5dc Change layer height checking logic. 
max min layer height should be compared against `Layer height limits` parameter instead of hardcoded value
 2022-12-17 16:05:49 +08:00
SoftFever
bafd7356d6 update version to beta3 2022-12-17 11:57:31 +08:00
Zhaofeng Li
93bfa10d4e MediaPlayCtrl: Add missing string_file header 2022-12-16 22:51:07 -05:00
Zhaofeng Li
9cfe3c6016 Add more missing headers 2022-12-16 22:51:07 -05:00
Zhaofeng Li
06a06714c1 WebView: Only include the private header on Windows and macOS 
The wrapper isn't used in the Linux code path. Some distributions'
wxWidgets packages don't ship the private headers.
 2022-12-16 22:51:07 -05:00
Zhaofeng Li
a78bed0fd7 GUI_ObjectTable: Fix casting of wxGridCellEditorEvtHandler 
Fixes linking errors like:

/nix/store/039g378vc3pc3dvi9dzdlrd0i4q93qwf-binutils-2.39/bin/ld: slic3r/liblibslic3r_gui.a(GUI_ObjectTable.cpp.o): in function `wxClassInfo::IsKindOf(wxClassInfo const*) const':
/nix/store/hzl7rsdq0k6affzy2rz35lhn51lq6zh3-wxwidgets-3.1.5/include/wx-3.1/wx/rtti.h:88: undefined reference to `wxGridCellEditorEvtHandler::ms_classInfo'
/nix/store/039g378vc3pc3dvi9dzdlrd0i4q93qwf-binutils-2.39/bin/ld: /nix/store/hzl7rsdq0k6affzy2rz35lhn51lq6zh3-wxwidgets-3.1.5/include/wx-3.1/wx/rtti.h:93: undefined reference to `wxGridCellEditorEvtHandler::ms_classInfo'
/nix/store/039g378vc3pc3dvi9dzdlrd0i4q93qwf-binutils-2.39/bin/ld: /nix/store/hzl7rsdq0k6affzy2rz35lhn51lq6zh3-wxwidgets-3.1.5/include/wx-3.1/wx/rtti.h:99: undefined reference to `wxGridCellEditorEvtHandler::ms_classInfo'
/nix/store/039g378vc3pc3dvi9dzdlrd0i4q93qwf-binutils-2.39/bin/ld: /nix/store/hzl7rsdq0k6affzy2rz35lhn51lq6zh3-wxwidgets-3.1.5/include/wx-3.1/wx/rtti.h:93: undefined reference to `wxGridCellEditorEvtHandler::ms_classInfo'
/nix/store/039g378vc3pc3dvi9dzdlrd0i4q93qwf-binutils-2.39/bin/ld: /nix/store/hzl7rsdq0k6affzy2rz35lhn51lq6zh3-wxwidgets-3.1.5/include/wx-3.1/wx/rtti.h:88: undefined reference to `wxGridCellEditorEvtHandler::ms_classInfo'
 2022-12-16 22:51:07 -05:00
Zhaofeng Li
daade424cb WebView: Only include webview_edge.h when enabled 2022-12-16 22:51:07 -05:00
SoftFever
1938ab44ba fix an bug that wrong bed type was used for thirdparty printers 2022-12-17 11:11:55 +08:00
SoftFever
e0335e73cf fix an issue that thirdparty won't able to send print 2022-12-16 21:39:52 +08:00
SoftFever
5d141ee214 fix issues caused by merging 2022-12-16 17:04:19 +08:00
SoftFever
bf8a9fee1f Merge branch 'master' into SoftFever 
# Conflicts:
#	bbl/i18n/zh_cn/BambuStudio_zh_CN.po
#	resources/i18n/de/BambuStudio.mo
#	resources/i18n/en/BambuStudio.mo
#	resources/i18n/es/BambuStudio.mo
#	resources/i18n/fr/BambuStudio.mo
#	resources/i18n/hu/BambuStudio.mo
#	resources/i18n/nl/BambuStudio.mo
#	resources/i18n/sv/BambuStudio.mo
#	resources/i18n/zh_cn/BambuStudio.mo
#	resources/profiles/Creality.json
#	resources/profiles/Voron.json
#	resources/web/guide/3/index.html
#	src/libslic3r/AppConfig.cpp
#	src/libslic3r/GCode.cpp
#	src/libslic3r/GCode/GCodeProcessor.cpp
#	src/libslic3r/LayerRegion.cpp
#	src/libslic3r/Preset.cpp
#	src/libslic3r/Print.cpp
#	src/libslic3r/PrintConfig.cpp
#	src/libslic3r/PrintConfig.hpp
#	src/libslic3r/PrintObject.cpp
#	src/slic3r/GUI/AboutDialog.cpp
#	src/slic3r/GUI/BBLTopbar.cpp
#	src/slic3r/GUI/ConfigManipulation.cpp
#	src/slic3r/GUI/ConfigWizard.cpp
#	src/slic3r/GUI/GCodeViewer.cpp
#	src/slic3r/GUI/GUI_App.cpp
#	src/slic3r/GUI/GUI_Factories.cpp
#	src/slic3r/GUI/MainFrame.cpp
#	src/slic3r/GUI/Plater.cpp
#	src/slic3r/GUI/Tab.cpp
#	version.inc
 2022-12-16 13:59:30 +08:00
lane.wei
13a1dc03c1 ENH: sync the different codes 
especially for the translation files

Change-Id: I940578ff6e22b0939d42eeed2209bfeddb0eb191
 2022-12-15 04:38:15 -05:00
chunmao.guo
8d8b5c910c FIX: [STUDIO-1754] limit_handles has bugs on posix, not use 
Change-Id: If65ac7196dfc02cb4ba37473127ecf48f3254049
 2022-12-15 04:38:15 -05:00
Stone Li
ffd94f94f4 ENH: refine tips when sending print job failed 
Change-Id: I1b45e282b990595f2e72cb89974d688040f22e86
Signed-off-by: Stone Li <stone.li@bambulab.com>
 2022-12-15 04:38:15 -05:00
tao wang
2fa7776199 FIX:fixed the file name in the notification message after send success 
Change-Id: Ib906c64c90939524ce7466897671a6c89b4b2d7b
 2022-12-15 04:38:15 -05:00
tao.jin
e7081c7d5f ENH: refine UI of physical printer dialog 
Change-Id: Ie6e76890dbd94862f604431fd66433fce2b9bd73
 2022-12-15 04:38:15 -05:00
Stone Li
52847b8bb4 ENH: valid print all when selecting blank plate 
and give a tips when print blank plate

Change-Id: Ic243dcee87d4a5a09de91c5806f1a94735f1052b
Signed-off-by: Stone Li <stone.li@bambulab.com>
 2022-12-15 04:38:15 -05:00