3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-10-27 10:41:15 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 5
13457 commits 10 branches 72 tags 1.5 GiB
Commit graph

13457 commits

This branch
This branch
All branches
Author SHA1 Message Date
YuSanka
d7b12c6e19 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2020-05-06 15:15:31 +02:00
enricoturri1966
49f85a215b Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-05-06 15:12:34 +02:00
enricoturri1966
e28ed4997d Added missing include 2020-05-06 14:48:40 +02:00
YuSanka
b7c122096a Merge remote-tracking branch 'origin/ys_layouts' 2020-05-06 14:44:30 +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
3d6fd92747 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-05-06 11:18:54 +02:00
enricoturri1966
82b75112bd GCodeViewer -> Sequential view marker wip + refactoring 2020-05-06 11:18:37 +02:00
Lukas Matena
d90cea7aad FDM supports - setting by angle highlight the facets in real time (experiment) 2020-05-06 08:16:44 +02:00
Lukas Matena
d24a3453af Added simple autosetting of custom supports based on facet normal angle 2020-05-06 07:03:32 +02:00
YuSanka
8021b7b4c9 Fixed OSX build 2020-05-05 20:40:31 +02:00
YuSanka
0098aee002 Fixed OSX build 2020-05-05 20:36:00 +02:00
YuSanka
75fa07136f Merge remote-tracking branch 'origin/master' into ys_imperial_unit 2020-05-05 17:26:14 +02:00
YuSanka
181203c2c7 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
Enrico Turri
c6646ca897 Merge branch 'et_gcode_viewer' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-05-05 16:32:13 +02:00
enricoturri1966
1c4ffa9b16 GCodeViewer -> Added buttons for forward/backward movements of 1, 10 and 100 moves to sequential view bar 2020-05-05 16:29:07 +02:00
Enrico Turri
fff173d09c Merge branch 'et_gcode_viewer' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-05-05 15:13:21 +02:00
enricoturri1966
a84c434787 GCodeViewer -> Refactoring/Optimization 2020-05-05 13:57:51 +02:00
Lukas Matena
e0b04e7d36 Merge branch 'master' into lm_fdm_custom_supports_polishing 2020-05-05 13:46:01 +02:00
Lukas Matena
272de22055 Undo/redo in FDM supports gizmo 2020-05-05 13:45:04 +02:00
bubnikv
5980d46e4c Bumped up version number to 2.3.0-alpha0 2020-05-05 13:11:32 +02:00
enricoturri1966
170f91b335 GCodeViewer -> Prototype for sequential view 2020-05-05 12:09:11 +02:00
Lukas Matena
0c84a0b696 Fixed SLA supports gizmo undo/redo stack 
broken by 4f43c6d even before 2.2.0 release
 2020-05-05 11:17:32 +02:00
YuSanka
43be7a51aa Fixed OSX/Linux build 
Destroy Settings Dialog when close application
 2020-05-05 09:37:31 +02:00
YuSanka
53516c8086 Merge remote-tracking branch 'origin/master' into ys_layouts 2020-05-05 08:54:51 +02:00
YuSanka
10d530a57e 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
bubnikv
80b684b4b7 Fuzzy matching: 
1) Handle localized and English searches as equivalent.
2) Search the whole section : group : label string, still give
   precedence to just the label.
 2020-05-04 21:22:56 +02:00
bubnikv
0e87226ac9 Merge branch 'master' of https://github.com/Prusa3d/PrusaSlicer 2020-05-04 16:18:32 +02:00
bubnikv
95cf8c2d30 Fuzzy matching of parameters in the search box: 
Fix of https://github.com/forrestthewoods/lib_fts/issues/21 finally applied,
disabled CamelCase matching as we are not using CamelCase in Slicer parameters.
 2020-05-04 16:18:20 +02:00
tamasmeszaros
e21ce95524 Merge branch 'tm_disable_wxasserts' 2020-05-04 16:17:29 +02:00
tamasmeszaros
ddeac631c4 Merge branch 'tm_fix_fonts_on_win' 2020-05-04 16:15:47 +02:00
tamasmeszaros
568448fa7d Fix font size on windows with wx3.1.3 2020-05-04 15:00:17 +02:00
Enrico Turri
c74b384a10 Merge branch 'et_gcode_viewer' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-05-04 10:38:55 +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
bubnikv
28c0880b24 ASCII folding applied over the matched string 2020-05-03 15:45:47 +02:00
bubnikv
e27c6c7928 fts_fuzzy_match fixes: 
Recursive fix https://github.com/forrestthewoods/lib_fts/issues/21
End of string penalty fix https://github.com/forrestthewoods/lib_fts/issues/24

Some refactoring for succintness (based on Vojtech's taste)
 2020-05-03 14:14:40 +02:00
bubnikv
07ab5c31e6 WIP Fuzzy search rework. 
1) fts_fuzzy_match has been extended to support wchar_t for a char
   type and uint16_t for an index type for the match indices.
2) fts_fuzzy_match has been extended to place a proper stopper character
   into the match buffer.
3) Slicer integration now uses the fuzzy match indices for highlighting.
4) Slicer integration now correctly highlights the matched word.
5) Slicer search dialog now sorts based on match AND category.

Further modifications are planned:
1) Matching in local language vs. English: Just show the English variant
   if matched in English. Don't mix the two together.
2) Matching the group or category: Continue matching the label.
3) For matches with equal match quality and category sort alphanumerically.
 2020-05-01 08:57:24 +02:00
Lukas Matena
377c7d3086 FDM supports gizmo is aware of the clipping plane 2020-04-30 16:57:09 +02:00
Lukas Matena
04cfd5f832 Fix updating of gizmos when instances are added 
Gizmos were in fact updated after an instance was added, but before it was selected
 2020-04-30 15:21:11 +02:00
tamasmeszaros
e5c5ee6636 deps: disable wxWidgets library internal asserts 2020-04-30 14:33:23 +02:00
bubnikv
f479b77e01 Fixed compilation warning. 2020-04-30 12:04:49 +02:00
bubnikv
18d08cc5cb Merge branch 'master' of https://github.com/Prusa3d/PrusaSlicer 2020-04-30 12:04:03 +02:00
bubnikv
cc2d33f6a0 Search: Fixed returning of a pointer to temporary. 2020-04-30 12:03:49 +02:00
Lukas Matena
bc34928ea8 Follow-up of previous commit (Slic3r::GUI::format issues) 
Another missing namespace qualification caused infinite recursion
 2020-04-30 11:32:17 +02:00
YuSanka
c717b16526 Merge remote-tracking branch 'origin/master' into ys_imperial_unit 2020-04-30 09:49:15 +02:00
Lukas Matena
5679438e64 Added missing namespace qualification for Slic3r::GUI::format in Http.cpp 2020-04-30 08:37:48 +02:00
YuSanka
bf09d8f93a Merge remote-tracking branch 'origin/master' into ys_imperial_unit 2020-04-29 19:17:20 +02:00