3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,626 Commits 1 Branch 1 Tag 249 MiB
0235f1a821
Commit Graph

3812 Commits

Author SHA1 Message Date
Enrico Turri
8175c9d306 Merge with master 2018-07-17 08:54:17 +02:00
tamasmeszaros
67d69830e8 Merge remote-tracking branch 'origin/master' into feature_arrange_with_libnest2d 2018-07-16 16:08:28 +02:00
Enrico Turri
a80ef7201b Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-07-13 14:45:51 +02:00
Enrico Turri
4805df6037 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-07-13 14:45:15 +02:00
Enrico Turri
d99b484ac6 Fixed update of sliders' texts into object settings dialog 2018-07-13 14:41:49 +02:00
tamasmeszaros
eefa1678db Merge remote-tracking branch 'origin/master' into feature_arrange_with_libnest2d 2018-07-13 11:28:02 +02:00
Enrico Turri
ee67b2c7c3 Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-07-13 11:27:56 +02:00
Enrico Turri
06613e4792 Fixed 3D preview not updated after g-code export 2018-07-13 11:16:28 +02:00
Enrico Turri
7caada244a Attempt to fix SPE-356 2018-07-13 08:58:28 +02:00
Enrico Turri
a8691bc083 Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-07-12 08:32:42 +02:00
Enrico Turri
1356a9977e Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-07-12 08:32:18 +02:00
Lukas Matena
e44480d61f Supports were printed twice if synchronized with object layers, added always-on settings in ObjectSettingDialog 2018-07-10 13:02:43 +02:00
YuSanka
38768a7bda Replaced Object list before Object(Part) Settings 2018-07-04 12:38:34 +02:00
YuSanka
54298c8e61 First right-panel reorganization: 
* Replaced Object list from CollapsiblePane
* Sub-object are adding by context menu from list
* (sub)objects can be deleted by only one "Delete" button
* Added extruder selection to list
 2018-07-04 09:03:43 +02:00
tamasmeszaros
797c812f31 Stop the ongoing slicing process when attempting to export. 2018-07-03 13:12:15 +02:00
tamasmeszaros
f00c17b959 Merge remote-tracking branch 'origin/master' into feature_slice_to_png 2018-07-03 11:40:35 +02:00
tamasmeszaros
10b19c8604 fix for progressindicator not being destroyed after export to png 2018-07-03 11:40:02 +02:00
tamasmeszaros
ddb4945586 Fix crash on Linux when arranging 2018-07-02 11:22:47 +02:00
tamasmeszaros
952068f282 Autocenter finally disabled. Progress indication works. 2018-06-29 17:46:21 +02:00
tamasmeszaros
d3b19382fe AppController reachable trough Plater.pm 2018-06-28 19:16:36 +02:00
tamasmeszaros
85474e5803 Merge remote-tracking branch 'origin/master' into feature_arrange_with_libnest2d 
# Conflicts:
#	CMakeLists.txt
#	lib/Slic3r/GUI/MainFrame.pm
 2018-06-28 18:50:39 +02:00
tamasmeszaros
ad4d95f60c AppController integration 2018-06-28 18:47:18 +02:00
bubnikv
c4a3e4eca7 Merge branch 'for_merging' 2018-06-28 17:43:15 +02:00
YuSanka
5f1f7dcbed Fix of tooltips on OSX showing on the first page of a parameter tab. 2018-06-28 17:34:55 +02:00
tamasmeszaros
d337b69407 Merge remote-tracking branch 'origin/master' into feature_slice_to_png 2018-06-27 17:44:33 +02:00
Enrico Turri
7ff22b9413 Time estimate emitted to gcode at requested interval 2018-06-27 15:35:47 +02:00
Enrico Turri
d02c90d5d0 Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-27 13:54:39 +02:00
Enrico Turri
48915a65fd Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-06-27 13:52:57 +02:00
Enrico Turri
06f44a9e4b Code cleanup 2018-06-27 12:49:38 +02:00
Enrico Turri
8db4fdc24c 3rd attempt to fix opengl on ubuntu 2018-06-27 12:36:49 +02:00
Enrico Turri
5c32347449 1st attempt to fix opengl on ubuntu 2018-06-27 11:31:11 +02:00
tamasmeszaros
c28b602465 Merge remote-tracking branch 'origin/master' into feature_slice_to_png 2018-06-27 09:36:05 +02:00
Enrico Turri
dc223066d3 Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-27 08:26:55 +02:00
Enrico Turri
db95460154 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-06-27 08:26:33 +02:00
tamasmeszaros
d2c6190cc5 Comments and refactoring 2018-06-26 17:02:46 +02:00
bubnikv
645cc65d2b When running on Windows, Perl $^X returns slic3r.exe or slic3r-console.exe 
Do some magic to get the perl interpreter path.
 2018-06-26 15:29:23 +02:00
YuSanka
c1724f45c9 Fixed post-merge bugs 2018-06-26 13:34:25 +02:00
Enrico Turri
bd1d70d8d3 Fixed crash when slicing from Layers tab 2018-06-26 12:50:04 +02:00
Enrico Turri
ab587babb9 Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-26 12:20:41 +02:00
Enrico Turri
9b2f760679 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-06-26 12:20:23 +02:00
Enrico Turri
87c1654e31 Fixed bed update when changing selected printer 2018-06-26 12:19:19 +02:00
Enrico Turri
a754de4c32 Fixed panning in Layers view 2018-06-26 11:17:30 +02:00
YuSanka
0371f368a4 Merge remote-tracking branch 'origin/master' into new_main_page_ui 2018-06-26 09:26:27 +02:00
tamasmeszaros
3efe6675cb Merge remote-tracking branch 'origin/master' into feature_slice_to_png 2018-06-25 17:14:29 +02:00
Enrico Turri
714204b227 Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-25 15:27:06 +02:00
Enrico Turri
7b0ba7a9d4 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-06-25 15:24:58 +02:00
Enrico Turri
40b327eb11 Fix of interaction between opengl contexts and main page notebook 2018-06-25 15:17:13 +02:00
tamasmeszaros
f26cb9ebd6 Merge remote-tracking branch 'origin/master' into feature_slice_to_png 
# Conflicts:
#	lib/Slic3r/GUI/MainFrame.pm
 2018-06-25 13:24:37 +02:00
Enrico Turri
f9e6bcf872 Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-25 08:26:14 +02:00
Enrico Turri
ac0f3a6ef7 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-06-22 16:13:51 +02:00
Enrico Turri
c948ca647c Code cleanup 2018-06-22 16:11:00 +02:00
Enrico Turri
2a03b90d2b Forced render of 3D scene when changing tab in plater's notebook 2018-06-22 16:06:37 +02:00
Enrico Turri
ac7d21b50a Geometry info updated while using gizmos 2018-06-22 11:19:38 +02:00
Enrico Turri
4fcbb73141 Cleanup of perl code 2018-06-21 12:21:51 +02:00
Enrico Turri
a7e9ec5757 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-06-21 11:05:07 +02:00
Enrico Turri
4ee365194a Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-21 11:03:38 +02:00
Enrico Turri
a3a8333d20 Force update when changing selected printer using the GUI 2018-06-21 10:43:01 +02:00
Enrico Turri
550f6e307f Faster gizmos update 2018-06-21 08:37:04 +02:00
tamasmeszaros
8dcf789d4b Slicing in C++ with progress indication. 2018-06-20 14:50:18 +02:00
Enrico Turri
fa9014fc8e Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-20 08:32:27 +02:00
Vojtech Kral
478488972c Updating bugfixes (#973) 
* ConfigWizard: Fix MM legacy profile detect

* Remove Perl BedShapeDialog

* PresetUpdater: Look for updates in resources as well

* ConfigWizard: Startup condition based on printer profiles only rather than all profiles
Previously wizard would not run if there was a leftover filament profile but no printer profiles

* ConfigWizard: Fix button labels

* ConfigWizard: Pick the very first printer variant by default
 2018-06-19 18:26:38 +02:00
tamasmeszaros
5f310e1520 AppController class created to take the necessary app logic into C++. 2018-06-19 17:45:21 +02:00
bubnikv
7499a4dea4 Disabled the UI gizmos, they are not yet ready for the prime time 2018-06-19 16:14:10 +02:00
bubnikv
5a56f08aad Merge remote-tracking branch 'remotes/origin/opengl_to_cpp' 2018-06-19 16:08:53 +02:00
bubnikv
734273a33a Merge remote-tracking branch 'remotes/origin/fix_model_by_win10' 2018-06-19 10:02:49 +02:00
Enrico Turri
b9ce19b07c Object updated by rotate gizmo 2018-06-19 09:46:26 +02:00
Enrico Turri
a3949b9f01 Object updated by scale gizmo 2018-06-18 15:07:17 +02:00
tamasmeszaros
4328ecc287 Merge remote-tracking branch 'origin/master' into feature_slice_to_png 2018-06-18 12:17:19 +02:00
YuSanka
fb9ba1a55c Set correct man/max value for movers 2018-06-16 03:04:59 +02:00
Enrico Turri
6874949556 Scale gizmo interaction with mouse 2018-06-15 14:10:28 +02:00
Enrico Turri
52a7d7ed09 Partial perl code cleanup 2018-06-14 16:09:36 +02:00
YuSanka
9504780ef4 Buttons "Add Part" and "Add Modifier" (in the Object Settings) works now 2018-06-14 15:33:42 +02:00
Enrico Turri
b2cf576bf3 1st installment of gizmos 2018-06-13 09:12:16 +02:00
YuSanka
f5ef672815 Prepared callback from c++ to Perl to inform about a change of object settings 2018-06-12 19:15:03 +02:00
Enrico Turri
0faaef76e8 C++ code cleanup 2018-06-12 12:18:16 +02:00
Enrico Turri
af3d07bb05 Attempt to workaround bug in wxWidgets IsShownOnScreen() method 2018-06-12 09:18:25 +02:00
Enrico Turri
44220530cb Use a single gl context created in c++ 2018-06-11 15:49:04 +02:00
Enrico Turri
085110c4d9 Removed 3DScene volumes from perl 2018-06-11 13:48:02 +02:00
Enrico Turri
7b4870d1cb Fixed selection and rendering in object settings dialog 2018-06-11 11:40:11 +02:00
YuSanka
08ccf85a61 Overrided OnStateChange() function to CollapsiblePane 2018-06-08 12:43:39 +02:00
Enrico Turri
96d9879d72 class 3D on_select callback moved to c++ 2018-06-08 11:37:07 +02:00
YuSanka
4215b2b373 Merge remote-tracking branch 'origin/master' into new_main_page_ui 2018-06-08 10:10:10 +02:00
YuSanka
da9b0a9b7d Deleted debugging messages 2018-06-08 09:55:27 +02:00
Enrico Turri
bf2fd54578 reload_scene method of 3D class moved to c++ 2018-06-08 09:40:00 +02:00
Enrico Turri
8867e8ca60 Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-08 08:31:21 +02:00
Enrico Turri
f4a687703c Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-06-08 08:30:55 +02:00
YuSanka
e2a7bd4a14 Added MessageBoxes for experimenting on OSX 2018-06-07 15:52:35 +02:00
Vojtech Kral
aef0c489e3 Fix: Dialog initialization ordering on OS X 
Perform update_check after MainFrame is created
 2018-06-07 15:41:36 +02:00
YuSanka
49f0a1a824 Fixed OSX compilation bug 
Changed info_box (more place to the manifold information)
 2018-06-07 11:54:42 +02:00
Enrico Turri
a8500d6bae class 3D callbacks moved to c++ 2018-06-07 11:18:28 +02:00
YuSanka
b31e696edc ListView doesn't used now. 
(Whole logic of the object list manipulation is on c++ side)
Remove experimental add/del buttons
 2018-06-07 11:12:09 +02:00
Enrico Turri
ff86407840 Key down and char event handlers of class 3D moved to c++ 2018-06-07 09:22:19 +02:00
YuSanka
9e0d2793cb CallBack from C++ to Perl to manipulations with object list 2018-06-07 00:55:09 +02:00
Enrico Turri
f6ef28becc Removed method update_bed_size from 3D perl class 2018-06-06 15:17:10 +02:00
Enrico Turri
8192580b5f Removed DestroyGL method from 3DScene 2018-06-06 14:19:28 +02:00
Enrico Turri
e79037c44d 3DScene member variables moved to c++ 2018-06-06 12:36:52 +02:00
Enrico Turri
c6e44509e0 3DScene load_object method moved to c++ 2018-06-06 10:16:58 +02:00
YuSanka
5f82d01f19 Porting object list manipulation from Perl to c++: 
* Set count and scale to the objects on c++ side
* Select/unselect object
 2018-06-05 14:35:38 +02:00
Enrico Turri
a8254e0053 Generation of preview paths moved to c++ 2018-06-05 14:09:36 +02:00
Enrico Turri
5392008916 Generation of gcode paths moved to c++ 2018-06-05 10:56:55 +02:00
bubnikv
d05d3cb652 Initial working implementation of the "Fix by Netfabb" function. 2018-06-04 21:22:42 +02:00
YuSanka
04dc50cec4 Add, Delete and DeleteAll are working for new list now 2018-06-04 15:59:55 +02:00
Enrico Turri
d74b85f3fe Another set of 3DScene methods moved to c++ 2018-06-04 15:42:34 +02:00
Enrico Turri
af8e869880 3rd attempt to fix opengl initialization on linux 2018-06-04 14:28:59 +02:00
Enrico Turri
548f773074 2nd attempt to fix opengl initialization on linux 2018-06-04 13:52:57 +02:00
Enrico Turri
95e7d96f52 3DScene paint event handler moved to c++ 2018-06-04 12:26:39 +02:00
Enrico Turri
8911cf6051 OpenGL info moved to c++ 2018-06-04 10:14:09 +02:00
Enrico Turri
364134515b Refactoring and cleanup 2018-06-01 15:54:41 +02:00
Enrico Turri
94d608c6c1 3DScene mouse event handler move to c++ completed 2018-06-01 09:00:30 +02:00
Enrico Turri
6bf009edee 3DScene mouse event handler partially moved to c++ - part 2 2018-05-31 16:04:59 +02:00
Enrico Turri
276533e236 3DScene mouse event handler partially moved to c++ 2018-05-31 13:51:50 +02:00
Enrico Turri
cf8e7475ca Removed unused methods from 3DScene 2018-05-31 08:44:39 +02:00
Enrico Turri
30a3b2179b 3DScene timer and _variable_layer_thickness_action method moved to c++ 2018-05-30 15:18:45 +02:00
Enrico Turri
5a8d1ffdba Prototype for exporting estimated remaining time into gcode for default and silent mode 2018-05-30 12:08:03 +02:00
YuSanka
45b6c99353 print_info_box is correct placed on right_panel 2018-05-29 20:55:43 +02:00
Enrico Turri
2f773a89df 3DScene set_viewport_from_scene method moved to c++ 2018-05-29 15:36:09 +02:00
Enrico Turri
df14a3c399 3DScene update_volumes_colors_by_extruder method moved to c++ 2018-05-29 15:07:06 +02:00
Enrico Turri
5ee5465f94 3DScene mark_volumes_for_layer_height method moved to c++ 2018-05-29 14:34:45 +02:00
Enrico Turri
363a964ebb 3DScene render method partially moved to c++ 2018-05-29 13:54:34 +02:00
YuSanka
c7d7da452e Updated Collapsed/Layout for PrusaCollapsiblePane. 
Cleaned right_panel
 2018-05-28 17:08:48 +02:00
Enrico Turri
db260a669c 3DScene mouse wheel event moved to c++ 2018-05-28 15:23:01 +02:00
Enrico Turri
aacdcd4add 3DScene layers editing mouse containment methods moved to c++ 2018-05-28 14:39:59 +02:00
Enrico Turri
994222c317 3DScene _first_selected_object_id_for_variable_layer_height_editing method moved to c++ 2018-05-28 14:10:02 +02:00
Enrico Turri
951e8528b4 3DScene layers editing parameters moved to c++ 2018-05-28 13:43:29 +02:00
YuSanka
3fb567d286 Final prototype 2018-05-28 11:19:51 +02:00
YuSanka
d93a8aec3d New concept of the main IU. 
* only 2 mode - Regular & Expert
* "Export Gcode" moved to bottom of the window (analogue to the PrusaControll)
* Experiments with layout of collapsible_pane [! not successful]
 2018-05-27 22:12:01 +02:00
tamasmeszaros
fcef1b107e Making some meaningful progress feedback. 2018-05-25 16:55:55 +02:00
Enrico Turri
a8311bd1bd 3DScene layer_editing_allowed method moved to c++ 2018-05-25 16:28:24 +02:00
Enrico Turri
c51ce63b9b 3DScene layer editing overlay completely moved to c++ 2018-05-25 15:56:14 +02:00
Enrico Turri
455076231b Layers editing shader moved to c++ 2018-05-25 14:05:08 +02:00
Enrico Turri
bdbc86167c 3DScene volume selection methods moved to c++ 2018-05-25 09:03:55 +02:00
YuSanka
46f71661b2 Some changes in the concept of the new right column 2018-05-24 16:57:35 +02:00
Enrico Turri
f121817501 Removed from Perl all 3DScene methods already moved to c++ 2018-05-24 16:11:34 +02:00
Enrico Turri
70664122af 3DScene layer height profile rendering moved to c++ 2018-05-24 15:17:01 +02:00
Enrico Turri
f31c55ceed 3DScene layer editing overlay textures rendering moved to c++ 2018-05-24 13:46:17 +02:00
YuSanka
85508fab82 Merge remote-tracking branch 'origin/master' into new_main_page_ui 2018-05-24 08:32:24 +02:00
tamasmeszaros
56db426de7 Merge remote-tracking branch 'origin/master' into feature_slice_to_png 2018-05-23 16:29:02 +02:00
tamasmeszaros
a2eecdfb25 Output directory selection changed to zip file selection with file dialog. 2018-05-23 16:28:18 +02:00
YuSanka
a877846699 Filling object settings (continue) 2018-05-23 16:21:42 +02:00
Enrico Turri
751b41b94b 3DScene picking pass moved to c++ 2018-05-23 15:35:11 +02:00
Enrico Turri
486180c422 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-05-23 15:33:25 +02:00
YuSanka
a4261b11d4 Updated translations (de, fr, es, it & pl) 2018-05-23 14:22:52 +02:00
Enrico Turri
90c50b281a 3DScene mouse variables moved to c++ 2018-05-23 13:56:54 +02:00
tamasmeszaros
a7298d9d89 Merge with latest master 2018-05-23 12:27:07 +02:00
Enrico Turri
b36243ba10 Objects rendering moved to c++ 2018-05-23 11:14:49 +02:00
Enrico Turri
b4beb7aae9 3DScene plain shader moved to c++ 2018-05-23 09:57:44 +02:00
YuSanka
83cec1a640 Merge remote-tracking branch 'origin/master' into new_main_page_ui 2018-05-23 08:30:27 +02:00
Enrico Turri
85b6784dcb Merge with master 2018-05-22 15:03:40 +02:00
bubnikv
306d77559e Merge remote-tracking branch 'remotes/origin/scene_manipulators' 2018-05-22 14:32:07 +02:00
YuSanka
6ea81279ff Fixed correct updating of the modified preset on Plater tab. 2018-05-22 14:00:42 +02:00