Commit Graph

468 Commits

Author SHA1 Message Date
YuSanka
d7f9e86400 Update additional object setting after print technology changing 2018-11-29 15:01:20 +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
Vojtech Kral
18c95c404c Fix wxNotebook event incontinence 2018-11-28 19:26:48 +01:00
YuSanka
c010e14460 Suppress ColorPrint for the multi-material printing 2018-11-28 16:03:25 +01:00
Enrico Turri
e6369fe548 SLA slices preview - wip 3 2018-11-27 14:50:57 +01:00
Vojtech Kral
2585e3103d imgui: Fix ENABLE_IMGUI, disable on OS X for now 2018-11-27 11:28:19 +01:00
tamasmeszaros
3f0ea223d1 Speeding up the auto rotation algorithm (decreasing accuracy) 2018-11-27 11:09:25 +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
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
Vojtech Kral
c29493a41b imgui: Refactor, use in cut gizmo 2018-11-26 11:16:39 +01:00
Enrico Turri
b94f19eaf4 Added method GLCanvas3D::is_dragging() 2018-11-26 10:41:16 +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
tamasmeszaros
45b51bd40e remove + shortcut from 'optimize rotation' menuitem 2018-11-23 09:56:49 +01:00
tamasmeszaros
7efadfae1c Merge branch 'tm_sla_supports_backend' 2018-11-22 16:12:22 +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
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
e247b532fb Added Edit -> Delete all menu item 2018-11-22 11:31:53 +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
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
tamasmeszaros
2fffb0c2ff Arrangement is still not working, update is probably broken. 2018-11-21 11:07:08 +01:00
bubnikv
18f14482d0 Merge branch 'vb_3dscene_partial_update' 2018-11-20 17:07:31 +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
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
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
2fa055903f "SLA Print Settings" implementation (start) 2018-11-19 14:05:29 +01:00
Vojtech Kral
ee33f0f1d7 Add missing icons 2018-11-19 13:51:43 +01:00
Vojtech Kral
60563e6702 Plater: Revert usage of panel_gizmo_widgets for now 2018-11-19 13:05:10 +01:00
Vojtech Kral
b1228537d2 Plater: Fix on_notebook_changed 2018-11-19 12:00:37 +01:00
Vojtech Kral
6629d75853 Cutting 2018-11-18 21:20:47 +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
Enrico Turri
9bb04ff15a Modified menu for open/save/save as project (3mf) and import/export 2018-11-15 15:27:39 +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
tamasmeszaros
88648c8214 a small cleanup 2018-11-15 10:47:20 +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
86c1f5b417 Fixed crashes when deleting objects 2018-11-14 11:22:13 +01:00
Enrico Turri
3613a54e03 Deletion of instances and volumes from 3D scene 2018-11-14 08:53:56 +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
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
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
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
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
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
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
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
bubnikv
c2e46350f2 Separated Print / PrintObject into PrintBase.cpp/h to support SLAPrint 2018-11-08 14:23:17 +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
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
bubnikv
e4eec90046 Fixed loading of old 3mf files. 2018-11-06 19:09:54 +01:00
Enrico Turri
57c769b63b Selection of modifiers in 3D scene 2018-11-06 15:51:33 +01:00
bubnikv
706da612b6 Fixed duplicate instances after "split object to objects" 2018-11-05 12:52: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
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
Enrico Turri
3aad8b5fd2 Translation of ModelVolume as transformation component (without modifying the mesh) 2018-11-02 12:11:28 +01:00
YuSanka
2200e42174 Fixed crashing after filament preset changing from Plater 2018-11-01 16:24:20 +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
00222226ed Mirror component of transformations set as default 2018-11-01 08:46:44 +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
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
Enrico Turri
ae6c65dfff New selection -> Fixed split object to objects 2018-10-31 11:24:56 +01:00
Enrico Turri
503166a6a4 Automatic placement of instance at bed level 2018-10-30 16:03:03 +01: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
Enrico Turri
321322b17a Fixed rendering of warning and legend textures (due to newer wxWidgets) 2018-10-25 15:32:35 +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
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
5e39ff7c58 Restored slicing cancellation. 2018-10-25 10:07:11 +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
197458cf3a Background processing: Fixed rotation & scaling of PrintObjects. 2018-10-24 11:48:39 +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
edc79cb922 Merge branch 'dev_native' into vb_dev_native_background_processing 2018-10-23 11:26:15 +02:00
Enrico Turri
1979ba0e0f New selection -> Keep selection after instance inscrease/decrease command 2018-10-23 09:19:41 +02:00
Enrico Turri
2f11df47ce Layers editing 2018-10-22 15:18:56 +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
0af4de4faa New selection -> Split command 2018-10-19 15:27:19 +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
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
80f79451f7 Merge remote-tracking branch 'origin/ys_dev_native' into dev_native 2018-10-18 11:41:29 +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
23123cac2e Increase and decrease command in object's context menu 2018-10-17 14:26:13 +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
YuSanka
b413cf4ef9 Fixed OSX compilation : GetStringSelection for PresetComboBox is changed to GetString(GetSelection) 2018-10-15 11:39:48 +02:00
YuSanka
d654e35975 Ported Plater->on_config_change 2018-10-15 10:53:47 +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
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
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
Vojtech Kral
7672be6488 Plater: on_object_select 2018-10-10 11:21:37 +02:00
Vojtech Kral
bd85ca721e Plater & GLCanvas3D: Fix instance_moved event, add event handlers 2018-10-09 17:39:04 +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
384cfa0e6d 1st installment of new selections (disabled) 2018-10-08 14:02:12 +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
Vojtech Kral
770d944283 Replace PerlCallbacks with events in GLCanvas3d et al. 2018-10-03 11:51:47 +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