Commit graph

285 commits

Author SHA1 Message Date
enricoturri1966
e32930aa6c Code cleanup 2020-09-01 09:28:02 +02:00
enricoturri1966
db77f80681 Follow-up of eca4f0a4cd. Fixed preview background on all platforms 2020-08-19 13:14:47 +02:00
enricoturri1966
eca4f0a4cd GCodeViewer -> Changed layout of sliders in preview 2020-08-19 12:59:50 +02:00
enricoturri1966
dea641183c Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-08-10 14:22:46 +02:00
enricoturri1966
2aa1c2776c GCodeViewer -> Estimated printing times shown in the legend 2020-08-06 10:15:34 +02:00
enricoturri1966
8fc5be7e4f Refactoring to allow to quickly build the various options to show the estimated printing time in gcode viewer scene 2020-08-05 15:43:46 +02:00
enricoturri1966
0840b2328a Tech ENABLE_GCODE_VIEWER_AS_STATE set as default 2020-08-03 15:00:19 +02:00
enricoturri1966
48ae8dc9a2 Modal estimated printing time dialog
Fixed conflicts after merge with master
2020-07-27 14:53:17 +02:00
YuSanka
f138978fe7 Merge remote-tracking branch 'origin/master' into ys_ph_printers 2020-07-21 09:47:29 +02:00
enricoturri1966
2de442b617 Pull request #4235 - Fix tick/untick ironing feature in preview by rongith 2020-07-20 13:31:39 +02:00
enricoturri1966
73b885fc37 GCodeViewer -> Added imgui dialog for estimated printing times 2020-07-08 13:33:50 +02:00
enricoturri1966
7e815b4727 GCodeViewer -> Fixed sequential view endpoints when moving the vertical slider thumb 2020-06-23 14:31:08 +02:00
enricoturri1966
ca7dce9f02 Follow-up of dc6f97a6ad -> Fixed toolpaths visualization when editing config data 2020-06-22 15:42:27 +02:00
enricoturri1966
289f7a14a0 Follow-up of dc6f97a6ad -> Fixed toolpaths visualization when new slicing is required 2020-06-22 14:06:41 +02:00
enricoturri1966
dc6f97a6ad ENABLE_GCODE_VIEWER_AS_STATE -> Fixed toolpaths visualization when switching between states and when exporting g-code 2020-06-22 11:49:58 +02:00
YuSanka
19c4f32604 Preset and PresetBundle are moved to the _libslic3r_ folder 2020-06-16 17:03:06 +02:00
enricoturri1966
ab60499298 Fixed conflicts after merge with master 2020-06-12 10:35:18 +02:00
YuSanka
bf9462749f Fixed Editing of the Template custom Gcode
Fixed reloading of the legend, when preview type was changed
2020-06-09 17:10:48 +02:00
enricoturri1966
ca17948f87 ENABLE_GCODE_VIEWER_AS_STATE -> Load gcode from file and process it 2020-06-08 09:12:20 +02:00
enricoturri1966
70a6fb0e20 Added new tech ENABLE_GCODE_VIEWER_AS_STATE -> GCodeViewer as a new application state (WIP) + fix of conflicts after merge with master 2020-06-05 16:50:17 +02:00
enricoturri1966
4f63095d9a Collapse toolbar moved from GLCanvas3D to Plater::priv 2020-06-05 12:33:09 +02:00
enricoturri1966
96db6aaadb Attempt to fix rambling crash on Mac Asan 2020-05-28 11:14:56 +02:00
enricoturri1966
448d92df68 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-05-27 14:29:54 +02:00
Lukas Matena
48c186331a Includes cleanup:
GUI_App.hpp      (should not include) MainFrame.hpp
MainFrame.hpp    Plater.hpp
ModelArrange.hpp Model.hpp
Slicing.hpp      PrintConfig.hpp
FillBase.hpp     PrintConfig.hpp
GUI_App.hpp      PrintConfig.hpp
OptionsGroup.hpp GUI_App.hpp
2020-05-27 14:01:47 +02:00
enricoturri1966
2eb4b2caed Fixed conflicts after merge with master 2020-05-27 10:32:02 +02:00
Lukas Matena
cc5fe02cde Include cleanup: GUI_ObjectManipulation.hpp, GUI, GUI_Preview 2020-05-26 13:45:36 +02:00
enricoturri1966
8f91b4f4f4 DoubleSlider::Control -> Tweaks to text position for horizontal case 2020-05-26 08:34:19 +02:00
enricoturri1966
a63e5b352e ENABLE_GCODE_VIEWER -> Reduced vertical size of horizontal slider 2020-05-25 12:08:09 +02:00
enricoturri1966
1af798dbd7 DoubleSlider::Control thumb text rendered closer to the slider 2020-05-25 11:16:40 +02:00
enricoturri1966
98c2e3c7b1 GCodeViewer -> New icons for thumbs of horizontal DoubleSlider::Control 2020-05-19 11:17:47 +02:00
enricoturri1966
053f509437 GCodeViewer -> Fixed visibility of bottom toolbar 2020-05-19 10:04:14 +02:00
enricoturri1966
f4303fc419 Attempt to fix build on OsX 2020-05-18 13:32:07 +02:00
enricoturri1966
163fbec8c8 GCodeViewer -> Completed implementation of slider for sequential view 2020-05-18 13:24:07 +02:00
enricoturri1966
a68eefbe4a Tech ENABLE_GCODE_VIEWER -> Refactoring and code cleanup 2020-05-15 12:25:38 +02:00
enricoturri1966
5be901547e GCodeViewer -> Imgui slider for sequential view replaced by DoubleSlider::Control (wip) 2020-05-15 09:22:51 +02:00
enricoturri1966
c02a77d942 GCodeViewer -> Prototype for tool marker 2020-05-11 13:09:26 +02:00
enricoturri1966
5c6a56ca29 GCodeAnalyzer and GCodePreviewData removed from tech ENABLE_GCODE_VIEWER 2020-05-07 10:49:12 +02:00
enricoturri1966
df1da3c6ca Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-05-06 14:41:56 +02:00
enricoturri1966
6f789aaee7 GLCanvas3DManager replaced by OpenGLManager 2020-05-06 14:38:53 +02:00
enricoturri1966
aa49575e0f Fixed conflicts after merge with master 2020-05-06 12:48:00 +02:00
enricoturri1966
0bb56736a1 Tech ENABLE_NON_STATIC_CANVAS_MANAGER set as default 2020-05-06 12:19:34 +02:00
enricoturri1966
a84c434787 GCodeViewer -> Refactoring/Optimization 2020-05-05 13:57:51 +02:00
enricoturri1966
813e268d7e Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-05-04 09:37:29 +02:00
enricoturri1966
c7806dd021 GCodeViewer -> Fixed visualization of travel paths 2020-05-04 09:37:06 +02:00
enricoturri1966
9f2f798ea2 GCodeViewer -> Added ironing extrusion role 2020-04-29 13:51:20 +02:00
enricoturri1966
cd5d70d5e1 GCodeViewer -> Fixed z slider in initial preview 2020-04-29 10:18:29 +02:00
enricoturri1966
d265c84b76 GCodeViewer -> Refactoring 2020-04-28 12:24:03 +02:00
enricoturri1966
a77461b467 GCodeViewer -> Fixed synchronization between legend and bottom toolbar 2020-04-28 09:09:24 +02:00
enricoturri1966
2a4d011817 GCodeViewer -> Toggle extrusion role visibility by clicking on legend 2020-04-28 08:50:52 +02:00
YuSanka
93170870e8 Fixed update(clear) of the search_line, when search dialog was opened and closed without changing 2020-04-27 11:51:17 +02:00
enricoturri1966
a6ed1d817a GCodeViewer -> Layers z slider wip 2020-04-27 11:44:29 +02:00
enricoturri1966
4ea96340d8 GCodeViewer -> Draw alphed extrusion paths into legend when set as not visible 2020-04-25 12:24:56 +02:00
enricoturri1966
d8091b7ad7 ENABLE_GCODE_VIEWER -> Preview toolbar checkboxes moved into a new combo 2020-04-24 16:12:38 +02:00
YuSanka
fcb85dcdc3 First implementation of the separate plater from the settings tabs
+ Added collapse_toolbar
2020-04-23 17:11:49 +02:00
enricoturri1966
66964c44c1 GCodeViewer -> Refactoring and code cleanup 2020-04-23 15:12:40 +02:00
enricoturri1966
7a0df4bcb4 GCodeViewer -> Extrusion toolpaths colored by color print (wip) + visualization of tool changes, color changes, pause prints, custom gcodes + refactoring 2020-04-22 16:29:07 +02:00
enricoturri1966
4c4485a9b5 GCodeViewer -> Extrusion toolpaths colored by tool 2020-04-21 15:55:26 +02:00
enricoturri1966
3ba6ac7836 GCodeViewer -> Extrusion toolpaths colored by feedrate and ranges calculations dependent on travel paths visibility 2020-04-20 16:04:59 +02:00
enricoturri1966
179dbc7d0e Tech ENABLE_GCODE_VIEWER -> removed legend texture from GLCanvas3D 2020-04-18 11:49:20 +02:00
enricoturri1966
9776d7c5a1 GCodeViewer -> Toggle visibility of extrusions roles 2020-04-17 10:43:29 +02:00
enricoturri1966
7b0e35e70d GCodeViewer -> Selection of extrusions view type 2020-04-16 15:59:36 +02:00
enricoturri1966
cc774dece7 GCodeViewer -> Toggle visibility of shells 2020-04-15 14:31:39 +02:00
enricoturri1966
bc05ab985c GCodeViewer -> Toggle visibility of travel paths, retractions and uretractions 2020-04-14 16:40:08 +02:00
enricoturri1966
c3eb65c461 Added class GCodeViewer -> basic render of gcode toolpaths using dedicated shaders 2020-04-14 10:02:08 +02:00
enricoturri1966
29cbfa7c9e Fixed conflicts after merge with master 2020-03-30 09:36:37 +02:00
bubnikv
750e704b37 Merge remote-tracking branch 'remotes/origin/et_slope_shader' 2020-03-25 16:09:04 +01:00
enricoturri1966
ed0f3b3406 Small refactoring 2020-03-25 13:55:17 +01:00
enricoturri1966
a1a4d49f15 Fixed conflicts after merge with master 2020-03-25 12:07:59 +01:00
enricoturri1966
b36051af82 New tech ENABLE_SLOPE_RENDERING - 1st installment of rendering objects colored by facets slope 2020-03-13 15:09:07 +01:00
Enrico Turri
dc3df3aec7 Removed temporary debug output and clean up 2020-03-05 10:14:12 +01:00
Enrico Turri
dcf3565426 Attempt to fix crash on MAC when closing using Command+Q 2020-03-04 15:19:48 +01:00
Enrico Turri
1bff1f7460 Added temporary debug output to investigate crash on MAC when closing using Command+Q 2020-03-04 14:19:15 +01:00
Enrico Turri
d12cc6cb77 Removed temporary debug output 2020-03-03 08:34:03 +01:00
Enrico Turri
8b5a08a64a Added temporary debug output 2020-03-02 15:22:41 +01:00
Enrico Turri
3b6d334d7b ENABLE_GCODE_VIEWER - Basic framework for new gcode viewer 2020-03-02 15:13:23 +01:00
Enrico Turri
0b629eb905 GLCanvas3DManager moved from being a static member of _3DScene to be a normal member of GUI_App 2020-03-02 10:58:46 +01:00
YuSanka
3ffc565722 DoubleSlider:colored_band: Fixed get a correct color for extruder, when it's changed from Settings Tab 2020-02-14 09:52:27 +01:00
YuSanka
1399696b04 DoubleSlider: Suppressed manipulation for sequential print.
+ some code refactoring

 + experiment with alignment of several options inside the Line
2020-02-14 09:52:27 +01:00
Enrico Turri
4a59a45d51 ENABLE_SHOW_SCENE_LABELS set as default 2020-02-13 13:24:52 +01:00
Enrico Turri
dc393e2f0a Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_labels 2020-02-04 12:28:06 +01:00
YuSanka
d320a03c54 DoubleSlider: Added using of default colors for color changes in SingleExtruder Mode (#3449)
+ added missed input parameter to the BitmapCache::mksolid() which was cause a wrong drawing of the Extruder selector under OSX
2020-02-03 21:28:55 +01:00
Enrico Turri
d5b258c267 1st installment of object/instance labels in 3D scene 2020-01-28 13:15:21 +01:00
YuSanka
5ff8ae955b Implemented editing for extruder of existing ToolChangeCode tick
+ Code refactoring: DoubleSlider is extracted from wxExtensions
2020-01-23 16:11:21 +01:00
YuSanka
1ed313ab79 Synchronized mode of color_print data to/from 3mf/amf
+ Code refactoring " CustomGCode extracted to separate namespace and file
2020-01-23 16:11:21 +01:00
YuSanka
2259f7b3e8 Code refactoring to mode comparison 2020-01-17 12:24:58 +01:00
YuSanka
52c590f57a Merge remote-tracking branch 'origin/ys_cp_improvements' 2020-01-16 16:06:19 +01:00
YuSanka
89fcd7f95a Added "mode" variable for custom_gcode_per_print_z 2020-01-16 16:01:19 +01:00
Enrico Turri
6be4b3865b Merge remote-tracking branch 'foxox/feature/ScaleSpeedLegendToVisible2' 2020-01-16 13:55:59 +01:00
YuSanka
02b2e20628 Context menus improvements. Disabling unused extruders for color_change 2020-01-10 16:49:07 +01:00
YuSanka
aed277089b Updated tooltips and context menus for 3 manipulation mode of DoubleSlider
+ Some code refactoring
2020-01-09 16:38:59 +01:00
YuSanka
fb65e3152f DoubleSlider modes(states) are extended and implemented mode detection from model
+ Some code refactoring
2020-01-08 16:29:37 +01:00
Enrico Turri
a4ad0a0925 Fixed unresponsive 3Dconnexion device when switching to preview 2020-01-03 11:41:29 +01:00
YuSanka
afcc6bbb08 Code refactoring for Color change implementation 2019-12-17 08:37:50 +01:00
foxox
dea83da5b7 Speed legend scales depending on travel visibility. 2019-12-08 00:03:41 -05:00
YuSanka
c87feb9870 Code cleaning - removed unused state from DoubleSlider 2019-11-28 08:38:28 +01:00
YuSanka
322c0230c3 Code cleaning - deleted extruder selector 2019-11-27 16:03:16 +01:00
YuSanka
901a20b3b1 Code cleaning 2019-11-27 15:27:44 +01:00
YuSanka
0fb8b2ce09 Delete color changes for unused extruders 2019-11-15 16:36:29 +01:00
YuSanka
8ec1465ea5 Added editing of custom G-code
+ Code cleaning
2019-11-12 16:59:27 +01:00
YuSanka
6c8bb51f4a Use constant names for G-codes like M600, M601 and "tool_change"(Change extruder) 2019-11-11 09:38:45 +01:00