iGoX/OrcaSlicer-bambulab
1
0
Fork 0
mirror of https://github.com/FULU-Foundation/OrcaSlicer-bambulab.git synced 2026-09-10 04:42:34 +02:00
Code Issues Packages Projects Releases Wiki Activity
12,973 Commits 4 Branches 1 Tag
43cfd4486485ebc11dec4d01f321f8d760e82aa2
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
YuSanka 43cfd44864 Fixed export/import from/to amf and 3mf file. 2020-06-08 12:25:29 +02:00
YuSanka 629584e28f Editing of the custom GCodes like ColorChange and PausePrint 2020-06-07 22:42:54 +02:00
YuSanka 9146ef2f61 Copy/Paste for the Settings and Layers in the ObjectList 2020-06-01 11:11:38 +02:00
YuSanka ba963ac404 Save a position and size of the settings dialog 
+ Added a check of the printer technology inside can_merge_to_multipart_object() => suppress merge for the SLA printing
+ clear MainFrame.cpp from unused commented code
 2020-05-28 14:38:56 +02:00
YuSanka 4b6bcd7028 Merge: Implemented merge to the separate object, when some instance is selected 2020-05-27 22:30:24 +02:00
YuSanka ee1942e4e9 Implemented merge of the objects to the one multi-part object 
+ Implemented merge of the parts to the one object. But now this function doesn't used.

+ Fixed Model::looks_like_imperial_units()
 2020-05-27 11:59:43 +02:00
YuSanka f78f5c85be MSW specific issue: Fixed scaling of the Tabs when They are in the separated dialog 2020-05-25 10:21:30 +02:00
YuSanka 7e88e20402 Fixed a bitmap getting for the case, when application was started in Light mode and then switched to the Dark 2020-05-25 09:41:19 +02:00
YuSanka c7ef1feaf0 Added missed icons for the dark mode. 
Fixed typos from the previous commit
 2020-05-22 17:05:21 +02:00
YuSanka a56bbea140 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
YuSanka db32c1f15a Changed processing of a wxEVT_SYS_COLOUR_CHANGED event. 
Only UI is updated. The application doesn't recreated now
 2020-05-21 17:29:00 +02:00
YuSanka 4348b177d6 Added processing of a wxEVT_SYS_COLOUR_CHANGED event. 
Deleted scale from ImGuiWrapper::load_svg(), because it's no needed and it makes icons bad scaled on Retina displays
 2020-05-21 14:18:57 +02:00
YuSanka 8afd273c4b Implemented "from/to imperial units conversation" for loaded objects and volumes 2020-05-20 20:07:31 +02:00
YuSanka 0b60d45cf3 Typo fix for the commit https://github.com/prusa3d/PrusaSlicer/commit/fce1943b943b7ec7dff084221d2c2125d96f771f 2020-05-19 18:23:39 +02:00
YuSanka fce1943b94 OSX specific bug fixing 2020-05-19 17:00:41 +02:00
YuSanka 504066e64b Merge remote-tracking branch 'origin/ys_imperial_unit' 2020-05-18 16:01:10 +02:00
YuSanka 5c142ccfd6 Bug fixing: 
OSX specific: 1. For slNew and slDlg settings layout modes main frame could be minimized to the ridicules size.
                 So, set size for the Plater (as a min(default) size for the wxPanel)
              2. model->Clear() invoke wxEVT_DATAVIEW_SELECTION_CHANGED. So, set prevent_list_events before this call.
              3. Added a rounding for the scale value

Fix of #4261 (for the English version was called GetValue for non-created check control)
 2020-05-18 15:59:09 +02:00
YuSanka 5c1d73682d Search: Use wxDataViewCtrl instead of wxListBox. 
Added icons as a markers of settings type
For slDlg settings layout mode added process of "Ctrl+F" shortcut
 2020-05-15 15:47:15 +02:00
YuSanka 07f419f62b Fixed a place on tool toolbar for collapse_toolbar_width in respect to its enable 2020-05-12 23:34:08 +02:00
YuSanka e7f3206250 Auto scale of the toolbars in respect to the canvas size 2020-05-12 23:07:35 +02:00
YuSanka 1b8c7c4976 Added missed include 2020-05-12 09:46:23 +02:00
YuSanka 559f9279d9 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
YuSanka 9189758992 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
YuSanka 3c996111aa Layouts: 
1. Fixed crash on OSX after change of the settings layout (PreferencesDialog should be destroyed before call of recreate_GUI)
2. Fixed dialog message during GUI recreation
3. In PreferencesDialog changed radio buttons view (under OSX they were bold)
4. slDlg mode - fixed switching between main frame and settings dialog (dialog->SetFocus() doesn't work under OSX, so we just hide it and show again)
 2020-05-07 15:37:18 +02:00
YuSanka f741872361 Fixed a can_change_view() function in respect to the new settings layouts 2020-05-07 09:14:31 +02:00
YuSanka 3f958acdf9 Added missed include for the OSX build 2020-05-06 21:29:51 +02:00
YuSanka a94c952b40 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
YuSanka d7b12c6e19 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2020-05-06 15:15:31 +02:00
YuSanka b7c122096a Merge remote-tracking branch 'origin/ys_layouts' 2020-05-06 14:44:30 +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
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
YuSanka c717b16526 Merge remote-tracking branch 'origin/master' into ys_imperial_unit 2020-04-30 09:49:15 +02:00
YuSanka bf09d8f93a Merge remote-tracking branch 'origin/master' into ys_imperial_unit 2020-04-29 19:17:20 +02:00
YuSanka 495db2ff2e Imperial units: Implemented just for the object's position and size 2020-04-29 19:10:13 +02:00
YuSanka d9c121a19c Merge remote-tracking branch 'origin/ys_search' 2020-04-29 15:36:31 +02:00
YuSanka 99d49a74d0 Merge remote-tracking branch 'origin/master' into ys_search 2020-04-29 14:56:31 +02:00
YuSanka 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
YuSanka 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
YuSanka 270e815eeb Fix to the last commit https://github.com/prusa3d/PrusaSlicer/commit/f9b3f2d45ed22dc506fa7a43cf86563b1e6710c8 2020-04-24 11:33:00 +02:00
YuSanka f9b3f2d45e Search: Code cleaning 
+ Reverted "Plater" tab to the Settings Notepad
 2020-04-24 11:01:14 +02:00
YuSanka 3ba4a2cf3d Fixed an update of the search list after the change of the print technology 2020-04-23 21:32:12 +02:00
YuSanka 1c1a7ed712 Collapse_toolbar: fixed draw items 
+ Extended toolbar
 2020-04-23 21:00:00 +02:00
YuSanka fcb85dcdc3 First implementation of the separate plater from the settings tabs 
+ Added collapse_toolbar
 2020-04-23 17:11:49 +02:00
YuSanka b447b45a3e Search: Fixed "Search" menu item under OSX 
+ deleted search combobox
 2020-04-22 20:27:42 +02:00
YuSanka 07411e795c Search: Implemented SearchDialog. 
Search window on Plater: set flag SelectAll for search line
 2020-04-22 15:46:23 +02:00
YuSanka 9bc96bf28e Removed "Support materials" item from "Add Settings" context menu for the Layer ranges 
Related to #3060 and #4100
 2020-04-21 12:42:52 +02:00
YuSanka 83782e59b6 Search: Implemented "Option type" checkbox for imGui window on Plater 
+ code refactoring
 2020-04-20 21:54:46 +02:00
YuSanka 3b88dc2688 Search: Implemented cursor movement inside SearchWindow on Plater 2020-04-20 17:37:03 +02:00
YuSanka b5fcc23460 ConfigWizard: fixed first column name on SLA Material page 2020-04-20 08:09:19 +02:00
YuSanka 6a8d0c5d84 Search: Experiment button 2020-04-16 15:49:40 +02:00
YuSanka ae51f280b8 Merge remote-tracking branch 'origin/master' into ys_search 2020-04-16 11:46:29 +02:00
YuSanka 287e50d091 Localization: Fix of #4035 
+ Added context for "Advanced" ("Mode")
+ Updated POT
 2020-04-16 11:36:41 +02:00
YuSanka b69dfd63ca Completed a search list cleaning (deleted unused options). 
+ Implemented BlinkingBitmap
+ Options, that doesn't have related controls, are highlighted near the widgets.
 2020-04-16 09:59:12 +02:00
YuSanka 45147d887b 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 167f7cf5de 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 218abacb75 Search: Set focus on search line in popup control on Plater 2020-04-08 21:03:58 +02:00
YuSanka 8ab7956c26 Search: Added shortkey Ctrl+F on Plater 2020-04-08 09:47:33 +02:00
YuSanka 05f4b7aa60 Search: Code cleaning 2020-04-07 20:34:09 +02:00
YuSanka dcdafb6208 Implemented OnMouseMove and OnMouseClick for PopupSearchList 2020-04-07 19:09:33 +02:00
YuSanka cd13356b6d Code cleaning 2020-04-07 16:22:03 +02:00
YuSanka 752083cbe6 Implemented blinking icon to highlight a searched field 2020-04-07 12:09:58 +02:00
YuSanka ce2e53dbfa Added control of "Invalid numeric input" for the PointCtrl 2020-04-05 23:18:22 +02:00
YuSanka 2317437ede Next Experiment 2020-04-05 22:11:45 +02:00
YuSanka b81c774ee5 Fixed build on OSX 2020-04-05 13:20:27 +02:00
YuSanka 17bd52342b Next experiments with search on Tabs 2020-04-04 19:25:57 +02:00
YuSanka 6faae0aa12 + Fixed clear_marked_string() 2020-04-03 14:29:57 +02:00
YuSanka c8cf11b11b Added missed destroy for search_line 2020-04-03 12:51:20 +02:00
YuSanka 2a9190c27d Merge remote-tracking branch 'origin/master' into ys_search 2020-04-03 10:48:54 +02:00
YuSanka 5ca6b9f8d0 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 5f31d9ed41 Merge remote-tracking branch 'origin/master' into ys_search 2020-04-01 20:23:34 +02:00
YuSanka 815989d488 The print bed is limited to 1.2m x 1.2m. (related to #2877) 2020-04-01 19:01:38 +02:00
YuSanka 67c55c7490 Added code for deactivating of search toolbar item 
+ invalidated its unused callbacks.

 + ImGui::Selectable function is copied to InGuiWrapper.cpp and a little beat modified to change a label text, when item is hovered
 2020-04-01 15:28:07 +02:00
YuSanka 042880ba2d Search: Implemented highlighting of a letters from the search string 2020-04-01 09:07:33 +02:00
YuSanka abad9133eb Added new icon for "collapse sidebar" 
+ The tooltip for a "Collapse" button is updated according to the collapse state
 2020-03-30 11:53:58 +02:00
YuSanka ab02d344e4 Activated "collapsed sidebar" button 2020-03-29 20:52:14 +02:00
YuSanka d317f0753a Merge remote-tracking branch 'origin/master' into ys_search 2020-03-29 20:21:00 +02:00
YuSanka 7236abe473 Merge remote-tracking branch 'origin/ys_collapse_sidebar' into ys_search 2020-03-28 22:07:56 +01:00
YuSanka 14703fe561 Implemented Search on Plater, usint imGui 2020-03-28 19:39:24 +01:00
YuSanka 4ab83af9e4 Merge remote-tracking branch 'origin/master' into ys_search 2020-03-25 15:30:09 +01:00
YuSanka 45d064d4cb Merge remote-tracking branch 'origin/master' into ys_search 2020-03-25 11:20:34 +01:00
YuSanka de06c5d659 Merge remote-tracking branch 'origin/ys_fix_cb_selection' 2020-03-25 11:12:37 +01:00
YuSanka 1010fff8af Added fts_fuzzy_match.h borrowed from https://github.com/forrestthewoods/lib_fts 
Search impoved using lib_fts
Function for filtering by score is prepared.
 2020-03-25 10:24:43 +01:00
YuSanka 5215b2ecb2 Fix of #3889 2020-03-23 22:47:35 +01:00
YuSanka ebfaf7abb0 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 8898dd5618 Added missed icon 2020-03-20 16:10:00 +01:00
YuSanka a46a225cf1 Merge remote-tracking branch 'origin/master' into ys_search 2020-03-20 14:56:05 +01:00
YuSanka ec381c5854 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 e188893c28 Start to implement "Search through options" 2020-03-20 10:30:55 +01:00
YuSanka 7806df7664 Updated translations for PL, IT, FR, ES, DE, CZ and JA 2020-03-18 12:45:42 +01:00
YuSanka 8233a910b9 Fix of #3303 
+ Fixed wrong update of selection in object and scene, when change selection in ObjectList after editing of values in Height range modifiers.
Repro:
 1. Add 2 objects
 2. Add Height range modifiers for one of them
 3. Select range
 4. Edit some of values
 5. Select other object.

Expected behavior:
 1. Edited value is saved
 2. New object is selected in object list and on the 3D scene_selection

Real behavior:
 1. New object is selected in object list and on the 3D scene_selection
 But:
 2. Every next selection in object list has no update on the scene or "temporary" panel
 3. Selection from the scene updates selection in ObjectList
 But:
 4. Next editing of layer range and press "Enter" causes a crash
 2020-03-16 21:32:48 +01:00
YuSanka 6b31a087f7 Updated POT 2020-03-16 13:56:09 +01:00
YuSanka ea0cb4d761 Sidebar can be hidden/shown from menu "View/Collapse sidebar" 2020-03-16 12:51:55 +01:00
YuSanka 79be13438e Fixed context menu issues, related to #3802 fixed with commit (https://github.com/prusa3d/PrusaSlicer/commit/4ca03c3f8a7d0013c65197c5b93b81c95c9d72f6) 
The code which caused an impossibility to edit objects in list under OSX using mouse right click, is deleted
 2020-03-13 23:22:09 +01:00
YuSanka 0f5f0b6333 Toggled "Skirt height" option in respect to "Use unlimit skirt" option 2020-03-13 16:31:27 +01:00
YuSanka 380fffd248 Merge remote-tracking branch 'origin/master' into ys_improvements 2020-03-13 16:05:46 +01:00