Commit Graph

380 Commits

Author SHA1 Message Date
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
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
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
31967d0d1d support generation when support point is added or removed. Rendering interface for SLA supports 2018-11-12 17:35:57 +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
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
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
Enrico Turri
f2d1153d8f Removed unneeded auto-arrange from Plater::priv::load_model_objects() 2018-11-09 10:37:50 +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
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
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
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
Enrico Turri
9e8e5761a9 Added new query methods to GLCanvas3D::Selection 2018-11-08 12:23:07 +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
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
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
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
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
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
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
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
Lukas Matena
622f4ee4f6 Flatten gizmo should now work with multiple selection 2018-11-02 15:20:26 +01:00
Enrico Turri
7114b80882 Use Transform3d in place of Transform3f as parameter of mesh transform functions 2018-11-02 13:47:47 +01:00
Enrico Turri
3aad8b5fd2 Translation of ModelVolume as transformation component (without modifying the mesh) 2018-11-02 12:11:28 +01:00
Lukas Matena
93ef2de667 SLA supports gizmo is only shown in SLA mode 2018-11-02 10:31:57 +01:00
Lukas Matena
f5e8eaedb3 Added a special (temporary) icon for SLA supports gizmo, removed igl files from xs/src 2018-11-02 10:22:48 +01:00
YuSanka
618d0e4910 Fixed splitting of the objects with instances 2018-11-01 16:24:20 +01:00
YuSanka
2200e42174 Fixed crashing after filament preset changing from Plater 2018-11-01 16:24:20 +01:00
YuSanka
7c673179f6 Temporary (for testing) crash fixing on get_label from PrusaDoubleSlider 2018-11-01 16:24:20 +01:00
Enrico Turri
7751d991d4 GLCanvas3D::update_gizmos_data() set as private 2018-11-01 15:08:39 +01:00
Enrico Turri
b8168d421c Refactoring 2018-11-01 14:25:10 +01:00
YuSanka
c135f4a1f8 After-merge bug fixing 2018-11-01 14:02:38 +01:00
YuSanka
ba8a2e11b8 Merge branch 'dev_native' of https://github.com/prusa3d/Slic3r into dev_native 2018-11-01 13:56:20 +01:00
YuSanka
e62246d56c Fixed Info pane filling 2018-11-01 12:57:21 +01:00
Enrico Turri
a15bf7cc25 New selection set as default 2018-11-01 10:06:55 +01:00
Enrico Turri
0d282896d0 Removed obsolete references to tech ENABLE_MODELINSTANCE_3D_FULL_TRANSFORM 2018-11-01 08:50:54 +01:00
Enrico Turri
00222226ed Mirror component of transformations set as default 2018-11-01 08:46:44 +01:00
Vojtech Kral
90216ac0b4 ConfigWizard: Fix asserts 2018-10-31 18:35:30 +01:00
bubnikv
75c097010d Finished (?) switching between the FDM / SLA profiles,
fixed an invalidation bug in Print::apply()
2018-10-31 18:05:25 +01:00
bubnikv
7e71aaffd5 Merge branch 'dev_native' of https://github.com/prusa3d/Slic3r into dev_native 2018-10-31 16:25:55 +01:00
bubnikv
fd1c5dd218 WIP: SL1 profiles, SL1 in wizard, switching between FFF / SLA 2018-10-31 16:22:36 +01:00
YuSanka
5a4cef9ac1 Fixed part settings updating 2018-10-31 16:06:32 +01:00
Enrico Turri
d6d632d4fc Added Geometry::Transformation class. Use it into ModelInstance, ModelVolume and GLVolume 2018-10-31 14:56:51 +01:00
YuSanka
7f08f460f1 Some code review 2018-10-31 12:58:35 +01:00
YuSanka
d2844bc39d Ported show_sliced_info_sizer
+ some code-view changes
2018-10-31 12:58:35 +01:00
Lukas Matena
c7167fd9d1 Merge branch 'dev_native' of http://github.com/prusa3d/Slic3r into dev_native 2018-10-31 12:24:31 +01:00
Lukas Matena
cc27570704 Fixed a crash when moving an object with wipe tower volume on screen 2018-10-31 12:23:26 +01:00
Enrico Turri
ae6c65dfff New selection -> Fixed split object to objects 2018-10-31 11:24:56 +01:00
Enrico Turri
b23f7e5834 New selection -> Restore selection after splitting an object to parts 2018-10-31 09:53:48 +01:00
Enrico Turri
da4903a37f New selection -> Disabled instances synchronization 2018-10-31 09:39:43 +01:00
Enrico Turri
503166a6a4 Automatic placement of instance at bed level 2018-10-30 16:03:03 +01:00
bubnikv
66e97aa4eb Reduced memory leaks in ConfigDef / PrintConfigDef
Deleted unsafe default copy constructors / operators in Model / ModelObject / ModelInstance / ModelVolume
Fixed some issues with copying the Model / ModelObject / ModelInstance / ModelVolume inside Print::apply()
Fixed some invalidation issues in Print::apply()
Temporarily renamed the Slic3rPE profile directory to Slic3rPE-alpha.
2018-10-30 15:24:36 +01:00
Enrico Turri
63960dfde0 Translate entire selection when user clicks and drags on a selected volume 2018-10-30 11:18:15 +01:00
bubnikv
f2b0904d12 WIP: Fixed some issues with cancelation & restart of background processing. 2018-10-30 09:27:31 +01:00
Lukas Matena
7681d00ee5 Merged branch 'dev_native' into lm_sla_supports_auto
Added igl library files
2018-10-26 15:45:52 +02:00
Enrico Turri
f651182101 Rendering of camera target (for debug) and modified camera target behavior 2018-10-26 09:50:28 +02:00
YuSanka
cbb62142de Added "Set number of copies…" to the context menu 2018-10-25 21:13:45 +02:00
YuSanka
965236a9d9 Fixed OsX build fails 2018-10-25 19:10:14 +02:00
Enrico Turri
321322b17a Fixed rendering of warning and legend textures (due to newer wxWidgets) 2018-10-25 15:32:35 +02:00
YuSanka
3f9fb575b8 Middle mode is changed to Advanced 2018-10-25 14:55:03 +02:00
YuSanka
3009439838 Ported System Info Dialog 2018-10-25 12:49:29 +02:00
Enrico Turri
e72a058600 Fixed update of GUI when object is selected by right-clicking on it to show its context menu 2018-10-25 12:36:10 +02:00
Enrico Turri
c00ee0659e Call schedule_background_process() after rotating/scaling/flattening using gizmos 2018-10-25 12:10:35 +02:00
Enrico Turri
30fe846158 Do not translate selection if user press Shift while selecting and then drags 2018-10-25 11:06:08 +02:00
Enrico Turri
30a130e014 Merge branch 'dev_native' of https://github.com/prusa3d/Slic3r into dev_native 2018-10-25 10:37:04 +02:00
Enrico Turri
bde5f17d5c Fixed build on Linux and OSx 2018-10-25 10:36:47 +02:00
bubnikv
929e8ac833 Merge branch 'dev_native' of https://github.com/prusa3d/Slic3r into dev_native 2018-10-25 10:07:25 +02:00
bubnikv
5e39ff7c58 Restored slicing cancellation. 2018-10-25 10:07:11 +02:00
Enrico Turri
61f7849fce Merge branch 'dev_native' of https://github.com/prusa3d/Slic3r into dev_native 2018-10-25 09:35:26 +02:00
Enrico Turri
78d813cbc9 Tooltip when hovering on gizmo icons 2018-10-25 09:35:08 +02:00
bubnikv
f90795bd55 Merge remote-tracking branch 'origin/lm_temporary_path_fix' into dev_native 2018-10-25 09:10:35 +02:00
Lukas Matena
9789908ed8 Temporary file name generated with boost::filesystem::path (an attempt to solve linux/win mismatch regarding terminating (back)slash) 2018-10-24 21:03:12 +02:00
bubnikv
540a94b36d Merge branch 'dev_native' of https://github.com/prusa3d/Slic3r into dev_native 2018-10-24 14:45:50 +02:00
bubnikv
22110e15c8 Fixed spurious error reports when loading the default profile file
on start of the application.
2018-10-24 14:45:22 +02:00
Enrico Turri
77d6ebc126 Rotate gizmo -> Grabbers showing tooltip also on hover for single instance selection. 2018-10-24 14:12:33 +02:00
Enrico Turri
17b7a3b9d7 Scale gizmo -> Grabbers showing tooltip also on hover for single instance selection. 2018-10-24 13:56:43 +02:00
Enrico Turri
9b3e3ec967 Move gizmo -> 1) Grabbers showing tooltip also on hover for single instance selection. 2) Tooltip showing current position for single instance selection. 2018-10-24 13:28:35 +02:00
YuSanka
e3b4a7b206 Fixed incorrect m_wiping_dialog_button showing after appInit 2018-10-24 12:58:35 +02:00
Enrico Turri
90ecbce9bb Split to objects and Split to parts 2018-10-24 12:55:38 +02:00
bubnikv
f3c9a798dd Merge branch 'dev_native' of https://github.com/prusa3d/Slic3r into dev_native 2018-10-24 11:48:44 +02:00
bubnikv
197458cf3a Background processing: Fixed rotation & scaling of PrintObjects. 2018-10-24 11:48:39 +02:00
Enrico Turri
37e4f69e3b Fixed memory leak in GLToolbar 2018-10-24 10:55:35 +02:00
Enrico Turri
8940209865 Fixed menu view accelerator keys 2018-10-24 10:46:18 +02:00
bubnikv
6c38cb2c32 WIP: Background processing is almost working now.
still PrintObject::_slice_volumes() needs some love to set
the PrintObject matrices correctly.
2018-10-23 22:53:43 +02:00
bubnikv
bded28f888 WIP: Reconstruction of background processing. 2018-10-23 15:27:31 +02:00
bubnikv
f33713e060 Merge remote-tracking branch 'remotes/origin/dev_native' into vb_dev_native_background_processing 2018-10-23 12:59:31 +02:00
Enrico Turri
9a4a41acbf New selection -> Fixed selection cleanup in GLCanvas3D::reset_volumes() 2018-10-23 11:50:30 +02:00
Enrico Turri
4c527776e7 Fixed memory leak in Tab::add_options_page() 2018-10-23 11:44:46 +02:00
bubnikv
edc79cb922 Merge branch 'dev_native' into vb_dev_native_background_processing 2018-10-23 11:26:15 +02:00
Enrico Turri
6d5d4e7c24 Fixed exception when closing Slic3r 2018-10-23 09:48:01 +02:00
Enrico Turri
1979ba0e0f New selection -> Keep selection after instance inscrease/decrease command 2018-10-23 09:19:41 +02:00
Enrico Turri
75e3b3a9b8 Merge branch 'dev_native' of https://github.com/prusa3d/Slic3r into dev_native 2018-10-22 15:19:33 +02:00
Enrico Turri
2f11df47ce Layers editing 2018-10-22 15:18:56 +02:00
YuSanka
3ecb65d62c Fixed mode updating under GTK 2018-10-22 15:18:33 +02:00
YuSanka
84de664fb5 Fixed TreeCtrl updating after mode change
+ Added another images for mode visualization
2018-10-22 12:08:30 +02:00
Vojtech Kral
f6e6d9dc4a Fix Plater::priv::get_export_file() 2018-10-22 12:07:43 +02:00
Vojtech Kral
974e2056fb Plater: Fix file patterns 2018-10-22 11:53:39 +02:00