Commit Graph

12837 Commits

Author SHA1 Message Date
8021b7b4c9 Fixed OSX build 2020-05-05 20:40:31 +02:00
75fa07136f Merge remote-tracking branch 'origin/master' into ys_imperial_unit 2020-05-05 17:26:14 +02:00
5980d46e4c Bumped up version number to 2.3.0-alpha0 2020-05-05 13:11:32 +02:00
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
0e87226ac9 Merge branch 'master' of https://github.com/Prusa3d/PrusaSlicer 2020-05-04 16:18:32 +02:00
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
e21ce95524 Merge branch 'tm_disable_wxasserts' 2020-05-04 16:17:29 +02:00
ddeac631c4 Merge branch 'tm_fix_fonts_on_win' 2020-05-04 16:15:47 +02:00
568448fa7d Fix font size on windows with wx3.1.3 2020-05-04 15:00:17 +02:00
28c0880b24 ASCII folding applied over the matched string 2020-05-03 15:45:47 +02:00
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
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
e5c5ee6636 deps: disable wxWidgets library internal asserts 2020-04-30 14:33:23 +02:00
f479b77e01 Fixed compilation warning. 2020-04-30 12:04:49 +02:00
18d08cc5cb Merge branch 'master' of https://github.com/Prusa3d/PrusaSlicer 2020-04-30 12:04:03 +02:00
cc2d33f6a0 Search: Fixed returning of a pointer to temporary. 2020-04-30 12:03:49 +02:00
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
c717b16526 Merge remote-tracking branch 'origin/master' into ys_imperial_unit 2020-04-30 09:49:15 +02:00
5679438e64 Added missing namespace qualification for Slic3r::GUI::format in Http.cpp 2020-04-30 08:37:48 +02:00
bf09d8f93a Merge remote-tracking branch 'origin/master' into ys_imperial_unit 2020-04-29 19:17:20 +02:00
495db2ff2e Imperial units: Implemented just for the object's position and size 2020-04-29 19:10:13 +02:00
2875bc685c Fixed spelling of "sidebar" 2020-04-29 15:58:57 +02:00
d9c121a19c Merge remote-tracking branch 'origin/ys_search' 2020-04-29 15:36:31 +02:00
99d49a74d0 Merge remote-tracking branch 'origin/master' into ys_search 2020-04-29 14:56:31 +02:00
8a82e3d5be Localization fixes. 2020-04-29 14:42:43 +02:00
b91c3d26e3 Fix build on OSX with new wxWidgets in deps 2020-04-29 12:32:00 +02:00
d828a1e80b single slicer instance
check for other instances during startup
send message with command line arguments if found and terminate
listen for those messages and load objects from paths in messages from them
2020-04-29 10:53:48 +02:00
9cb5975956 bring back required switch for opengl with dep_GLEW 2020-04-29 09:44:46 +02:00
2a8c485b32 suppress unnecessary test output in release mode 2020-04-28 21:11:54 +02:00
6f7fa4bc09 Fix librt linking for wxWidgets 2020-04-28 21:01:09 +02:00
f3c154a88a Merge branch 'tm_fix_master' 2020-04-28 20:46:21 +02:00
98f0cc0dec Follow up, make png non required for now 2020-04-28 20:43:46 +02:00
985225cd38 Try to fix build with old wxwidgets builtin png and expat 2020-04-28 20:39:47 +02:00
4de4d765ee Merge branch 'master' of https://github.com/Prusa3d/PrusaSlicer 2020-04-28 19:31:18 +02:00
ef89c73fd5 fixing a compilation issue on a buggy GCC on R-PI 2020-04-28 18:28:11 +02:00
b8e02a5405 Fixed handling of fill_pattern field if not all patterns are allowed
for the internal infill.
2020-04-28 18:00:42 +02:00
db49a4516e Merge branch 'tm_deps_wxcmake'
EXPAT had to be moved to deps due to build errors with wxexpat.
2020-04-28 17:47:58 +02:00
ec81de7553 Ironing and Monotonous infill - first working implementation. 2020-04-28 17:19:11 +02:00
572b5ba8bb Add PNG and wxWidgets 3.1.3 uniformly to all platforms with cmake build.
wx is built with png as a dependency, wxpng is disabled.
2020-04-28 15:01:56 +02:00
2bd524849a Custom support blockers are now working 2020-04-27 17:45:55 +02:00
60ae7d67e9 Implemented workaround for the mouse wheel in Search Window and Undo/Redo lists on the Plater
Workaround is used because of ImGui::GetIO().MouseWheel returns zero always!
2020-04-27 16:00:54 +02:00
9fdc54bfff Fix app crash on startup under Linux/GTK3/Wayland config 2020-04-27 13:02:16 +02:00
bf2a10803e Fixing debug build broken after recent merge 2020-04-27 12:15:45 +02:00
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
033548a568 Introduction of Monotonous infill type. Fill no-sort only for monotonous
and ironing infills.
2020-04-25 08:15:04 +02:00
8afc9338de Merge branch 'lm_fdm_custom_supports_backend' 2020-04-24 15:16:33 +02:00
270e815eeb Fix to the last commit f9b3f2d45e 2020-04-24 11:33:00 +02:00
f9b3f2d45e Search: Code cleaning
+ Reverted "Plater" tab to the Settings Notepad
2020-04-24 11:01:14 +02:00
e390ebc95c WIP: Monotonous infill 2020-04-24 09:41:48 +02:00
4f622e4541 Merge branch 'tm_sl1_import_2' 2020-04-24 08:27:49 +02:00