Commit Graph
100 Commits
Author SHA1 Message Date
enricoturri1966 75a1a699a7 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2020-12-04 14:19:08 +01:00
enricoturri1966 6eb202af0b GCodeViewer - Disable Tab and collapse sidebar events 2020-12-04 14:18:54 +01:00
enricoturri1966 7a54c4fdfe Fixed conflits after merge with master 2020-12-04 12:33:44 +01:00
enricoturri1966 26982b16c7 #5080 - Reworked logic for automatic selection of current view type in preview 2020-12-04 12:31:50 +01:00
enricoturri1966 15b56c9950 Merge remote-tracking branch 'origin/et_animations' 2020-12-04 10:33:09 +01:00
enricoturri1966 dcee9d7bfe Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_animations 2020-12-04 10:27:54 +01:00
enricoturri1966 4870656877 Import all valid files when dragging and dropping a set of files on the application 2020-12-04 09:15:55 +01:00
enricoturri1966 6835c5ad35 Fixed build on MAC 2020-12-03 15:40:52 +01:00
enricoturri1966 cc0688678c Fixed conflicts after merge with master 2020-12-03 15:27:34 +01:00
enricoturri1966 bcb2a4884b NotificationManager -> Separate notification update from its render to reduce the amount of scene refresh 2020-12-03 15:12:32 +01:00
enricoturri1966 639ef33aab Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2020-12-03 13:49:20 +01:00
enricoturri1966 2a0a9af0c9 #5360 - GCode Viewer -> Added menu command to reload gcode file 2020-12-03 13:48:54 +01:00
enricoturri1966 42a00a32df Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_animations 2020-12-01 10:43:32 +01:00
enricoturri1966 24a8f832bc Fixed activation of shortcut dialog with '?' key 2020-12-01 10:43:04 +01:00
enricoturri1966 e842077cc6 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_animations 2020-12-01 10:18:00 +01:00
enricoturri1966 430648471a Follow-up of 6ae1a10614 - Fixed typo 2020-12-01 10:17:35 +01:00
enricoturri1966 67d42c7053 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_animations 2020-12-01 08:45:50 +01:00
enricoturri1966 dc736f7855 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2020-12-01 08:33:20 +01:00
enricoturri1966 6ae1a10614 #5333 - Reworked navigation of preview's sliders using the keyboard 2020-12-01 08:33:06 +01:00
enricoturri1966 8cc46a450b Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_animations 2020-11-30 13:46:03 +01:00
enricoturri1966 0d4123192f Removed GLCanvas3D from parameters of NotificationManager methods 2020-11-30 13:45:17 +01:00
enricoturri1966 184e4f77cd Bring PrusaSlicer to top when drag and dropping a project file on its executable 2020-11-27 09:35:32 +01:00
enricoturri1966 00a67ba004 GCode Viewer -> Parse gcode produced by KISSSlicer 2020-11-26 16:07:07 +01:00
enricoturri1966 d9be78d4cb Fixed bug introduced with 4d483f323f 2020-11-26 13:37:08 +01:00
enricoturri1966 10fb75edf0 Enabled tech ENABLE_CTRL_M_ON_WINDOWS -> Added customizable support for legacy CTRL+M settings dialog on Windows in preference dialog 2020-11-26 11:00:24 +01:00
enricoturri1966 67aaf0b78e Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2020-11-26 10:09:53 +01:00
enricoturri1966 e2b4de455b Customizable association of .3mf, .stl and .gcode files on Windows 2020-11-26 10:09:34 +01:00
enricoturri1966 7da1622e76 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2020-11-26 08:43:22 +01:00
enricoturri1966 4d483f323f GCode Viewer -> Show extimated layer time on the vertical slider for gcode produced by PrusaSlicer 2.3.0, Cura, Simplify3D, CraftWare, ideaMaker 2020-11-26 08:43:04 +01:00
enricoturri1966 c5b06dc1ff Merge remote-tracking branch 'origin/et_drag_and_drop' 2020-11-25 12:58:14 +01:00
enricoturri1966 f0aa4de20a Fixed conflicts after merge with master 2020-11-25 12:42:26 +01:00
enricoturri1966 abf5a58336 Preference dialog centered on the application 2020-11-25 12:40:05 +01:00
enricoturri1966 df40f6ba11 ENABLE_GCODE_VIEWER set as default 2020-11-25 10:31:58 +01:00
enricoturri1966 9d71597e05 Fixed conflicts after merge with master 2020-11-24 13:37:52 +01:00
enricoturri1966 44fe3b8a00 Tech ENABLE_DRAG_AND_DROP_FIX -> Apply dialog implemented with 808c43cb4b also to drag and drop of project files into application executable 2020-11-24 13:35:43 +01:00
enricoturri1966 1ce8cddbda Do not show anything in vertical slider if estimated times are missing 2020-11-24 12:00:46 +01:00
enricoturri1966 b2ab5db69b ENABLE_GCODE_VIEWER set as default in:
DoubleSlider hpp/cpp
2020-11-24 11:53:52 +01:00
enricoturri1966 709404ce3e Fixed crash in texture compression 2020-11-24 11:09:05 +01:00
enricoturri1966 4736408a46 Fixed localization on preview's legend button 2020-11-24 09:23:33 +01:00
enricoturri1966 92953acc57 #5236 - Fixed color not correctly shown after slice
The bug was introduced with 148f4fe766 which is now replaced by this commit
2020-11-23 17:15:22 +01:00
enricoturri1966 1d0b947fa8 ENABLE_GCODE_VIEWER set as default in:
GCodeViewer hpp/cpp
2020-11-23 14:30:31 +01:00
enricoturri1966 6b732e5a26 Merge remote-tracking branch 'origin/et_wipe_moves' 2020-11-23 13:48:03 +01:00
enricoturri1966 26befd5fa3 #5234 - Disabled pop-up menu on the wipe tower 2020-11-23 13:45:12 +01:00
enricoturri1966 f68cf49f3d Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_wipe_moves 2020-11-23 10:11:04 +01:00
enricoturri1966 ce7b843de7 GCode Viewer - Fixed filament label in legend 2020-11-21 11:30:14 +01:00
enricoturri1966 0e6acbc0e2 Preview - Visualization of wipe mones 2020-11-21 10:36:10 +01:00
Enrico Turri cf42e9fc6e Fixed typo 2020-11-20 12:01:59 +01:00
Enrico Turri 148f4fe766 GCode Viewer - Fixed crash when switching to tool view with gcode generated by slicers other than PrusaSlicer 2020-11-20 11:50:25 +01:00
enricoturri1966 a1905d9b9e ENABLE_GCODE_VIEWER set as default in:
MainFrame hpp/cpp

Plater hpp/cpp
2020-11-19 14:59:46 +01:00
enricoturri1966 ef9cea76c2 ENABLE_GCODE_VIEWER set as default in:
GLCanvas3D hpp/cpp

GUI_Preview hpp/cpp
2020-11-19 12:29:19 +01:00
enricoturri1966 df19697d8e Fixed Shift+A to arrange selection 2020-11-18 15:14:49 +01:00
enricoturri1966 72f9cc07e8 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2020-11-18 14:10:39 +01:00
enricoturri1966 d0c87eb7ca Added missing include 2020-11-18 14:10:02 +01:00
enricoturri1966 badb85650e Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2020-11-18 13:42:54 +01:00
enricoturri1966 24b425cf57 Follow-up of 808c43cb4b -> Fixed drag and drop of non-project files 2020-11-18 13:42:17 +01:00
enricoturri1966 0ed3262645 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2020-11-18 13:05:04 +01:00
enricoturri1966 87e1875822 ENABLE_GCODE_VIEWER set as default in:
SysInfoDialog.cpp

Selection hpp/cpp

Preferences.cpp

GUI_Utils.hpp

KBShortcutsDialog.cpp
2020-11-18 13:04:34 +01:00
enricoturri1966 faff112ea8 ENABLE_GCODE_VIEWER set as default in:
3DScene hpp/cpp

AboutDialog.cpp

BackgroundSlicingProcess hpp/cpp

BitmapCache.cpp

ConfigWizard_private.hpp

GUI_App hpp/cpp

GUI_Init.cpp
2020-11-18 10:44:03 +01:00
enricoturri1966 a20ce2f484 ENABLE_GCODE_VIEWER set as default in 3DBed.hpp/.cpp 2020-11-16 17:29:21 +01:00
enricoturri1966 afddcf71db Preview - Paint in grey toolpaths belonging to layers containing pause prints or custom gcodes 2020-11-16 15:01:13 +01:00
enricoturri1966 e04c6a4d17 Fixed screen-size for point markers used to visualize retraction/unretractions and other options in preview 2020-11-16 10:29:54 +01:00
enricoturri1966 9b3ff9b1cf Zoom max limit increased from 100 to 250 2020-11-16 08:48:44 +01:00
enricoturri1966 808c43cb4b Added dialog to choose import action when dragging and dropping a project file 2020-11-16 08:39:25 +01:00
enricoturri1966 0e6acbe68d Merge remote-tracking branch 'origin/et_sequential' 2020-11-13 11:52:26 +01:00
enricoturri1966 0688a76c73 Code cleanup 2020-11-13 11:50:52 +01:00
enricoturri1966 e78e3ad80b Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_sequential 2020-11-13 10:46:41 +01:00
enricoturri1966 9e4cb893f7 Sequential print visualization using vertical slider in preview -> Added travel moves 2020-11-12 16:29:44 +01:00
enricoturri1966 8c8ad70c58 ENABLE_GCODE_VIEWER set as default in fff_print test and PrusaSlicer.cpp 2020-11-12 15:01:59 +01:00
enricoturri1966 8633e8f25c Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2020-11-12 14:05:56 +01:00
enricoturri1966 f1d10f3c90 ENABLE_GCODE_VIEWER set as default in libslic3r 2020-11-12 14:03:58 +01:00
enricoturri1966 28b4ad92ea Fix of previous commit 2020-11-11 17:35:29 +01:00
enricoturri1966 66f325cef4 Follow-up of 80e8b5e985 -> Fixed include in GCode.xsp 2020-11-11 17:28:56 +01:00
enricoturri1966 80e8b5e985 Removed the legacy PreviewData.cpp,hpp 2020-11-11 16:38:51 +01:00
enricoturri1966 4ad42d6171 WIP - Sequential print visualization using vertical slider in preview (missing travel moves) 2020-11-11 16:22:09 +01:00
enricoturri1966 4f85a42830 Follow-up of bb74d2da5b and 7b2aca0159 -> Removed inclusions of GCode/Analyzer.hpp and GCodeTimeEstimator.hpp 2020-11-11 15:41:48 +01:00
enricoturri1966 a72fb79f72 #5098 - Fixed no preview after language change 2020-11-09 14:27:00 +01:00
enricoturri1966 bf12c7cb8c GCode Viewer - Fixed color print visualization for gcode containing multiple extruders 2020-11-09 13:06:20 +01:00
enricoturri1966 479d4b70f2 GCode Viewer - Show print/printer/filament settings names in legend 2020-11-09 08:41:14 +01:00
enricoturri1966 8f31f404a3 Disabled tech ENABLE_CTRL_M_ON_WINDOWS 2020-11-06 11:55:57 +01:00
enricoturri1966 277376ee09 Enabled tech ENABLE_CTRL_M_ON_WINDOWS to produce an experimental build 2020-11-06 11:42:54 +01:00
enricoturri1966 f1b5142daa Follow-up of 944e760722 -> Removed debug output line 2020-11-06 11:20:47 +01:00
enricoturri1966 41ef6cf15c Disabled tech ENABLE_CTRL_M_ON_WINDOWS 2020-11-06 11:09:47 +01:00
enricoturri1966 411159b5e7 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2020-11-06 11:03:56 +01:00
enricoturri1966 944e760722 #4892 - Follow-up of 30481e1ea8 -> Fixed behavior of imgui dialog for settings of 3DConnexion devices (CTRL+M) on Windows 2020-11-06 11:03:41 +01:00
enricoturri1966 8491872fb7 #5079 - Fixed GCode Viewer changing files modified date on Windows 2020-11-05 14:02:43 +01:00
enricoturri1966 6d56e60091 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2020-11-05 11:02:08 +01:00
enricoturri1966 aea09b8347 #5072 - Added color icon into 'Print' items in legend for gcode color print visualization 2020-11-05 11:01:54 +01:00
enricoturri1966 2ec5a0d46c Fixed visualization of gcode toolpaths for spiral vase mode 2020-11-05 11:00:04 +01:00
enricoturri1966 747fcb1d07 Follow-up of d2e5be89e3 -> Fixed processing of color print, pause print and custom gcode tags 2020-11-04 13:33:27 +01:00
enricoturri1966 8af25f7771 Fixed post-processing of placeholders in gcode when not exporting remaining times 2020-11-03 12:26:48 +01:00
enricoturri1966 f94e94f53e GCode tool marker set as visible by default 2020-11-03 09:27:18 +01:00
enricoturri1966 eff95bcdb2 Disabled tech ENABLE_CTRL_M_ON_WINDOWS 2020-11-03 09:07:23 +01:00
enricoturri1966 54d6834553 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2020-11-03 08:41:14 +01:00
enricoturri1966 30481e1ea8 Tech ENABLE_CTRL_M_ON_WINDOWS [Experimental] to re-enable imgui dialog for settings of 3DConnexion devices (CTRL+M) on Windows 2020-11-03 08:41:04 +01:00
enricoturri1966 e6ddcbab0c New icons for standalone gcode viewer 2020-11-02 14:25:34 +01:00
enricoturri1966 6bf839b315 Show the name of the loaded G-code in the application title bar 2020-11-02 14:10:34 +01:00
enricoturri1966 9dbc0c6ba2 #4395, #4701, #1336 - Added the ability to invert the scroll wheel when zooming 2020-11-02 13:08:13 +01:00
enricoturri1966 516db43b20 Improved handling of loading invalid .gcode files 2020-11-02 11:59:37 +01:00
enricoturri1966 38e883a66e Fixed scaling of mouse position for mouse wheel event handling in imgui on Retina monitors 2020-11-02 10:17:28 +01:00
enricoturri1966 3ec057bef7 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2020-11-02 09:37:09 +01:00