Commit Graph

524 Commits

Author SHA1 Message Date
YuSanka
4de0f574fb Fixed wrong preset comboboxes updating on sidebar after preset changing on "Printer Settings" tab 2018-11-16 11:15:27 +01:00
YuSanka
70f1cdaf01 Fixed wrong showing of the frequently changed parameters after printer settings changing 2018-11-16 11:15:27 +01:00
Enrico Turri
c8a13f18f6 Fixed compile on OsX 2018-11-16 10:14:52 +01:00
Enrico Turri
850800e63a Do not show export config option when exporting to stl 2018-11-16 09:44:03 +01:00
Enrico Turri
21202b55b2 Extract only model or only config from 3mf 2018-11-16 09:26:41 +01:00
Tamás Mészáros
6bf9ff713d fix return value error 2018-11-16 08:46:15 +01:00
Lukas Matena
8b201d0f2e Proper hiding of the SLA supports gizmo in FDM mode 2018-11-15 18:16:13 +01:00
tamasmeszaros
58bfd29ea8 Merge branch 'dev_native' of github.com:prusa3d/Slic3r into dev_native 2018-11-15 18:06:10 +01:00
tamasmeszaros
810fcc2221 wip: reorganizing things to support accurate pad creation. Also more accurate progress indication. 2018-11-15 18:05:47 +01:00
Enrico Turri
2299625a63 Hidden camera target 2018-11-15 15:43:24 +01:00
Enrico Turri
9bb04ff15a Modified menu for open/save/save as project (3mf) and import/export 2018-11-15 15:27:39 +01:00
tamasmeszaros
a82c07e8cc merge SLAPrint advancements into dev_native 2018-11-15 15:15:19 +01:00
tamasmeszaros
f3d02a5cdf Slicing the supports seems to work fine with the merged mesh. 2018-11-15 15:14:14 +01:00
YuSanka
410568c9d9 Temporary workaround for the correct behavior of the Scrolled sidebar panel 2018-11-15 12:43:16 +01:00
YuSanka
ede21eec7a Rotation/Scale from modification pane for SingleObject, SingleVolume & SingleInstance
Note:
- doesn't work for group selection
- scaling work only with percent mode
2018-11-15 12:43:16 +01:00
Enrico Turri
e83e755e8b Fixed crash when dismissing file dialog for quick slice menu command 2018-11-15 12:21:09 +01:00
Enrico Turri
ed271d66e6 Fixed object picking when gizmos are rendered on top 2018-11-15 11:38:40 +01:00
tamasmeszaros
08511bfe8b Merge branch 'dev_native' of github.com:prusa3d/Slic3r into dev_native 2018-11-15 10:47:36 +01:00
tamasmeszaros
88648c8214 a small cleanup 2018-11-15 10:47:20 +01:00
Enrico Turri
a468078df3 Fixed length of grabbers for rotate 3D gizmo 2018-11-15 10:16:51 +01:00
tamasmeszaros
95abba5b96 Fix for build error and perhaps the grayed out arrange button 2018-11-15 09:46:55 +01:00
tamasmeszaros
73eb31d43c Merge branch 'dev_native' of github.com:prusa3d/Slic3r into dev_native 2018-11-14 18:04:52 +01:00
tamasmeszaros
e98c83a025 WIP:
* slicing supports
* adding the pad geometry
* rasterizing the support and pad slices
2018-11-14 18:04:43 +01:00
YuSanka
caaacb4c4f Added "change position" from modification pane 2018-11-14 16:24:55 +01:00
Enrico Turri
72b5da952d Removed a bunch of obsolete methods 2018-11-14 15:57:11 +01:00
Enrico Turri
234eaa4b6c Small refactoring 2018-11-14 13:49:41 +01:00
YuSanka
9467209c1a Fixed crashing on reset_settings_value() 2018-11-14 13:40:55 +01:00
Enrico Turri
2e9f404df3 Snap in gizmo move 3D when holding Shift pressed 2018-11-14 13:29:57 +01:00
Enrico Turri
4149b9ad28 Snap in gizmo scale 3D when holding Shift pressed 2018-11-14 12:57:12 +01:00
YuSanka
62aa34b444 SpinCtrsl inside Manipulation pane is replaced to TextCtrls
+ Added "proces_enter" mode for TextCtrl (The control will generate the event wxEVT_TEXT_ENTER)
2018-11-14 12:35:15 +01:00
Enrico Turri
86c1f5b417 Fixed crashes when deleting objects 2018-11-14 11:22:13 +01:00
Enrico Turri
a56cee5f60 Gizmos rotate, move and scale rendered on top of geometry 2018-11-14 10:43:52 +01:00
Enrico Turri
3613a54e03 Deletion of instances and volumes from 3D scene 2018-11-14 08:53:56 +01:00
bubnikv
3858fecf0c Fixed merge conflict: Added ModelInstance ID to the SLAPrintObject Instance 2018-11-13 19:22:05 +01:00
bubnikv
fedc78dc91 Merge branch 'dev_native' of https://github.com/Prusa3d/Slic3r into dev_native 2018-11-13 18:44:45 +01:00
bubnikv
88445f98f0 Fixed forward declaration of enums, made volumes with negative ID
directly unselectable.
2018-11-13 18:44:30 +01:00
tamasmeszaros
9a93b1d3e9 Merge remote-tracking branch 'origin/dev_native' into tm_sla_supports_backend
# Conflicts:
#	src/libslic3r/SLAPrint.hpp
2018-11-13 17:50:17 +01:00
tamasmeszaros
7d41b9a2d6 add step completeness checks 2018-11-13 17:46:02 +01:00
bubnikv
03875e7d71 GLVolume: split composite_id to object_id, volume_id and instance_id.
WIP: Added creation of GLVolumes for SLA supports.
2018-11-13 17:45:44 +01:00
tamasmeszaros
ffe6862626 Slicing object and rasterization generates output zip. Needs testing. 2018-11-13 17:33:03 +01:00
Enrico Turri
951f8f602b Fixed crash into void Sidebar::show_info_sizer() when deleting objects 2018-11-13 15:24:05 +01:00
YuSanka
05e2d33d3f Added functions for deleting (sub)objects from model and list at the same time 2018-11-13 15:10:19 +01:00
YuSanka
ad8f270796 Added delete_instance_from_list(obj_idx, inst_idx) function 2018-11-13 13:35:10 +01:00
YuSanka
b721f9431a Fixed show_info_sizer according to selected mode.
+ fixed right panel layouts
+ deleted unused functions
2018-11-13 13:35:10 +01:00
tamasmeszaros
95419370e1 zip file output dialog and status indication for sla in the statusbar. 2018-11-13 11:53:54 +01:00
Enrico Turri
5089c4e2e0 Grabbers of different length in rotate 3D gizmo to avoid overlap at 90 degrees 2018-11-13 11:52:13 +01:00
Enrico Turri
03390c594f Removed code committed by mistake in previous commit 2018-11-13 11:25:59 +01:00
Enrico Turri
dc8523cac8 Fixed convex hull and volume offset after object split to part 2018-11-13 10:12:42 +01:00
Enrico Turri
3d4e37ceb6 Center volumes after split to parts 2018-11-13 08:36:10 +01:00
YuSanka
ca868fcaf1 Fixed typo bug 2018-11-13 08:00:27 +01:00
tamasmeszaros
90c38daeae trying to get the export dialog for zip files. 2018-11-12 18:09:47 +01:00
tamasmeszaros
c6695538a9 Merge remote-tracking branch 'origin/tm_sla_supports_backend' into dev_native 2018-11-12 17:42:20 +01:00
tamasmeszaros
72a1f36281 Merge branch 'dev_native' of github.com:prusa3d/Slic3r into dev_native 2018-11-12 17:37:53 +01:00
tamasmeszaros
92a2b6161b Merge remote-tracking branch 'origin/tm_sla_supports_backend' into dev_native 2018-11-12 17:36:54 +01:00
tamasmeszaros
31967d0d1d support generation when support point is added or removed. Rendering interface for SLA supports 2018-11-12 17:35:57 +01:00
bubnikv
4f200c5bd5 Merge branch 'dev_native' of https://github.com/Prusa3d/Slic3r into dev_native 2018-11-12 16:28:35 +01:00
bubnikv
48173e2a55 Fixed synchronization of background processing with the front end. 2018-11-12 16:28:27 +01:00
YuSanka
d20bac7039 Added a modifier selection in the object list
+ set box-subobject's center to the objects center
+ fixed bug in PrusaObjectDataViewModel.Delete(), when deleting last volume_idx
2018-11-12 16:03:50 +01:00
Lukas Matena
df658713bf Wipe tower preview not shown in SLA mode 2018-11-12 15:41:04 +01:00
Lukas Matena
70fdb48c12 Manipulation with colorprint ticks now calls Plater::schedule_background_process() 2018-11-12 15:41:04 +01:00
tamasmeszaros
98a640ea06 Getting rid of AppController. 2018-11-12 15:07:41 +01:00
tamasmeszaros
a4e1ab2281 Getting rid of AppController. 2018-11-12 15:02:42 +01:00
YuSanka
c227dad8cc Changed object list behavior when we have only one part(volume) inside main object 2018-11-12 13:48:41 +01:00
tamasmeszaros
33eade5300 SLA backround processing pipeline invisible but runs. 2018-11-12 11:46:38 +01:00
Enrico Turri
564fa9e4dc Enhanced volumes manipulation 2 (scaling in local system) 2018-11-12 09:54:04 +01:00
Enrico Turri
22dbcbcd9c Enhanced volumes manipulation - wip 2018-11-12 08:54:22 +01:00
YuSanka
a72470079d Added GUI_ObjectSettings.cpp(hpp) files to CMakeLists.txt 2018-11-12 08:14:42 +01:00
YuSanka
7f4a8bccd5 Fixed controls layout on right panel.
+ Split ObjectManipulation class to ObjectManipulation and ObjectSettings
+ fixed typo-bug in GetItemByVolumeId
2018-11-09 18:42:06 +01:00
tamasmeszaros
e05063c8b1 Merge remote-tracking branch 'origin/dev_native' into tm_sla_supports_backend 2018-11-09 18:35:32 +01:00
tamasmeszaros
5b34e54ce9 Merge remote-tracking branch 'origin/dev_native' into dev_native 2018-11-09 18:33:38 +01:00
tamasmeszaros
cc4c720160 Working on SLAPrint pipeline. 2018-11-09 18:32:35 +01:00
tamasmeszaros
481cba0b7f Fixing sla support parameter names. 2018-11-09 18:31:36 +01:00
bubnikv
a2c702dec5 Merge branch 'dev_native' of https://github.com/Prusa3d/Slic3r into dev_native 2018-11-09 14:25:39 +01:00
bubnikv
3075e7f40f Fixed update of ModelObject / ModelVolume configs on Print,
fixed some compiler warnings.
2018-11-09 14:25:18 +01:00
tamasmeszaros
3722efd8e9 Added parameters to SLAObjectConfig 2018-11-09 13:45:55 +01:00
bubnikv
0555fb4bcc Merge branch 'dev_native' of https://github.com/Prusa3d/Slic3r into dev_native 2018-11-09 12:03:28 +01:00
bubnikv
870c435e1b WIP: SLAPrintObjectConfig, SLAPrint / SLAPrintObject initialization. 2018-11-09 12:02:42 +01:00
Enrico Turri
f2d1153d8f Removed unneeded auto-arrange from Plater::priv::load_model_objects() 2018-11-09 10:37:50 +01:00
Enrico Turri
12ef6913d5 ModelObject::instance_bounding_box() fixed to take in account for volumes' transforms 2018-11-09 10:31:58 +01:00
bubnikv
06a51f9ed3 Fixed a crash on "split to parts" with an active SLA printer. 2018-11-08 20:44:07 +01:00
bubnikv
bbfbe88a5f Integrated SLAPrint into background processing.
Fixed couple of compiler warnings.
2018-11-08 20:18:40 +01:00
tamasmeszaros
811404d97a Merge remote-tracking branch 'origin/dev_native' into tm_sla_supports_backend 2018-11-08 17:24:31 +01:00
tamasmeszaros
dbf6ddd344 Trying to bypass igl in 32 bit MSVC 2018-11-08 17:15:10 +01:00
YuSanka
2e8f21fff8 Changed toolbar icons for "split to object/part" 2018-11-08 16:44:59 +01:00
YuSanka
aa3e4c294a Added type "MultipleFullObject" to Selection
+ Fixed updating of the name of the manipulation pane
+ Changed logic of "Ctrl+A" inside the object list
2018-11-08 16:44:58 +01:00
YuSanka
96249792f6 Single volume selection from scene to object list 2018-11-08 16:44:58 +01:00
tamasmeszaros
4a2da3d443 Trying to fix compilation of IGL AABB tree on 32 bit platform.
Removing alignment constraints from Eigen Matrix aliases.
2018-11-08 16:43:33 +01:00
tamasmeszaros
100386c699 Merge remote-tracking branch 'origin/dev_native' into tm_sla_supports_backend 2018-11-08 16:20:37 +01:00
tamasmeszaros
4662fd0e73 Merge remote-tracking branch 'origin/dev_native' into tm_sla_supports_backend 2018-11-08 16:19:22 +01:00
tamasmeszaros
bf1188442a remove SLAPrint and its integration 2018-11-08 16:18:05 +01:00
tamasmeszaros
3b373a55e6 slaprint with dummy backround processing in plater. 2018-11-08 16:01:21 +01:00
Vojtech Kral
3e4af381c9 Fix rendering performance on macOS 2018-11-08 15:31:29 +01:00
Vojtech Kral
24b30caf94 Fix clang build / detect standalone size_t 2018-11-08 15:19:50 +01:00
bubnikv
05b1ed3c2a Fixed a compilation issue on OSX 2018-11-08 15:02:47 +01:00
bubnikv
34e525766b Fix of friend declaration on a template parameter, according to C++11 2018-11-08 14:57:42 +01:00
Enrico Turri
71c2d34308 Fixed crash in void GLGizmoSlaSupports::update_mesh() 2018-11-08 14:55:25 +01:00
bubnikv
c2e46350f2 Separated Print / PrintObject into PrintBase.cpp/h to support SLAPrint 2018-11-08 14:23:17 +01:00
YuSanka
6d60ecffa0 Added naming of the new(fixed) object
+ fixed inconsistency of parameters inside fix_model_by_win10_sdk_gui()
2018-11-08 13:19:12 +01:00
Enrico Turri
9e8e5761a9 Added new query methods to GLCanvas3D::Selection 2018-11-08 12:23:07 +01:00
tamasmeszaros
91a79e0343 Support tree interface extended with mouse event handling and refresh callback. 2018-11-08 10:21:13 +01:00
Enrico Turri
d590661d40 Fixed objects name after 3mf import 2018-11-08 10:18:19 +01:00
YuSanka
f1224c64ba Small fix inside fix_model_by_win10_sdk_gui() 2018-11-08 09:58:48 +01:00
YuSanka
2c0b784a2d Added(ported) function fix_through_netfabb()
+ Fixed adding of the instances to the object list
2018-11-08 09:58:48 +01:00
tamasmeszaros
f6591f000e slicing the supports WIP 2018-11-07 17:57:02 +01:00
Vojtech Kral
8c4fa9ba51 CMake: Add ASan option 2018-11-07 17:38:08 +01:00
tamasmeszaros
d7baac59ef Comments and SLA stage definitions. 2018-11-07 16:08:04 +01:00
tamasmeszaros
97b3d94760 Merge remote-tracking branch 'origin/dev_native' into tm_sla_supports 2018-11-07 15:30:41 +01:00
tamasmeszaros
19b1aa081d SLAPrint concept under its way. 2018-11-07 15:29:13 +01:00
Lukas Matena
377350db33 When iterating over PrintObject regions, use PrintObject::region_volumes (see also yesterday's commit 3eea327) 2018-11-07 15:17:29 +01:00
bubnikv
041de161a9 Fixes to storing and loading configs from AMF/3MF. 2018-11-07 14:57:50 +01:00
Enrico Turri
e529315ef9 Fixed update of ModelVolume mirror after GLVolume manipulation 2018-11-07 14:51:11 +01:00
Lukas Matena
9ca9e2a545 Merge branch lm_colorprint_integration into dev_native + deleting ticks outside slider range 2018-11-07 14:44:47 +01:00
Enrico Turri
69208c4f43 Fixed update of ModelVolume scale after GLVolume manipulation 2018-11-07 14:24:10 +01:00
Enrico Turri
92528ebcb3 Fixed update of ModelVolume rotation after GLVolume manipulation 2018-11-07 14:15:04 +01:00
Enrico Turri
b05aa00089 Fixed update of ModelVolume offset after GLVolume manipulation 2018-11-07 14:01:03 +01:00
Enrico Turri
102bc99958 Only one instance enabled when selecting sub parts 2018-11-07 12:11:34 +01:00
Enrico Turri
f4b16bb242 Added new selection states - Select parts/modifiers from first instance only from right panel 2018-11-07 10:34:44 +01:00
bubnikv
e385b43106 Merge branch 'dev_native' of https://github.com/Prusa3d/Slic3r into dev_native 2018-11-06 19:10:25 +01:00
bubnikv
e4eec90046 Fixed loading of old 3mf files. 2018-11-06 19:09:54 +01:00
tamasmeszaros
22c9c5ae95 Trying to engage support creation when the gizmo gets disabled. 2018-11-06 18:01:18 +01:00
YuSanka
6e5ce6eb61 GUI_App.hpp changed to UTF-8 2018-11-06 17:39:18 +01:00
YuSanka
00b833fbbe Lambda dialog is changed to default object adding (with default values), which can be modified from modifier matrix (in the future) 2018-11-06 17:39:18 +01:00
bubnikv
879a7bb9e4 Fixed a typo 2018-11-06 17:27:08 +01:00
Enrico Turri
f9caa6f7f1 Fixed backend detection of out of print volume 2018-11-06 16:04:30 +01:00
Enrico Turri
57c769b63b Selection of modifiers in 3D scene 2018-11-06 15:51:33 +01:00
YuSanka
de981ce8be Changed object context menu : Add part/modifier/support enforcer/support blocker -> Load model / generic box/sphere/cylinder/slab 2018-11-06 15:38:30 +01:00
bubnikv
3eea327ef0 WIP: When iterating over PrintObject's regions, use the region count
by PrintObject::region_volumes. This is due to the way Print::apply()
works, it does not invalidate an existing PrintObject if a new region
is added to the print.
2018-11-06 15:31:26 +01:00
tamasmeszaros
a49b506121 Trying to fix compilation on linux and mac. 2018-11-06 14:34:20 +01:00
bubnikv
7c934ef951 Catch unhandled exceptions in background processing, call
wxApp::OnUnhandledException()
2018-11-06 11:54:36 +01:00
YuSanka
0ac17b5513 Changed sequence of the items in the objects list (inside object): Additional Settings, Subvolumes(parts), Instances 2018-11-06 11:39:38 +01:00
Enrico Turri
7dcfe57db1 Merge branch 'dev_native' of https://github.com/prusa3d/Slic3r into dev_native 2018-11-06 10:32:12 +01:00
Enrico Turri
4f0869730a Do not render selection's bounding box when any gizmo is active 2018-11-06 10:31:19 +01:00
YuSanka
4a8b738a6b Fixed object/part splitting
If object has additional settings and we split it, add this settings for each of the new objects(parts)
2018-11-06 10:17:56 +01:00
YuSanka
95af5c7cc6 Instance selection in object list according to the canvas selection 2018-11-06 10:17:56 +01:00
Enrico Turri
0810beae77 Reintroduced instances synchronization 2018-11-06 08:47:21 +01:00
bubnikv
7ffa22191d Fixed some issues with front end / back end synchronization. 2018-11-05 17:52:55 +01:00
bubnikv
706da612b6 Fixed duplicate instances after "split object to objects" 2018-11-05 12:52:51 +01:00
Enrico Turri
4b5657b16b Fixed assert in GLCanvas3D::Selection::is_single_full_instance() 2018-11-05 10:54:05 +01:00
Lukas Matena
13a2532746 Merge branch 'dev_native' of http://github.com/prusa3d/Slic3r into dev_native 2018-11-05 09:39:12 +01:00
Lukas Matena
9442cb99f4 Flatten gizmo now correctly processes both instance and volume transformations 2018-11-05 09:34:04 +01:00
YuSanka
be57bb5c0e Update showing of the settings after part type changing 2018-11-05 08:58:14 +01:00
YuSanka
4eae6c0189 Changing of a type of a volume in the object list 2018-11-05 08:58:14 +01:00
YuSanka
a9e7b5c645 Implemented adding of support enforcer/blocker to the object list 2018-11-05 08:58:14 +01:00
Enrico Turri
864bc6ad48 Mirror of ModelVolume as transformation component (without modifying the mesh) 2018-11-05 08:51:00 +01:00
Enrico Turri
fb6a08cfb0 Rotate of ModelVolume as transformation component (without modifying the mesh) 2018-11-05 08:31:54 +01:00
Lukas Matena
edceb80b18 Updated function names in GLCanvas3D.cpp (mismatch caused by two conflicting commits yesterday) 2018-11-03 08:46:51 +01:00
bubnikv
0870f81425 Merge remote-tracking branch 'remotes/origin/vb_modelbase_id_refactor' into dev_native 2018-11-02 20:53:47 +01:00
bubnikv
3b72748489 Removed the STDMOVE macro. 2018-11-02 20:45:23 +01:00
bubnikv
5da83742a3 Some refactoring. 2018-11-02 20:41:49 +01:00
bubnikv
cf5dcfa9ed ModelBase ID refactoring, starting to work.
Now it remains to clean up some of the no more used Model interfaces.
2018-11-02 19:49:40 +01:00