Commit Graph

1570 Commits

Author SHA1 Message Date
Enrico Turri
c08d0a4a78 Bunch of fixes into sla support gizmo 2018-12-03 14:02:58 +01:00
YuSanka
7395b923bd Update gizmos on/off state 2018-12-03 13:29:28 +01:00
bubnikv
435163fb73 Merge branch 'master' of https://github.com/Prusa3d/Slic3r 2018-12-03 13:21:48 +01:00
bubnikv
d46d0dc365 Implemented naming of the SLA export file based on the output file name
template.

Reworked naming of the plater exports to not use the output file name
template, but to derive the file name from the first printable object's name.

Fixed error handling: Reimpemented the Perl's "eval" blocks
as try / catch blocks.
2018-12-03 13:14:28 +01:00
YuSanka
d522e8ea70 Delete mixed selection 2018-12-03 12:13:57 +01:00
Enrico Turri
c205e3fb0c Gizmo flatten -> allow for only single instance and let planes follow the instance when moving the object by dragging it on the scene 2018-12-03 11:14:17 +01:00
Enrico Turri
e1c90c83e8 Fixed GLVolumes reuse after instance deletion 2018-12-03 10:37:46 +01:00
Enrico Turri
693a4168f8 Always show axis name when hovering over gizmo grabbers 2018-12-03 10:17:42 +01:00
Enrico Turri
020994f987 Refactoring into extended gizmo grabbers 2018-12-03 09:37:46 +01:00
Enrico Turri
624df6bf9a Extended grabbers for gizmo move 2018-12-03 08:51:18 +01:00
tamasmeszaros
d50644eef8 Fix for uninitialized variable which might break sla auto rotation 2018-11-30 15:41:45 +01:00
bubnikv
041fae8148 Added the bed texture for SL1 2018-11-30 15:31:47 +01:00
Enrico Turri
1f3b9d0657 Fixed vertical centering of gizmo overlay icons 2018-11-30 13:27:54 +01:00
Enrico Turri
918a7f8ddd Fixed lost selection when selecting object while place on face gizmo is active 2018-11-30 12:49:31 +01:00
Enrico Turri
b83468e763 Removed gizmo reset by double-cliking on grabbers 2018-11-30 11:42:36 +01:00
YuSanka
054d202817 Correct mixed_selection updating from 3dScene to ObjectList 2018-11-30 11:22:06 +01:00
YuSanka
4bb771683d Fixed assert message after wxAutoBufferedPaintDC and warnings in 2DBed.cpp 2018-11-30 11:22:06 +01:00
Enrico Turri
4e4760bb82 Fixed translation of volumes belonging to scaled instances 2018-11-30 10:59:00 +01:00
Enrico Turri
dca0cb04ea New icons for gizmo overlay 2018-11-30 08:48:32 +01:00
tamasmeszaros
6c99837a9d Quick fix for broken MacOS build 2018-11-29 18:33:30 +01:00
tamasmeszaros
55d62b8295 Fix for empty or broken png output.
Fix for instance transformation order error and state invalidation issues with rasterization.
2018-11-29 18:12:40 +01:00
Enrico Turri
bf94751a94 Esc key toggles off current gizmo 2018-11-29 15:33:52 +01:00
Enrico Turri
42b70c4933 Modified gizmo rotate rendering 2018-11-29 15:10:11 +01:00
YuSanka
d7f9e86400 Update additional object setting after print technology changing 2018-11-29 15:01:20 +01:00
tamasmeszaros
38733ff56a Merge branch 'tm_sla_supports_backend' 2018-11-29 13:34:48 +01:00
YuSanka
2add733caa Suppress change preset to SLA if we have multi-part object 2018-11-29 12:35:07 +01:00
Vojtech Kral
be9ba936e9 Cut: Sanitize Z when switching selections 2018-11-29 12:22:06 +01:00
tamasmeszaros
980c53970b merge tm_sla_supports_backend with master, reapply fix for index slice invalidation, fix for autorotation z offset 2018-11-29 11:45:02 +01:00
Enrico Turri
ef1d43c711 SLA slices preview - improved performances 2018-11-29 11:11:39 +01:00
tamasmeszaros
8fbfad275c Reordered scene reload to prevent race conditions.
Also extended progress status bar to support status value -1 for pulsing.
2018-11-29 10:57:06 +01:00
Enrico Turri
7913060869 Added zoom in/out using keys [i]/[o] 2018-11-29 09:03:38 +01:00
Vojtech Kral
18c95c404c Fix wxNotebook event incontinence 2018-11-28 19:26:48 +01:00
Enrico Turri
19c47afb7b Fixed size of gizmo scale grabbers 2018-11-28 16:09:04 +01:00
YuSanka
c010e14460 Suppress ColorPrint for the multi-material printing 2018-11-28 16:03:25 +01:00
YuSanka
360133246c Fixed ColorPrint current layer identification 2018-11-28 16:03:24 +01:00
Enrico Turri
bac021d516 SLA slices preview - completed prototype 2018-11-28 15:13:25 +01:00
Lukas Matena
ebac4c7eb8 Place on bed gizmo disabled for individual object parts 2018-11-28 12:08:25 +01:00
Lukas Matena
5813ec08c9 Place on bed planes recalculation after individual volumes are manipulated 2018-11-28 11:37:41 +01:00
Enrico Turri
0a47bc1c5c SLA slices preview - wip 5 2018-11-28 09:28:07 +01:00
Vojtech Kral
f5080ea7f5 Fix re-entrant render() calls, add an assert to enforce 2018-11-27 16:57:37 +01:00
Vojtech Kral
0bdbd3ee63 imgui: Use OpenGL 2.0 2018-11-27 16:57:37 +01:00
Vojtech Kral
21cb489077 WIP: imgui: Fix GLSL version enumeration 2018-11-27 16:57:37 +01:00
YuSanka
f203f6fbd9 ColorPrint improvement
+ Select "Color Print" preview type if it's not after add/delete new color change
+ Added level heights to the color legend instead of "Color N"
2018-11-27 16:04:56 +01:00
Enrico Turri
4c8f3f6ea7 SLA slices preview - wip 4 2018-11-27 15:36:31 +01:00
Enrico Turri
e6369fe548 SLA slices preview - wip 3 2018-11-27 14:50:57 +01:00
Vojtech Kral
cc557b8a7f Yet more fix of ENABLE_IMGUI 2018-11-27 12:51:50 +01:00
Vojtech Kral
d0b6beaaaa One more fix of ENABLE_IMGUI 2018-11-27 12:00:44 +01:00
Vojtech Kral
2585e3103d imgui: Fix ENABLE_IMGUI, disable on OS X for now 2018-11-27 11:28:19 +01:00
YuSanka
db4ceaa5fa DoubleSlider improvement
+ added thicks selection by mouse in the DoubleSlider
 + Click on the Unlock icon on DoubleSlider => set Min and Max slider values
2018-11-27 11:13:00 +01:00
tamasmeszaros
3f0ea223d1 Speeding up the auto rotation algorithm (decreasing accuracy) 2018-11-27 11:09:25 +01:00
bubnikv
85e81a2a21 SLA support points gizmo: Limit manipulation to an active instance
(the first instance selected), show the points on other instances
grayed out.
2018-11-26 20:39:18 +01:00
bubnikv
3fa099bd1a Fix of SLA support gizmos:
Fix of the Z offset.
Background processing is now not re-triggered during dragging
of a support point.
2018-11-26 19:22:16 +01:00
Vojtech Kral
3b20d03e1d Cut: Preserve Z-rotation, fix upper part mesh position,
perform custom placing instead of arrange()
2018-11-26 17:09:37 +01:00
Lukas Matena
21a1106776 SLA support points are rendered with regard to sla_shift_z 2018-11-26 16:32:42 +01:00
YuSanka
f8bc7cb959 Implementation of the "ColorPrint" on the 3DScene 2018-11-26 16:28:12 +01:00
Enrico Turri
b153c8cb20 SLA slices preview - wip 2 2018-11-26 16:17:59 +01:00
Lukas Matena
878c7ee3d7 SLA support point gizmo - ImGui experimental overlay plus a small bugfix related to point deletion 2018-11-26 15:54:37 +01:00
bubnikv
ebbce32158 Merge branch 'master' of https://github.com/Prusa3d/Slic3r 2018-11-26 15:19:58 +01:00
bubnikv
b5c56caf6f Fixed an issue with the SLA Z offset at the end of slicing,
fixed compilation on OSX due to the libigl overriding our "L" localization
macro.
2018-11-26 15:19:42 +01:00
Enrico Turri
4ca302ba6a SLA slices preview - wip 2018-11-26 15:16:35 +01:00
bubnikv
a378bb7bed Removed some obsolete Perl bindings.
Removed libslic3r from the default include paths for all modules but
libslic3r. Now headers from libslic3r need to be included with an
explicit path (libslic3r/libslic3r.h etc)
Split the localization macros into I18N.{cpp,h}
2018-11-26 14:41:58 +01:00
Lukas Matena
9f2fdfabb9 Lay flat gizmo should work correctly with multiple instances and modifier meshes 2018-11-26 13:03:03 +01:00
Lukas Matena
d28d4823e0 SLA support points gizmo - multiple instance support 2018-11-26 13:03:03 +01:00
Enrico Turri
e038c3a20d Merge branch 'master' of https://github.com/prusa3d/Slic3r 2018-11-26 12:11:37 +01:00
Vojtech Kral
25f4f1fe55 Cut: Use world coordinates 2018-11-26 12:08:10 +01:00
Enrico Turri
63996f5ba1 Fixed update of GLCanvas3D::m_moving member 2018-11-26 11:49:04 +01:00
Vojtech Kral
c29493a41b imgui: Refactor, use in cut gizmo 2018-11-26 11:16:39 +01:00
Vojtech Kral
763b443459 imgui: Update 2018-11-26 10:57:14 +01:00
Enrico Turri
57e9d28a84 Added ImGuiWrapper 2018-11-26 10:57:12 +01:00
Enrico Turri
b94f19eaf4 Added method GLCanvas3D::is_dragging() 2018-11-26 10:41:16 +01:00
Enrico Turri
da0b9b9b75 Generate EVT_GLCANVAS_MOUSE_DRAGGING_FINISHED event after an object has been dragged on scene 2018-11-26 08:36:31 +01:00
bubnikv
9258ca8cc6 Further removal of the 3DScene / GLCanvas3DManager scaffold. 2018-11-23 17:15:17 +01:00
Enrico Turri
aaab549cfa Partial cleanup of obsolete methods 2018-11-23 15:05:43 +01:00
Enrico Turri
f838d8cf18 Fixed GLCanvas3D::Selection::_ensure_on_bed() method 2018-11-23 13:20:04 +01:00
tamasmeszaros
746c1d2fd8 SLA support parameters changed: radiuses for diameters. 2018-11-23 13:05:24 +01:00
bubnikv
9722bcdd75 Merge branch 'master' of https://github.com/Prusa3d/Slic3r 2018-11-23 12:47:46 +01:00
bubnikv
b03f672801 Refactored to get direct access to GLCanvas3D in Plater and Preview.
WIP: SLA update delayed until mouse is released.
2018-11-23 12:47:32 +01:00
YuSanka
4575443c4c Fixed bug with last solid part deleting
+ fixed building
+ deleted last ";" from the settings digest
2018-11-23 11:57:04 +01:00
tamasmeszaros
a05bda5347 Removed head_back_radius and added pillar widening factor to the parameter layers 2018-11-23 11:51:45 +01:00
Enrico Turri
cabfca1031 Do not select wipe tower when using Select all command 2018-11-23 11:47:18 +01:00
Enrico Turri
bcf7a1f751 Fixed volumes translation (again) 2018-11-23 11:14:32 +01:00
Enrico Turri
66a08be209 Fixed transformations when deleting second-to-last sub-volume of an object 2018-11-23 10:50:25 +01:00
tamasmeszaros
45b51bd40e remove + shortcut from 'optimize rotation' menuitem 2018-11-23 09:56:49 +01:00
bubnikv
6da9d19916 Fixed lifting of models for SLA above the print if supports
or pad are calculated.
2018-11-23 09:33:01 +01:00
tamasmeszaros
d28b61f8a3 Adding checkbox for disabling support generation (still having pad generation) 2018-11-22 18:02:05 +01:00
tamasmeszaros
7efadfae1c Merge branch 'tm_sla_supports_backend' 2018-11-22 16:12:22 +01:00
YuSanka
421fbe3a3c Fixed updating of the value for "Post processing scripts" field 2018-11-22 16:09:28 +01:00
YuSanka
9d7b4ce41d Position(Displacement)/Rotation/Scale for group selection 2018-11-22 16:09:28 +01:00
YuSanka
7041e2b877 Hide "Extruder" column for the SLA printing 2018-11-22 16:09:28 +01:00
tamasmeszaros
c7434a492b Available object menu item: optimize orientation 2018-11-22 16:04:21 +01:00
bubnikv
bde4153d44 Removed legacy GUI Perl bindings,
replaced Print & SLAPrint pointers with BackgroundProcessing pointer
at the GLCanvas3D level, so that the Print & SLAPrint access will be
synchronized with the current printer technology.
2018-11-22 15:29:59 +01:00
bubnikv
86c11df554 Merge branch 'master' of https://github.com/Prusa3d/Slic3r 2018-11-22 13:33:34 +01:00
bubnikv
8d7a34160d Fix of my previous commit. 2018-11-22 13:33:21 +01:00
Enrico Turri
3b3eab2e84 Added member m_sla_shift_z to GLVolume 2018-11-22 13:33:20 +01:00
bubnikv
233c1593f1 Merge branch 'master' of https://github.com/Prusa3d/Slic3r 2018-11-22 13:20:18 +01:00
bubnikv
a4be8ef6ad Fixed "setting an extruder does not change object's color" 2018-11-22 13:20:13 +01:00
Enrico Turri
200b3d010f Fixed volumes translation 2018-11-22 12:50:54 +01:00
bubnikv
94b1183843 Synchronize SLA background processing on UI change, so that
the supports disappear if invalidated.
2018-11-22 12:42:17 +01:00
Enrico Turri
cac56154ef Selection updated to detect sla volumes 2018-11-22 12:07:26 +01:00
Enrico Turri
e247b532fb Added Edit -> Delete all menu item 2018-11-22 11:31:53 +01:00
Enrico Turri
c494dec1c4 Gizmos' shortcut not requiring shift key pressed 2018-11-22 11:13:00 +01:00
YuSanka
7b9f498410 Changed the object context menu in the object list for SLA print technology
+ changed list of the options for "Add settings"
2018-11-22 11:06:07 +01:00
Enrico Turri
343335dbc3 Different colors for SLA support and pad geometry 2018-11-22 11:01:57 +01:00
Enrico Turri
c60ed7bc07 Added shortcuts for gizmos 2018-11-22 10:14:31 +01:00
bubnikv
487ccdd2be Merge branch 'master' of https://github.com/Prusa3d/Slic3r 2018-11-21 17:35:58 +01:00
bubnikv
314f7dc674 WIP: Synchronization of SLA background processing. 2018-11-21 17:35:35 +01:00
Enrico Turri
a27e238ced Use Del as shortcut for Edit/Delete selected 2018-11-21 16:00:20 +01:00
Enrico Turri
3e939a7496 Added menu Edit -> Delete selected 2018-11-21 15:47:41 +01:00
Enrico Turri
681beeadf6 Added menu Edit -> Select all 2018-11-21 15:28:35 +01:00
YuSanka
c6b597b813 Fixed updating of the options values after the clearing of the TextCtrl 2018-11-21 15:05:18 +01:00
bubnikv
a21f1783a9 Added force_full_scene_refresh parameter to the 3DScene::refresh()
function to force a refresh of all GLVolumes. Currently this hack
is used by the Platter::arrange() function only, and ideally
we should replace this parameter with a smarter 3DScene::refresh()
function, which would check for the transformation matrices as well.
2018-11-21 13:52:46 +01:00
bubnikv
bc9de8956a Removed the unused force_autocenter parameter from Plater::update() 2018-11-21 13:32:24 +01:00
Enrico Turri
ee99fa2c64 Ensure object on bed after deletion of subpart 2018-11-21 12:27:20 +01:00
Enrico Turri
6aa4c0ca16 Fixed translation of volumes 2018-11-21 11:33:31 +01:00
tamasmeszaros
87b96f4c09 trying to fix broken arrange on master 2018-11-21 11:09:14 +01:00
tamasmeszaros
2fffb0c2ff Arrangement is still not working, update is probably broken. 2018-11-21 11:07:08 +01:00
Enrico Turri
86ac9ed91e Small refactoring 2018-11-21 10:36:09 +01:00
Enrico Turri
302b37dcd1 Adjusted main shortcuts 2018-11-21 10:21:12 +01:00
Enrico Turri
37b5cb9a4d Update transformation values in sidebar for single volume/modifier selection 2018-11-21 09:45:43 +01:00
Enrico Turri
d8e7310d72 Gizmo rotate operates always in world reference system 2018-11-21 09:28:27 +01:00
bubnikv
18f14482d0 Merge branch 'vb_3dscene_partial_update' 2018-11-20 17:07:31 +01:00
bubnikv
8107ff4f86 Merge remote-tracking branch 'origin/tm_sla_supports_backend' into vb_3dscene_partial_update 2018-11-20 17:05:45 +01:00
bubnikv
22a7afabba Renamed PrintBase::Status to SlicingStatusEvent
Hopefully it will fix compilation on Linux (some forgotten Status macro?)
2018-11-20 16:27:30 +01:00
tamasmeszaros
013e068d71 Merge remote-tracking branch 'origin/vb_3dscene_partial_update' into tm_sla_supports_backend 2018-11-20 16:16:23 +01:00
tamasmeszaros
d27e22c2c3 height level mismatches seems to be fixed. 2018-11-20 16:12:04 +01:00
Enrico Turri
bcfff27921 Fixed scaling of multivolumes selection - Added local scale by pressing Alt key while dragging the scale gizmo 2018-11-20 15:39:36 +01:00
bubnikv
0ec37ae038 Fixed missing wxEvent type on GCC, fixed some compiler warnings. 2018-11-20 15:01:32 +01:00
YuSanka
48e0e1078b Changed output for "Used filament", "Cost" and "Estimated printed time" inside the Sliced info pane 2018-11-20 13:32:36 +01:00
bubnikv
e3b858c45f Merge remote-tracking branch 'origin/tm_sla_supports_backend' into vb_3dscene_partial_update 2018-11-20 13:23:12 +01:00
bubnikv
bed3eed3d2 The slicing progress message can now trigger refresh of the 3D scene. 2018-11-20 13:22:26 +01:00
Enrico Turri
b961d1011a Fixed rotation of multivolumes selection - Added local rotation by pressing Alt key while dragging the rotate gizmo 2018-11-20 11:57:01 +01:00
Enrico Turri
aa22f75829 Forced zoom to bed when changing bed size 2018-11-20 10:36:26 +01:00
Enrico Turri
34cf541e0d Fixed position of newly created modifiers 2018-11-20 10:15:31 +01:00
tamasmeszaros
f3b7b36d20 Merge remote-tracking branch 'origin/dev_native' into tm_sla_supports_backend 2018-11-19 17:59:30 +01:00
tamasmeszaros
87d49cf82f Adding object elevation param.
Quick attempt to build with MinGW 7.3. Successful compile, failed linking
2018-11-19 17:58:08 +01:00
Enrico Turri
d322fa0fd5 Fixed gizmos overlay rendering/selection by adding GLGizmoBase::is_selectable() method 2018-11-19 14:46:37 +01:00
tamasmeszaros
ad8c7c9f97 GUI forms with SLA support parameters 2018-11-19 14:15:40 +01:00
YuSanka
d658d918d7 Fixed crashing when project with modifier is imported 2018-11-19 14:05:29 +01:00
YuSanka
398f15d546 Some code rebase 2018-11-19 14:05:29 +01:00
YuSanka
703f367e69 Fixed preset updating 2018-11-19 14:05:29 +01:00
YuSanka
ae4f116b46 Added the context to the TabPrintSLA 2018-11-19 14:05:29 +01:00
YuSanka
2fa055903f "SLA Print Settings" implementation (start) 2018-11-19 14:05:29 +01:00
Enrico Turri
7cb99f8e27 Added debug error message when missing icons for gizmos 2018-11-19 14:03:28 +01:00
tamasmeszaros
a00e767fd2 Merge remote-tracking branch 'origin/dev_native' into tm_sla_supports_backend 2018-11-19 13:53:27 +01:00
Vojtech Kral
ee33f0f1d7 Add missing icons 2018-11-19 13:51:43 +01:00
tamasmeszaros
35bbe89251 Merge remote-tracking branch 'origin/dev_native' into tm_sla_supports_backend 2018-11-19 13:11:03 +01:00
Vojtech Kral
60563e6702 Plater: Revert usage of panel_gizmo_widgets for now 2018-11-19 13:05:10 +01:00
Enrico Turri
dbc9bf5be7 Lift-up of SLA volumes only when at least one volume is generated 2018-11-19 13:04:19 +01:00
tamasmeszaros
0fcdc70327 Merge remote-tracking branch 'origin/dev_native' into tm_sla_supports_backend 2018-11-19 12:56:32 +01:00
Enrico Turri
eb4d1e9d5e Shift-up volumes after SLA support volumes creation 2018-11-19 12:20:44 +01:00
Vojtech Kral
b1228537d2 Plater: Fix on_notebook_changed 2018-11-19 12:00:37 +01:00
Vojtech Kral
b950e9e575 Fix build 2018-11-19 11:39:17 +01:00
Vojtech Kral
6629d75853 Cutting 2018-11-18 21:20:47 +01:00
bubnikv
74ba1eaa16 WIP: Support of SLA suport & pad GLVolumes, couple of fixes. 2018-11-17 17:23:56 +01:00
bubnikv
b59d5d083f WIP: Fixed loading of SLA support meshes. 2018-11-16 18:59:13 +01:00
bubnikv
6981152d74 fixed src/slic3r/GUI/3DScene.hpp:522:30: error:
extra qualification on member 'load_object_auxiliary'
2018-11-16 18:45:13 +01:00
bubnikv
dafa4621aa Merge remote-tracking branch 'remotes/origin/dev_native' into vb_3dscene_partial_update 2018-11-16 18:31:39 +01:00
bubnikv
c9a4c6c73c Partial update of 3D scene (GLVolumes derived from Model and from
the SLAPrintObject).
Updated PrintBase to generate a unique timestamp at each step invalidation.
2018-11-16 18:28:50 +01:00
Enrico Turri
9084d64b3b Removed duplicated code 2018-11-16 12:58:43 +01:00
Enrico Turri
417783a469 View menu items enabled only when Plater is the current active tab 2018-11-16 12:31:06 +01:00
Enrico Turri
d45739fa15 Keeps objects on bed while scaling them using the scale gizmo 2018-11-16 11:30:36 +01:00
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
Lukas Matena
8b201d0f2e Proper hiding of the SLA supports gizmo in FDM mode 2018-11-15 18:16:13 +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
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
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
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
Enrico Turri
126f0e5073 Added mirroring factors to .amf import/export 2018-10-22 11:45:03 +02:00
Enrico Turri
68f77f1031 New selection -> Changed selection logic == Use SHIFT for both add to selection and remove from selection 2018-10-22 08:54:04 +02:00
YuSanka
70f4ca3f5b Completed settings hiding according to view mode 2018-10-21 23:10:37 +02:00
YuSanka
f47949504e Prototype of the hiding according to view mode
+ Added mode icon near option's label
+ Fixed segmentation fault on Linux
2018-10-21 23:10:36 +02:00
Enrico Turri
5d94e6adb8 New selection -> Improved sychronization of instances selection between 3D scene and right panel 2018-10-19 16:14:55 +02:00
Enrico Turri
cc5405e84d Replaced dummy string in CheckboxFileDialog::ExtraPanel 2018-10-19 15:35:39 +02:00
Enrico Turri
0af4de4faa New selection -> Split command 2018-10-19 15:27:19 +02:00
Vojtech Kral
ec0c65a80a Fix CheckboxFileDialog, for real this time (I hope) 2018-10-19 15:13:20 +02:00
Vojtech Kral
b6251dd85b Fix CheckboxFileDialog 2018-10-19 13:39:34 +02:00
Enrico Turri
42a77316ba Planes of gizmo flatten visible from both sides 2018-10-19 13:26:42 +02:00
Enrico Turri
bcffa8dbe2 New selection -> Fixed scale gizmo when mirror components are enabled 2018-10-19 11:24:27 +02:00
YuSanka
5557ee3cd2 Fixed object adding to list with same object's name
+ Added name for main object for complex objects
+ Fixed incorrect Instances and Settings deleting from ObjectList
2018-10-19 11:08:43 +02:00
Enrico Turri
d7f013ba19 Fixed euler angles in gizmo flatten 2018-10-19 09:32:10 +02:00
bubnikv
a45e9c0a03 WIP: Slicing from GUI. 2018-10-18 18:06:40 +02:00
bubnikv
857863102d Merge branch 'dev_native' into vb_dev_native_background_processing 2018-10-18 18:03:17 +02:00
Enrico Turri
fbbe1325b6 Mirror transform components in ModelInstance and GLvolume - WIP and disabled 2018-10-18 15:50:51 +02:00
Enrico Turri
2c9a82e582 New selection -> Removed unneeded methods and small refactor 2018-10-18 15:09:41 +02:00
Enrico Turri
ea7216c019 Unified append_submenu() function and modified append_menu_item() function 2018-10-18 14:42:21 +02:00
YuSanka
7dea8b1c47 Merge branch 'dev_native' of https://github.com/prusa3d/Slic3r into dev_native 2018-10-18 11:43:32 +02:00
YuSanka
80f79451f7 Merge remote-tracking branch 'origin/ys_dev_native' into dev_native 2018-10-18 11:41:29 +02:00
Vojtech Kral
fef8d1fe51 Fix a color value assert 2018-10-18 11:32:21 +02:00
YuSanka
33a0f5beff Deleted "Copy" column from ObjectList 2018-10-18 11:28:31 +02:00
YuSanka
e223120e7e Added instances to ObjectList 2018-10-18 10:40:26 +02:00
Enrico Turri
82ec5bf22e New selection -> Unified methods to update menu items 2018-10-18 09:27:37 +02:00
Enrico Turri
143c23c54a New selection -> Force volume selection when right clicking to get the object context menu 2018-10-18 08:51:06 +02:00
Enrico Turri
23123cac2e Increase and decrease command in object's context menu 2018-10-17 14:26:13 +02:00
Vojtech Kral
d4371b6089 Refactor window position & size persistence
in a way that is hopefully robust wrt. platform quirks
2018-10-17 14:09:18 +02:00
Enrico Turri
2e274b5646 Plater -> View Menu 2018-10-17 12:59:58 +02:00
Enrico Turri
7d1828df05 Object context menu wip / Removed links to settings dialog from user interface / Fixed and unified append_menu_item() function / Fixed File->Open menu item / Fixed Window menu items / Added Plater menu 2018-10-17 12:17:25 +02:00
bubnikv
7ed2752b2b WIP: Reconstruction of background processing update timer,
added unique IDs to the Model / ModelObject / ModelVolume objects,
added a copy of Model hierarchy at the Print,
WIP: new Print::apply() method to update the Print's copy of Model,
to update the Print's PrintObjects, to update status of the Print and
PrintObjects, and to possibly stop the background processing.
2018-10-17 11:12:38 +02:00
Enrico Turri
3059438853 Fixed toolbar update after reducing instances count 2018-10-17 09:40:04 +02:00
Enrico Turri
b8ec71ab28 New selection -> Removed old plater selection 2018-10-17 09:30:07 +02:00
YuSanka
37a320c79e Changed logic of the PrusaObjectDataViewModelNode:
now each node has:
          * name,
          * type,
          * id (-1, if type == itSettings OR itInstanceRoot),
          * bmp,
          * action_bmp
          * extruder
2018-10-16 16:46:35 +02:00
Enrico Turri
b4a09d3d86 New selection -> Toolbar update 2018-10-16 16:04:19 +02:00
Enrico Turri
af4570741c New selection -> Improved gizmos activation 2018-10-16 14:56:35 +02:00
Vojtech Kral
561bbf5a80 Fix build on non-MSVC 2018-10-16 13:57:11 +02:00
Enrico Turri
a8c459696f New selection -> Tighter bounding box for selections, tweaks to gizmo flatten and fix of instances update 2018-10-16 13:49:40 +02:00
Enrico Turri
059ab4a05c ModelInstance's full 3D transform set as default 2018-10-16 09:51:30 +02:00
YuSanka
ce86fad28a Fixed assert "IsVisible(item)" failed in wxTreeCtrl::GetNextVisible() 2018-10-15 17:18:38 +02:00
Enrico Turri
adf739cd45 Simplified algorithm for update of gizmo move and scale 2018-10-15 15:21:37 +02:00
YuSanka
404ef147b3 Merge branch 'dev_native' of https://github.com/prusa3d/Slic3r into dev_native 2018-10-15 13:31:30 +02:00
YuSanka
317fc45522 Fixed wxASSERT( variant.GetType() == PrusaDataViewBitmapText ); 2018-10-15 13:25:22 +02:00
Enrico Turri
27fd49d459 New selection -> Improved gizmo scale rendering and behavior 2018-10-15 13:22:36 +02:00
YuSanka
b9b404dd2c Merge branch 'dev_native' of https://github.com/prusa3d/Slic3r into dev_native 2018-10-15 11:40:51 +02:00
YuSanka
b413cf4ef9 Fixed OSX compilation : GetStringSelection for PresetComboBox is changed to GetString(GetSelection) 2018-10-15 11:39:48 +02:00
Enrico Turri
f2486bd87d New selection -> Gizmos methods refactored to accept selection instead of bounding box and scale gizmo in local system for single instance selections 2018-10-15 11:30:50 +02:00
YuSanka
27fea879d3 Merge branch 'dev_native' of https://github.com/prusa3d/Slic3r into dev_native 2018-10-15 10:54:20 +02:00
YuSanka
d654e35975 Ported Plater->on_config_change 2018-10-15 10:53:47 +02:00
Enrico Turri
35c7c418e9 Small refactoring into GLGizmoBase::Grabber 2018-10-12 16:18:37 +02:00
Enrico Turri
76052d33bf New selection -> scaling wip 2018-10-12 15:43:29 +02:00
Enrico Turri
59208d79be Modified rendering of gizmo scale 3D 2018-10-12 14:23:34 +02:00
Enrico Turri
9bb93cc4f4 Added helper functions to extract euler angles from 3d transforms 2018-10-12 12:19:57 +02:00
YuSanka
b7980f6b9b Added correct deleting of the selected objects(parts, mix)
but only in "ObjectList->Scene" direction
2018-10-12 12:00:37 +02:00
Enrico Turri
aa0c3bf2e3 Added helper functions to generate 3d transforms 2018-10-12 10:09:16 +02:00
YuSanka
0bc99f3f65 Merge branch 'dev_native' of https://github.com/prusa3d/Slic3r into dev_native 2018-10-11 16:17:43 +02:00
YuSanka
9cf80581d9 Added extended selection ObjectList -> to canvas3D 2018-10-11 16:13:23 +02:00
Vojtech Kral
20e1087d97 Plater: Fix arrange 2018-10-11 13:22:36 +02:00
Vojtech Kral
8337d4675f Plater: increase, decrease, set_number_of_copies, arrange 2018-10-11 12:48:35 +02:00
Enrico Turri
6563cff246 New selections -> allow all three rotations for single instance selection 2018-10-11 10:56:25 +02:00
Enrico Turri
bb2000d094 Simplified OpenGL calls 2018-10-11 10:52:50 +02:00
Enrico Turri
e201c5123c added method: static GUI::GLCanvas3D* _3DScene::get_canvas(wxGLCanvas* canvas) 2018-10-11 10:24:19 +02:00
Enrico Turri
3bccb3b97c Extended interface for selections 2018-10-11 08:26:12 +02:00
YuSanka
37dd32b62b Merge branch 'dev_native' of https://github.com/prusa3d/Slic3r into dev_native 2018-10-10 16:23:35 +02:00
YuSanka
30f3ec3d16 Changed mode of the OblectList to Multiple selection 2018-10-10 16:22:20 +02:00
Vojtech Kral
a7425ec229 Plater: Fix in load_model_objects 2018-10-10 14:43:47 +02:00
YuSanka
05c016764f Merge branch 'dev_native' of https://github.com/prusa3d/Slic3r into dev_native 2018-10-10 13:54:56 +02:00
YuSanka
94da98c9c4 Ported on_extruders_change and filament_color_box_lmouse_down(like a lambda-f inside PresetComboBox) 2018-10-10 13:53:45 +02:00
Enrico Turri
3e5e72dafc New selection -> changed calculation of euler angles for multivolume rotations 2018-10-10 13:51:11 +02:00
Vojtech Kral
7672be6488 Plater: on_object_select 2018-10-10 11:21:37 +02:00
Enrico Turri
6d33077564 New selection -> synchronization of indirectly selected instances 2018-10-10 11:04:04 +02:00
Vojtech Kral
bd85ca721e Plater & GLCanvas3D: Fix instance_moved event, add event handlers 2018-10-09 17:39:04 +02:00
Enrico Turri
895bdf7918 New selection -> rotation wip 2018-10-09 15:56:34 +02:00
YuSanka
1b93b952a2 Merge remote-tracking branch 'origin/ys_dev_native' into dev_native 2018-10-09 12:44:32 +02:00
YuSanka
085020a814 Ported show_preset_comboboxes function 2018-10-09 12:41:05 +02:00
Vojtech Kral
322e0a433c Plater: Add missing skeletons (un-typed for now) 2018-10-09 10:47:42 +02:00
Enrico Turri
dffae0aa12 Fixed new selection compile errors 2018-10-09 09:12:38 +02:00
Enrico Turri
b788530056 Merge branch 'dev_native' of https://github.com/prusa3d/Slic3r into dev_native 2018-10-09 09:08:06 +02:00
Enrico Turri
47fc109837 New selection -> removed select by parts 2018-10-09 09:07:49 +02:00
YuSanka
9f1613bffb Merge remote-tracking branch 'origin/dev_native' into ys_dev_native 2018-10-09 08:30:48 +02:00
Vojtech Kral
928c146aef WIP: Plater: Event handling boilerplate / skeletons 2018-10-08 19:56:59 +02:00
Vojtech Kral
ceb295944a WIP: Plater, tracking in Plater.pm 2018-10-08 19:14:55 +02:00
Vojtech Kral
1f926964ee WIP: Plater, build fixes 2018-10-08 17:41:37 +02:00
YuSanka
1006cd976e Fixed events OBJECT_SETTINGS_CHANGED_EVENT , OBJECT_REMOVE_EVENT and UPDATE_SCENE_EVENT
+ changed ctor of ObjList
+ deleted unusable code from Tab.cpp
2018-10-08 16:28:11 +02:00
Enrico Turri
99fe5761d8 New selection -> removed obsolete parameters from GLVolumeCollection::load_object() 2018-10-08 16:05:55 +02:00
Enrico Turri
9ae6d115a2 New selection -> removed obsolete methods\n+\nFixed a few compile warnings 2018-10-08 15:17:36 +02:00
Enrico Turri
384cfa0e6d 1st installment of new selections (disabled) 2018-10-08 14:02:12 +02:00
Enrico Turri
04e193011c Fixed crash when selecting object 2018-10-08 09:08:42 +02:00
YuSanka
42fd6bc7b5 Merge remote-tracking branch 'origin/dev_native' into ys_dev_native 2018-10-05 23:39:51 +02:00
YuSanka
ea30385fd0 Completed split of the GUI_ObjectParts 2018-10-05 23:29:15 +02:00
YuSanka
bcedd71e99 Start to Split GUI_ObjectParts:
+ created GUI_ObjectList & GUI_ObjectManipulation classes
2018-10-04 16:43:10 +02:00
Enrico Turri
96745e12d7 Use an unique opengl context 2018-10-04 10:41:11 +02:00
Vojtech Kral
f31cf684cb Tab preset & value change events 2018-10-03 17:55:21 +02:00
Enrico Turri
b3c09a9254 Fixed object position after loading 2018-10-03 16:18:23 +02:00
YuSanka
7ed9ba5437 Merge remote-tracking branch 'origin/dev_native' into ys_dev_native 2018-10-03 15:22:13 +02:00
YuSanka
8f6e3cc43b Temporary changes and code cleaning 2018-10-03 15:14:52 +02:00
Enrico Turri
6369e469c0 on_viewport_changed event handler 2018-10-03 14:25:35 +02:00
Enrico Turri
46efaf6791 Merge branch 'dev_native' of https://github.com/prusa3d/Slic3r into dev_native 2018-10-03 14:08:44 +02:00
Vojtech Kral
83f55b608c Event.hpp: Set event object 2018-10-03 14:07:10 +02:00
Enrico Turri
2d77d51f84 Merge branch 'dev2' of https://github.com/prusa3d/Slic3r into dev_native 2018-10-03 13:38:57 +02:00
Vojtech Kral
770d944283 Replace PerlCallbacks with events in GLCanvas3d et al. 2018-10-03 11:51:47 +02:00
Enrico Turri
e9d26d1a8e Fixed wxWidgets warnings due to invalid alignement flags at startup 2018-10-02 14:30:01 +02:00
Enrico Turri
7977bce98d Fixed call to reset_legend_texture() made on hidden canvas 2018-10-02 14:12:23 +02:00
Enrico Turri
01ba59158d Multisample detection 2018-10-02 14:01:22 +02:00
YuSanka
9ce9b87e81 Merge remote-tracking branch 'origin/dev_native' into ys_dev_native 2018-10-02 13:33:06 +02:00
YuSanka
40022861c8 Removed Localization to GUI_App
+ cleaned code from some global variables (App, AppConfig, PresetBundle, MainFrame, tab_panels..)
2018-10-02 13:30:59 +02:00
Vojtech Kral
9021bd07a3 WIP: Plater 2018-10-01 16:48:24 +02:00
YuSanka
08c6905751 Moved functions and variables (for fonts and labels color) to GUI_App
+ corrected Sidebar layouts
+ deleted get_preset_bundle
+ actions with tabs_list moved to GUI_App
2018-10-01 16:31:36 +02:00
Vojtech Kral
342b584399 WIP: Plater 2018-10-01 09:28:40 +02:00
bubnikv
6260e43f61 Merge remote-tracking branch 'origin/dev2' into dev_native 2018-09-25 15:33:51 +02:00
bubnikv
9a3db200a5 Updated AMF/3MF import to pass configuration into a DynamicPrintConfig
instead of PresetBundle.
2018-09-25 11:53:05 +02:00
bubnikv
a9f52955a0 Fixed app icon on Windows 2018-09-24 14:27:03 +02:00
bubnikv
8296cbe046 Compile Slic3r versions into slic3r binary 2018-09-24 13:07:50 +02:00
bubnikv
96e035b2f8 Added various manifests,
added auto generation of includes and manifests from version and build
variables,
resurrected SLIC3R_LOGLEVEL env var.
2018-09-24 11:53:05 +02:00
bubnikv
8841b7ae2c Another compilation fix 2018-09-21 15:59:39 +02:00
bubnikv
3658f96b16 Fixed compilation on Linux / OSX. 2018-09-21 15:42:31 +02:00
bubnikv
e4373b6edd Fix of incorrect path separator in include. 2018-09-21 12:54:40 +02:00
bubnikv
6b2a4ffe03 Paths to resources / icons / images are set. 2018-09-21 11:40:32 +02:00
bubnikv
9a5796794e Merged Sasa's GUI WIP 2018-09-21 09:09:05 +02:00
YuSanka
8b582bbcd1 Menu_bar and preset_tabs are in main window now 2018-09-21 01:35:25 +02:00
bubnikv
20d0f046d2 Merge remote-tracking branch 'origin/dev2' into dev_native 2018-09-20 16:48:40 +02:00
bubnikv
add45a8f6e Added C++ command line processing, thanks @alexrj and @loh 2018-09-20 16:48:13 +02:00
YuSanka
e86f149cbd Moved back open_model to GUI_App 2018-09-20 13:12:35 +02:00
YuSanka
bcbeb56217 Merge remote-tracking branch 'origin/dev_native' into ys_dev_native 2018-09-20 08:41:57 +02:00
YuSanka
ebb6f47f50 Added GUI_App and MainFrame 2018-09-20 08:40:22 +02:00
bubnikv
6ca5a18d05 Commented out wxPixelData.UseAlpha(), as it is missing from wxWidgets 3.1.1. 2018-09-19 18:54:23 +02:00
bubnikv
6003005812 Removed dependency on wxWidgets from Alien.
Updated source code to wxWidgets 3.1.1
Moved invocation of perl unit / integration tests to the xs project.
2018-09-19 17:19:06 +02:00
bubnikv
7374eafc13 Moved the newly added GUI_Preview files. 2018-09-19 11:34:26 +02:00
bubnikv
e8c16c35e5 Meged with dev2 2018-09-19 11:28:30 +02:00
bubnikv
6bd92a8198 Disabling calls from libslic3r to slic3r gui. 2018-09-19 11:27:04 +02:00
bubnikv
0558b53493 WIP: Moved sources int src/, separated most of the source code from Perl.
The XS was left only for the unit / integration tests, and it links
libslic3r only. No wxWidgets are allowed to be used from Perl starting
from now.
2018-09-19 11:02:24 +02:00