3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,195 Commits 1 Branch 1 Tag 249 MiB
1096c24fae
Commit Graph

2851 Commits

Author SHA1 Message Date
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