Commit Graph

1020 Commits

Author SHA1 Message Date
YuSanka
6ce87da9d8 Merge remote-tracking branch 'origin/master' into ys_layouts 2020-05-05 08:54:51 +02:00
YuSanka
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
bubnikv
3a44399df1 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
bubnikv
1141732404 Fixed spelling of "sidebar" 2020-04-29 15:58:57 +02:00
YuSanka
1e6fdf6d80 Merge remote-tracking branch 'origin/master' into ys_search 2020-04-29 14:56:31 +02:00
David Kocik
4102c86b5d 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
YuSanka
4674cec006 Search: Code cleaning
+ Reverted "Plater" tab to the Settings Notepad
2020-04-24 11:01:14 +02:00
YuSanka
5ea4416033 Fixed an update of the search list after the change of the print technology 2020-04-23 21:32:12 +02:00
tamasmeszaros
33ab0eb660 Add ui job for SLA import 2020-04-23 19:45:55 +02:00
tamasmeszaros
f930587f43 SLA archive import with miniz, marching square bugfixes
Fix compilation on Windows


Fix array subscript out of range error in MarchingSquares


Fix normals of mesh constructed from slices


Improve performance of mesh construction from slices
2020-04-23 19:12:07 +02:00
tamasmeszaros
4e4efeef31 Initial version of sl1 import with sla::Raster refactor. 2020-04-23 19:05:32 +02:00
tamasmeszaros
82aa16d123 Move ui jobs into separate folder 2020-04-23 18:56:09 +02:00
tamasmeszaros
190bf40434 Separate jobs from Plater, re-add big bed workaround 2020-04-23 18:47:51 +02:00
tamasmeszaros
8ca136d003 Add min_object_distance method as free function taking ConfigBase argument 2020-04-23 18:17:37 +02:00
YuSanka
7805778ab8 First implementation of the separate plater from the settings tabs
+ Added collapse_toolbar
2020-04-23 17:11:49 +02:00
YuSanka
2028d3e570 Search: Fixed "Search" menu item under OSX
+ deleted search combobox
2020-04-22 20:27:42 +02:00
YuSanka
2d7f3fa6ba Search: Implemented SearchDialog.
Search window on Plater: set flag SelectAll for search line
2020-04-22 15:46:23 +02:00
YuSanka
2b3b8e85d9 Search: Implemented "Option type" checkbox for imGui window on Plater
+ code refactoring
2020-04-20 21:54:46 +02:00
YuSanka
5996e3a0ec Implemented cursor movement inside SearchComboPopup
+ Added checkboxes for editing of the option's name (include "Group"/"Category" or not)
+ some code refactoring
2020-04-14 17:54:15 +02:00
YuSanka
29ac9752b4 Added map for save Group and Category values for each option
+ Some code refactoring in Tab (the translation of the titles moved to the OptionGroups) and Search
+ Fixed assert in fts_fuzzy_match
2020-04-13 17:55:38 +02:00
YuSanka
a6f4c2893f Code cleaning 2020-04-07 16:22:03 +02:00
YuSanka
31baca7bf5 Implemented SearchCtrl class instead of SearchComboBox
Search string are synchronized between Plater and Tabs.

List with options and filtered list are in Sidebar.
All options list on tabs and Plater use this data from Sidebar

Note: SearchComboBox.cpp(hpp) was renamed to Search.cpp(hpp)
2020-04-03 10:27:50 +02:00
YuSanka
28f609d4ce Merge remote-tracking branch 'origin/master' into ys_search 2020-04-01 20:23:34 +02:00
tamasmeszaros
b2130e2ede Follow-up fix for big bed arrangement 2020-04-01 12:34:50 +02:00
bubnikv
9dafa01fc2 fixed missing include 2020-04-01 10:30:33 +02:00
bubnikv
ace38ea7c1 Fixing OSX and Linux builds 2020-04-01 10:09:31 +02:00
enricoturri1966
6e39b0db92 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2020-04-01 09:58:48 +02:00
enricoturri1966
9c7acca1cf #3964 - Attempt to fix crash when closing on Linux (Debian unstable) 2020-04-01 09:58:31 +02:00
bubnikv
6da3c1646e Slic3r::format(), Slic3r::GUI::format_wxstr():
wrappers around boost::format using C++17 variadic templates,
replacing the ugly and verbose
	(boost::format("template") % arg1 % arg2).str()
syntax.
The wrappers also implictely convert input parameters including the template
from wxString to UTF8.

The new format wrapper has been applied at multiple places as a start,
also some double macros _(L()) with new single macro _L().
2020-04-01 09:49:04 +02:00
tamasmeszaros
e3f0a2adf6 Fix arrange for large beds 2020-03-30 13:26:24 +02:00
YuSanka
00a6c43c9a Activated "collapsed sidebar" button 2020-03-29 20:52:14 +02:00
YuSanka
0b372d4fd5 Merge remote-tracking branch 'origin/master' into ys_search 2020-03-29 20:21:00 +02:00
YuSanka
5ebf7f8c69 Merge remote-tracking branch 'origin/ys_collapse_sidebar' into ys_search 2020-03-28 22:07:56 +01:00
YuSanka
8b0ae2ce18 Implemented Search on Plater, usint imGui 2020-03-28 19:39:24 +01:00
bubnikv
7f866ee9e8 Merge remote-tracking branch 'remotes/origin/et_slope_shader' 2020-03-25 16:09:04 +01:00
enricoturri1966
78a0893d6a Fixed conflicts after merge with master 2020-03-25 14:41:47 +01:00
YuSanka
c5df518e9e Merge remote-tracking branch 'origin/master' into ys_search 2020-03-25 11:20:34 +01:00
YuSanka
007c65dcc4 Merge remote-tracking branch 'origin/ys_fix_cb_selection' 2020-03-25 11:12:37 +01:00
enricoturri1966
16e1cd5d19 ENABLE_THUMBNAIL_GENERATOR set as default 2020-03-25 10:15:02 +01:00
Lukas Matena
ac501bdf8b Merge branch 'master' into dev 2020-03-24 21:51:05 +01:00
YuSanka
dd29817ef9 Fix of #3889 2020-03-23 22:47:35 +01:00
YuSanka
b8692d1dfd Removed SearchCombobox from the Sidebar.
Tab->SearchCombobox works with all parameters now.
Overridden GetWindow() for PointCtrl.
2020-03-23 10:28:28 +01:00
YuSanka
d81c8985b2 Merge remote-tracking branch 'origin/master' into ys_search 2020-03-20 14:56:05 +01:00
YuSanka
155ec1daec Update of Settings in ObjectList from Tab::update() is suppressed, if Undo/Redo is not completed 2020-03-20 13:45:37 +01:00
YuSanka
86157744cd Start to implement "Search through options" 2020-03-20 10:30:55 +01:00
enricoturri1966
2c4b61acd9 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_slope_shader 2020-03-17 07:59:10 +01:00
bubnikv
84c1c019e1 Revert "#3034 - Keyboard shortcuts for 'Delete selected' and 'Delete all' commands enabled also in Preview"
It is too late before 2.2.0-final.

This reverts commit 350a85cf43.
2020-03-16 14:25:05 +01:00
enricoturri1966
1e23a9bbb0 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_slope_shader 2020-03-16 14:19:30 +01:00
enricoturri1966
ecc94a0534 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2020-03-16 13:35:15 +01:00
enricoturri1966
c665354c70 #3034 - Keyboard shortcuts for 'Delete selected' and 'Delete all' commands enabled also in Preview 2020-03-16 13:34:53 +01:00