tamasmeszaros
6593421802
fix for statistics
2019-03-29 17:20:19 +01:00
tamasmeszaros
725f115756
Merging with master for having minz png compression.
...
Much greater performance boost from better compression algorithm than that from the merged polygons.
2019-03-29 15:21:46 +01:00
Vojtech Kral
3cfb234e86
imgui: Get font size from wxWidgets, fix #2043
2019-03-29 14:58:32 +01:00
YuSanka
ac6a232795
Improved Selection from ObjectList side
2019-03-29 14:36:59 +01:00
Lukas Matena
32ed064797
SLA gizmo fix: occasional crashes after deleting objects
2019-03-29 13:38:33 +01:00
tamasmeszaros
b19d411738
It seems that stats are not broken after all.
2019-03-29 13:34:22 +01:00
Enrico Turri
aca78cfba2
Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_canvas_gui_refactoring
2019-03-29 12:58:41 +01:00
Enrico Turri
49fe8a9f08
Volumes selected from the sidebar table taken from the currently selected instance
2019-03-29 10:48:20 +01:00
tamasmeszaros
98c976dd9f
Merge branch 'tm_sla_png_minz'
2019-03-28 17:56:50 +01:00
tamasmeszaros
1e47cc9004
Improving Zipper API error handling.
2019-03-28 17:21:19 +01:00
YuSanka
44d3243df1
Added context menu Item "Change Extruder" on 3D-Scene
2019-03-28 16:32:19 +01:00
YuSanka
016b5e35b6
Some _cosmetic_ fixes :
...
+ Set wxDEFAULT_DIALOG_STYLE for MsgDialog
+ Changed Msg text before language changing
2019-03-28 16:32:19 +01:00
Enrico Turri
0acee468a3
Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_canvas_gui_refactoring
2019-03-28 11:56:35 +01:00
bubnikv
d209aaa200
Enabled slicing of SLA from the command line.
2019-03-28 11:24:21 +01:00
bubnikv
ba89a3d1ab
Removed dependency on libz on Windows.
2019-03-28 11:20:48 +01:00
tamasmeszaros
50c351e0f4
Fix broken arrange
2019-03-28 11:01:41 +01:00
Enrico Turri
af3a32b8a0
Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_canvas_gui_refactoring
2019-03-28 09:30:23 +01:00
Enrico Turri
9b3f1a8942
Small refactoring -> GLGizmosManager gets model from selection and not from canvas
2019-03-28 09:30:01 +01:00
bubnikv
fc49abc2a4
Merge remote-tracking branch 'remotes/origin/tm_sla_png_minz'
2019-03-28 09:14:37 +01:00
Enrico Turri
98a848d239
Layers editing initialized only for 3D view and not for g-code preview
2019-03-28 09:12:32 +01:00
Enrico Turri
a4f404a6a4
Selection enabled only for 3D view and not for g-code preview
2019-03-28 08:44:46 +01:00
Enrico Turri
702186eec3
Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_canvas_gui_refactoring
2019-03-28 08:24:25 +01:00
tamasmeszaros
440e54181b
Output raster seem ok, stats broken.
2019-03-27 18:37:50 +01:00
YuSanka
3c163285e5
Fix of SPE-879 and #2021
2019-03-27 17:00:29 +01:00
Enrico Turri
46eafca0eb
Follow-up of 8ea8eb67e4
, utf-8 path conversion moved into nanosvg library
2019-03-27 15:42:01 +01:00
Enrico Turri
d0046283fa
Added #define glcheck() for the case HAS_GLSAFE not defined
2019-03-27 15:14:40 +01:00
Enrico Turri
8459410e3c
Fixed conflicts after merge with master
2019-03-27 14:57:05 +01:00
Enrico Turri
d795f07e7b
Added glsafe() around OpenGL calls where missing
2019-03-27 14:42:09 +01:00
Lukas Matena
490074a2dd
SLA gizmo now turns off in case someone adds an object/instance (to prevent rendering points in thin air, etc.)
...
Also, a bug appering when adding an object larger than the bed and scaling it down was fixed (sla gizmo did not work correctly in that case)
2019-03-27 14:19:12 +01:00
Vojtech Kral
1e9e378659
Fix string access in Preferences.cpp
2019-03-27 13:53:00 +01:00
tamasmeszaros
c332dc1c1d
Fixing horrendous error in destructor.
2019-03-27 13:22:04 +01:00
YuSanka
87febaacc0
Fix of #2014
2019-03-27 13:19:27 +01:00
Enrico Turri
30c4e4fed6
Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_canvas_gui_refactoring
2019-03-27 12:51:59 +01:00
Enrico Turri
c44b6a30f9
Fixed conflicts after merge with master
2019-03-27 12:51:40 +01:00
Vojtech Kral
734d57a714
Fix build on MSVC with PCH off
2019-03-27 12:14:34 +01:00
Enrico Turri
8ea8eb67e4
Fixed loading of SVG textures from utf-8 paths
2019-03-27 12:02:50 +01:00
Vojtech Kral
8dbbfc140b
Merge pull request #2005 from SijmenSchoon/fix-assertions
...
Fix tree-related assertions on startup on Linux
2019-03-27 11:29:32 +01:00
tamasmeszaros
8fdff97eb7
Merging new steps integration
2019-03-27 11:05:51 +01:00
tamasmeszaros
bc74761513
Integrating new step, removing old and unused steps.
2019-03-27 10:59:29 +01:00
bubnikv
84ff7f4221
Merge branch 'master' of https://github.com/prusa3d/Slic3r
2019-03-27 10:27:01 +01:00
bubnikv
3987296b62
Improved glsafe macro to print out file name, line number and function
...
name on OpenGL assert.
2019-03-27 10:26:55 +01:00
Enrico Turri
3cd6db2278
Fixed selection lost when Place on Face gizmo is active and user click on another object
2019-03-27 09:06:53 +01:00
Enrico Turri
000542f48d
Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_canvas_gui_refactoring
2019-03-27 08:33:48 +01:00
tamasmeszaros
95b0467c85
Reusing unified polygons from statistics
2019-03-26 18:51:27 +01:00
tamasmeszaros
34094bf1b8
Adding new step for statistics
2019-03-26 18:04:04 +01:00
YuSanka
c8291c6e52
Fix of #2029
...
+ Some improvements for the language changing
2019-03-26 18:02:26 +01:00
bubnikv
f65eb9afdb
Merge branch 'master' of https://github.com/prusa3d/Slic3r
2019-03-26 18:00:23 +01:00
bubnikv
e7c8e2391a
Visual Studio specific. Fixed a clash in the name of a symbol file
...
for the slic3r.exe wrapper and slic3r.dll
2019-03-26 18:00:07 +01:00
Vojtech Kral
937f6112ce
imgui: Fix assert caused by set_language() while new frame is open
2019-03-26 17:57:54 +01:00
tamasmeszaros
b064d9662f
Merge branch 'tm_slice_index_lyrh'
2019-03-26 17:47:27 +01:00
tamasmeszaros
a0f18f9f7c
Add check for missing support points if supports are enabled.
2019-03-26 17:28:51 +01:00
tamasmeszaros
4d8800bc8a
Fixing broken statistics.
2019-03-26 16:45:04 +01:00
tamasmeszaros
4c972549fb
Merge branch 'master' into tm_slice_index_lyrh
2019-03-26 16:06:52 +01:00
tamasmeszaros
6a41e45eeb
Reverting manual unification. It does not help performance.
2019-03-26 16:06:24 +01:00
Enrico Turri
fee0a6b6b5
void GLCanvas3D::update_gizmos_data() moved into void GLGizmosManager::update_data(GLCanvas3D& canvas)
2019-03-26 15:55:47 +01:00
tamasmeszaros
1c6b25c053
Optimizing manual unification.
2019-03-26 15:05:57 +01:00
Enrico Turri
1fbdf7bdaa
Gizmos' grabbers size made uniform as the mean value of the selection's bounding box sides
2019-03-26 14:53:32 +01:00
Enrico Turri
47c39f51e5
Handling of gizmos related key events moved into new method GLGizmosManager::on_key()
2019-03-26 14:38:30 +01:00
Enrico Turri
52f11a6f0d
Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_canvas_gui_refactoring
2019-03-26 14:08:46 +01:00
Enrico Turri
d18208458b
Handling of gizmos related char events moved into new method GLGizmosManager::on_char()
2019-03-26 14:08:02 +01:00
tamasmeszaros
221a4836fd
Manual unification of print polygons.
...
With clipper not with the agg rasterizer, because they can be reused for the statistics.
2019-03-26 14:06:40 +01:00
bubnikv
0a3500b5ab
Added tooltip [Ctrl - R] to the Slice now button
2019-03-26 14:00:53 +01:00
Enrico Turri
c1d74d2943
Code cleanup
2019-03-26 12:39:40 +01:00
Enrico Turri
eafdcb04ba
Handling of gizmos related mouse events moved into GLGizmosManager::on_mouse()
2019-03-26 12:30:17 +01:00
tamasmeszaros
9946a1c914
Fix for missing support polygons
2019-03-26 11:30:55 +01:00
tamasmeszaros
bec9a518a3
Move SliceRecord into SLAPrintObject
2019-03-26 11:22:35 +01:00
tamasmeszaros
a49643ebdb
Merging with master, solving conflicts.
2019-03-26 11:13:28 +01:00
tamasmeszaros
57e28b53f2
Further refactor and simplification of slice index and print data.
2019-03-26 10:57:45 +01:00
bubnikv
82321c7aee
Merge branch 'master' of https://github.com/prusa3d/Slic3r
2019-03-26 10:39:08 +01:00
bubnikv
e0e1e2b682
Improved SLA layer view: Low layer shall be rendered from the slice above,
...
triangulated slices are shifted slightly away from the clipping planes.
FDM: Ported a "(bridged)" G-code comment from upstream.
2019-03-26 10:38:50 +01:00
YuSanka
910979cf73
Fixed crash after change of a language
...
+ Updating of a mode after recreation
2019-03-26 10:09:53 +01:00
Enrico Turri
a09197879d
Code cleanup
2019-03-26 09:10:35 +01:00
Enrico Turri
9512ed605e
Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_canvas_gui_refactoring
2019-03-26 09:01:53 +01:00
Enrico Turri
3818bfa19a
1st installment of gizmos refactoring
...
1) GLCanvas3D::Gizmos moved into a standalone class GLGizmosManager
2) GLGizmosManager handles mouse events by calling its on_mouse method (wip)
2019-03-26 09:01:04 +01:00
tamasmeszaros
b4ea43a6b0
Merge branch 'master' into tm_slice_index_lyrh
2019-03-25 19:02:35 +01:00
tamasmeszaros
d73d9309f1
Refactoring and commenting slice index solution.
2019-03-25 19:02:05 +01:00
Sijmen Schoon
1ed7895f61
Merge branch 'master' into fix-assertions
2019-03-25 17:24:04 +01:00
Vojtech Kral
ba66f34c45
Build: Add an option to choose GTK version on Linux, fix #1937
2019-03-25 15:50:57 +01:00
tamasmeszaros
b21133d16b
Further fixes and some refactor.
2019-03-25 14:53:25 +01:00
Enrico Turri
3e0ec8098b
Code cleanup
2019-03-25 14:13:20 +01:00
Enrico Turri
ead45c4fb2
Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_multivolume_models
2019-03-25 14:12:40 +01:00
tamasmeszaros
27b7e7c6a9
Fix for orbital bug: using delete for memory created by minz.
2019-03-25 14:01:50 +01:00
tamasmeszaros
70fa85d024
Next try to fix build on msvc2013
2019-03-25 13:45:28 +01:00
Enrico Turri
149551946c
Fix of #1998
2019-03-25 12:07:43 +01:00
tamasmeszaros
956391d9d1
Trying to fix build on msvc2013
2019-03-25 11:00:21 +01:00
Vojtech Kral
6c7120a291
Build: Fix libz dependency required by libcurl
2019-03-25 11:40:45 +01:00
tamasmeszaros
5abf64e1d2
Add static assert instead of returning empty result.
2019-03-25 10:35:42 +01:00
tamasmeszaros
0d83c7ee9f
Hypothetical support of different object layer heights.
2019-03-25 09:55:48 +01:00
Enrico Turri
dd3ac4017a
Yet another tweak to the logic for releasing mouse capture into GLToolbar::on_mouse()
2019-03-25 08:48:41 +01:00
Enrico Turri
03aeb0d386
Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_multivolume_models
2019-03-25 08:32:05 +01:00
Lukas Matena
3f7f8f978e
Fix of sla gizmo (it sometimes showed supports for hidden objects)
2019-03-24 13:35:09 +01:00
bubnikv
9652e8193a
Fixed caching of profile selections at the plater.
2019-03-23 10:04:44 +01:00
bubnikv
4f585f1157
Improved rendering when deleting an option from object's overrides.
...
Replaced the single column icon with an empty icon.
Will it break something? The single column added an ugly spacer
in front of non-editable combo boxes.
2019-03-23 08:23:22 +01:00
bubnikv
c623cbc4d7
Fix of Perl bindings
2019-03-22 23:10:11 +01:00
Sijmen Schoon
36778a1e0d
Remove double call to GetFirstVisibleItem()
2019-03-22 23:08:13 +01:00
bubnikv
b2ef3ba291
Fixed the options override box at the side bar.
2019-03-22 23:00:23 +01:00
bubnikv
2fe27a29e0
Fixed the SLA layer preview.
2019-03-22 21:26:58 +01:00
Sijmen Schoon
40d3b66807
Fix assert errors on startup on Linux
2019-03-22 20:49:17 +01:00
bubnikv
8003dd4991
Merge remote-tracking branch 'origin/tm_slice_index'
2019-03-22 17:08:38 +01:00
bubnikv
2bfd3b7844
Refactored the -------- xxxx ---------- menu items to use a generic
...
code to generate these separators.
Now using the connected dashes (unicode emdash characters) on OSX and Windows.
2019-03-22 17:07:12 +01:00
tamasmeszaros
f4b70e42d1
Merge branch 'master' into tm_slice_index
2019-03-22 15:48:57 +01:00
tamasmeszaros
8e18605bd7
Fix for incorrect model slices after elevation has changed.
2019-03-22 15:48:20 +01:00
bubnikv
ae93569044
Call Config Wizard from the Printer combo box at both the plater
...
and the parameter tab.
2019-03-22 15:45:51 +01:00
tamasmeszaros
4ece50e3db
Merge branch 'master' into tm_slice_index
2019-03-22 15:31:58 +01:00
tamasmeszaros
d165dbb498
Refactoring changes to the slice index.
2019-03-22 15:31:38 +01:00
Enrico Turri
6bf0cf9466
Another tweak to the logic for releasing mouse capture into GLToolbar::on_mouse()
2019-03-22 14:35:26 +01:00
Enrico Turri
db21c67f18
Changed logic for releasing mouse capture into GLToolbar::on_mouse()
2019-03-22 13:03:34 +01:00
bubnikv
f5516f24c4
Fix of 1.42 beta crash when deleting printer profile created by configuration assistant #1985
...
Fixed an issue, where deleting a profile did not correctly update
profile dependences, and deleting a profile would not test dirty status
of depending profiles, which would be switched thus user changes would be lost.
Fixed enabling / disabling the --default FFF-- / --default SLA-- profiles
when deleting the last printer profile.
Little refactoring (don't compare by strings but by symbolic names).
Making a copy of a profile - "Copy" suffix is added to a system profile.
2019-03-22 12:11:23 +01:00
Enrico Turri
bbb2a6d714
Fixed non-uniform scale of single volumes selection when made using the sidebar matrix fields
2019-03-22 11:51:10 +01:00
Lukas Matena
0848617fd3
SLA gizmo fix: adding points to selection by Shift+click should now work again (was broken by 8466c55
)
2019-03-22 10:56:51 +01:00
Enrico Turri
a5fd9a34e8
Do not consider modifiers when centering an object after 3mf and amf import
2019-03-22 09:47:40 +01:00
tamasmeszaros
5e646562cd
Fixes for the duplicated layer issues...
2019-03-21 18:01:41 +01:00
tamasmeszaros
63a899b239
Using same slicing grid for the supports and the model.
2019-03-21 16:14:26 +01:00
tamasmeszaros
0ffc0c3a84
Merge branch 'master' into tm_slice_index
2019-03-21 15:17:01 +01:00
tamasmeszaros
24a5dd4235
FIx for broken slice preview
2019-03-21 15:16:33 +01:00
bubnikv
4be6c17fd3
Limit number of perimeters to 10 thousands, that is 50 meters with 0.2mm
...
nozzle. The number of perimeters has to be limited due to a numerical
overflow of fixed point 32bit coordinates in the offsetting algorithm.
2019-03-21 14:56:20 +01:00
bubnikv
562343cd2a
Localization fix of the warning texts in the 3D scene.
...
Improved anti-aliasing of the warning texts in the 3D scene
and the G-code legend. A ClearType rendering has been suppressed
by rendering of the text into a red channel only.
2019-03-21 14:33:55 +01:00
tamasmeszaros
d4dde12d0d
Slic3r compiles with the new slice index interface.
2019-03-21 12:25:33 +01:00
bubnikv
f9e3b935d3
Yet another fix.
2019-03-21 12:09:14 +01:00
bubnikv
f76880cd5e
Fix and optimization of the previous commit.
2019-03-21 11:54:25 +01:00
bubnikv
213ff2852a
We are getting mysterious crashes on Linux in gtk due to OpenGL context activation GH #1874 #1955 .
...
So we are applying a workaround here, just on linux.
2019-03-21 11:44:39 +01:00
Enrico Turri
a8cf701520
Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_canvas_gui_refactoring
2019-03-21 11:05:19 +01:00
Enrico Turri
024efd963a
Renamed private methods of Selection
2019-03-21 11:02:10 +01:00
bubnikv
8105fc33d5
Fixed a merge issue
2019-03-21 10:46:40 +01:00
bubnikv
d9d0eff0f1
Merge remote-tracking branch 'remotes/origin/ys_comboboxes'
2019-03-21 10:11:27 +01:00
bubnikv
a5b27a7540
Merge branch 'master' of https://github.com/prusa3d/Slic3r
2019-03-21 10:07:42 +01:00
YuSanka
0198e71789
Implemented issue #1990
2019-03-21 09:37:52 +01:00
tamasmeszaros
19a96336ff
WIP on slice indexing
2019-03-20 18:03:11 +01:00
YuSanka
452eb62f11
Some code refactoring
2019-03-20 16:22:01 +01:00
Enrico Turri
3a923b7121
Fixed conflicts after merge with master
2019-03-20 16:09:14 +01:00
Lukas Matena
8b73608e9f
SLA gizmo can be activated if the supports are outside the bed
...
Otherwise there is a possibility that the object gets out of bed when the gizmo is active (supports are generated with object close to the edge), which the gizmo does not expect
2019-03-20 15:37:13 +01:00
Enrico Turri
42c5d624cb
Fix into GLToolbar::on_mouse()
2019-03-20 15:30:03 +01:00
Enrico Turri
83b24eee5b
Added missing include
2019-03-20 14:36:36 +01:00
Enrico Turri
9a2d7c881b
Fixed typo
2019-03-20 14:14:21 +01:00
Lukas Matena
8466c55b78
SLA gizmo - points are added on leftdown event, not leftup as before
2019-03-20 14:04:59 +01:00
Lukas Matena
df01af975a
SLA gizmo now forces objects to use their normal color (not SELECTED_COLOR)
2019-03-20 14:04:20 +01:00
Enrico Turri
d23824af97
GLCanvas3D::Gizmos as a standalone class (GLGizmosManager)
2019-03-20 13:51:25 +01:00
Lukas Matena
2728e45646
Renamed function mouse_event to gizmo_event
2019-03-20 13:44:34 +01:00
YuSanka
e2349bdd2e
Added workaround for the non-editable wxBitmapComboBoxs under OSXDisableAllSmartSubstitutions
...
+ experiments with Linux
2019-03-20 12:04:18 +01:00
tamasmeszaros
2f244895d2
Small fix for cancel button text on Linux
2019-03-20 11:12:37 +01:00
bubnikv
001d0c0fe9
Merge branch 'master' of https://github.com/prusa3d/Slic3r
2019-03-20 10:34:10 +01:00
YuSanka
b36e4fa512
Merge remote-tracking branch 'origin/ys_preset_edit_buttons' into ys_comboboxes
2019-03-20 10:33:50 +01:00
YuSanka
438010f0f8
Some code refactoring
2019-03-20 10:14:49 +01:00
Lukas Matena
4ceba39d99
Decreased number of polygons on the SLA support point marks for faster rendering
2019-03-20 10:13:16 +01:00
Enrico Turri
df250039df
Tech ENABLE_CANVAS_GUI_REFACTORING set as default
2019-03-20 09:33:30 +01:00
Enrico Turri
da1feb2741
Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_canvas_gui_refactoring
2019-03-20 08:24:05 +01:00
bubnikv
4d37c8658d
Merge remote-tracking branch 'remotes/origin/ys_preset_edit_buttons'
2019-03-19 17:37:02 +01:00
bubnikv
177e99c770
Merge branch 'master' of https://github.com/prusa3d/Slic3r
2019-03-19 17:36:17 +01:00
Enrico Turri
3b31976b09
Another fix for Linuz and Mac builds
2019-03-19 15:58:18 +01:00
Enrico Turri
b57f6c9fe0
Fixed build on Linux and Mac
2019-03-19 15:33:09 +01:00