Commit Graph

1092 Commits

Author SHA1 Message Date
5bbc804744 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-05-27 14:29:54 +02:00
edcaab8b0a 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
acd8801d3a Fixed conflicts after merge with master 2020-05-27 10:32:02 +02:00
ae8772b90d Few more include chains broken 2020-05-26 13:46:59 +02:00
a8628a040c Include cleanup: do not include Model.hpp from 3DScene.hpp 2020-05-26 13:45:36 +02:00
afdb571bb2 GCodeViewer -> Temporary ImGui dialog for editing shaders parameters 2020-05-26 08:16:08 +02:00
7635b8b931 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-05-25 07:07:49 +02:00
1eb6ec97ed ENABLE_SHADERS_MANAGER set as default 2020-05-22 16:08:02 +02:00
09d197cdc8 Reworked sys_color_changed() functions
Fixed OSX specific bugs:
- toolbar flashing for some mainframe sizes (Retina specific)
- size of mainframe when settings layout in slNew mode

Added missed icons to the "white" folder
2020-05-22 15:26:35 +02:00
cb2d747063 Fix in ENABLE_CAMERA_STATISTICS 2020-05-22 09:51:57 +02:00
0ad53b6036 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-05-21 10:15:24 +02:00
3f675370fc ENABLE_SHADERS_MANAGER -> Unified client code of new GLShadersManager and GLShaderProgram classes 2020-05-21 10:15:00 +02:00
2e64da5c1d Fixed build for all 4 cases of tech ENABLE_SHADERS_MANAGER and ENABLE_GCODE_VIEWER enabled/disabled and code cleanup 2020-05-20 17:03:53 +02:00
4194c347ab First installment of tech ENABLE_SHADERS_MANAGER, using class GLShadersManager as a central point to manage OpenGL shaders 2020-05-20 14:11:22 +02:00
89255d2c9c OSX specific bug fixing 2020-05-19 17:00:41 +02:00
9c2ae7c9a1 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-05-15 17:58:07 +02:00
af9b363e41 ENABLE_CANVAS_TOOLTIP_USING_IMGUI set as default 2020-05-15 13:40:45 +02:00
de9294daab Tech ENABLE_GCODE_VIEWER -> Refactoring and code cleanup 2020-05-15 12:25:38 +02:00
f98cfb81c9 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-05-13 12:34:50 +02:00
1cd2ffa6fe Tech ENABLE_GCODE_VIEWER -> Selection straight arrows rendered using the new OpenGL model class 2020-05-13 09:07:06 +02:00
d949c43817 Fixed a place on tool toolbar for collapse_toolbar_width in respect to its enable 2020-05-12 23:34:08 +02:00
41a696032e Auto scale of the toolbars in respect to the canvas size 2020-05-12 23:07:35 +02:00
41cecd67d9 Search: 1. The position of the search window is in the middle of the scene.
2. When "Search in English" is checked, then search in English names too.
3. Added score value at the end of option name -> [score_value]
4. Set focus to the Plater, when switch from some tab with focused field to the Plater and search window is shown.
5. For the mode, when settings are in non-modal dialog, neither dialog nor tabpanel doesn't receive wxEVT_KEY_UP event, when some field is selected.
   So, like a workaround we check wxEVT_KEY_UP event for the Filed and switch between tabs if Ctrl+(1-4) was pressed

+ PreferencesDialog: fixed a control of the difference in layout modes
2020-05-12 08:32:54 +02:00
61f8600e03 Merge branch 'master' into lm_fdm_custom_supports_polishing 2020-05-11 17:03:03 +02:00
9e8f7d2efb Slope visualiser angle inverted
It showed facet normal angle in the GUI, now it shows slope angle (90 deg complement). This change was made to unify it with threshold angle in Print Settings.
2020-05-11 16:57:40 +02:00
889e80d10a Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-05-11 08:06:48 +02:00
bef0e5007c Search: 1.Select first item in the search list by default
2. Show "Search in English" checkbox only, when Slicer is localized
3. Suppress search window hiding when leave the 3D-scene
2020-05-07 21:53:17 +02:00
ce28052f42 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-05-07 16:48:11 +02:00
b16837e136 Fix for tooltip not disappearing when loading an object using the top toolbar 'Add' command and when swithing to preview 2020-05-07 16:47:15 +02:00
98afc69a09 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-05-07 10:49:34 +02:00
0c3adc6805 GCodeAnalyzer and GCodePreviewData removed from tech ENABLE_GCODE_VIEWER 2020-05-07 10:49:12 +02:00
f5bb831c7b Search:
1. To the imGui Dialog added icons instead of settings type
2. Fixed a search trough the options with # symbol in opt_key
3. Deleted "Type" checkbox from the Search Windows and added "Search in English" checkbox (but without implementation for this moment)

Layouts:
1. Fixed a visibility of the "Switch to Settings" toolbar icon for the old layout mode
2020-05-06 20:51:50 +02:00
bd92fa60f2 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2020-05-06 15:15:31 +02:00
14357d0f56 Merge remote-tracking branch 'origin/ys_layouts' 2020-05-06 14:44:30 +02:00
a15e414547 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-05-06 14:41:56 +02:00
78b03f411d GLCanvas3DManager replaced by OpenGLManager 2020-05-06 14:38:53 +02:00
71f98f2857 Fixed conflicts after merge with master 2020-05-06 12:48:00 +02:00
8bba1d96dc Tech ENABLE_NON_STATIC_CANVAS_MANAGER set as default 2020-05-06 12:19:34 +02:00
e5fd4449be FDM supports - setting by angle highlight the facets in real time (experiment) 2020-05-06 08:16:44 +02:00
ed6cac62c8 New layout:
1. PreferencesDialog: When "Cancel" is selected, don't close the PreferencesDialog, just revert layout mode selection
2. For the tooltip of "Switch to Settings" added information about shortcuts
3. Shortcuts for the switching between tabs work from Settings Dialog now
4. Fixed the collapse button show after preference's change
2020-05-05 17:23:58 +02:00
c30e227eaa Merge branch 'master' into lm_fdm_custom_supports_polishing 2020-05-05 13:46:01 +02:00
e61440a3fe GCodeViewer -> Prototype for sequential view 2020-05-05 12:09:11 +02:00
3e3698ebae New Layouts: There 3 mode of a layout of the settings tabpanel :
1. Old mode, as it was always.
2. New mode, when Settings Tabs are hidden on the Plater. Use "cog" icon for the switching to the settings tabs
3. Dlg mode, when Settings Tabs are extracted to the Settings dialog. Use "cog" icon for Show or Focus the Settings Dialog

The "Collapse sidebar" toolbar appearance is set in the Preferences.
2020-05-04 22:31:59 +02:00
47b54673f8 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-05-04 09:37:29 +02:00
1141732404 Fixed spelling of "sidebar" 2020-04-29 15:58:57 +02:00
1e6fdf6d80 Merge remote-tracking branch 'origin/master' into ys_search 2020-04-29 14:56:31 +02:00
201dbbd64d Selection rectangle is supressed when FDM custom supports gizmo is active 2020-04-29 13:36:11 +02:00
fcb24124df GCodeViewer -> Fixed z slider in initial preview 2020-04-29 10:18:29 +02:00
cf2f45c5ca Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-04-28 10:29:44 +02:00
f06ea4064f GCodeViewer -> Fixed synchronization between legend and bottom toolbar 2020-04-28 09:09:24 +02:00