740f7eabb1a61777aa376743ca754f5ef8350fb7
114 Commits
| Author | SHA1 | Message | Date | |
|---|---|---|---|---|
|
|
2375ab860a |
Merge remote-tracking branch 'upstream/main' into dev/h2d
# Conflicts: # resources/profiles/BBL.json # src/slic3r/GUI/AmsMappingPopup.cpp # src/slic3r/GUI/MediaFilePanel.cpp # src/slic3r/GUI/Plater.cpp # src/slic3r/GUI/StatusPanel.cpp |
||
|
|
ae75d8b8a5 |
ENH: update some sentences and refine ui
jira:NONE Signed-off-by: xun.zhang <xun.zhang@bambulab.com> Change-Id: Ibba2d6c880fcb810f861cf06eb7a30a512cbbacf (cherry picked from commit 5195e824814a1ee38d789f331ec86e73807d412a) |
||
|
|
d626c38ae7 |
FIX: something
Change-Id: I2923786337f97f4297b0444522c620891aa2ad90 Jira: STUDIO-9725 filament menu delete icon Jira: STUDIO-9785 StaticGroup border color Jira: STUDIO-9716 update badge icon Jira: STUDIO-9815 click printer/bed panel for combobox Jira: STUDIO-9867 label with for single noozle Jira: STUDIO-9739 ams page up/down (cherry picked from commit 1cde0b844a97f3420db4999927f05a833b92b0fb) |
||
|
|
3decb8d4af |
FIX: fix some translation and style issues
jira: STUDIO-9777 & STUDIO-9726 & STUDIO-9717 & STUDIO-9720 Change-Id: I05e6df6bb1416988a1862fc589058241d5344a58 (cherry picked from commit d833ab7d48729b527748662872df1ec33567b5ab) |
||
|
|
914425e526 |
Update strings for keyboard shortcuts (#10399)
* Update strings for keyboard shortcuts |
||
|
|
9732c0b845 |
ENH: some tip logic optimize
1. Only check printablily if have explicit filament map 2. Refine some sentences jira:STUDIO-9753,STUDIO-9727 Signed-off-by: xun.zhang <xun.zhang@bambulab.com> Change-Id: I2fc3aa2276dc6f514c50ac2fcaf9509f41e778f3 (cherry picked from commit 73f92d27dab667c8893ab96e47f3832ce9d2de60) |
||
|
|
31869bfbd1 |
[Feature] Add a new feature that allow user to insert extra solid infills (#10611)
* refactor Infill rotation template * clean up comments * set default solid_infill_rotate_template to empty * Fix an issue that infill_direction solid_infill_direction not working as expected * Add Extra Solid Infill Feature Introduced a new feature to insert extra solid infills at specific layers for enhanced strength in 3D prints. * fix doc error * fix image name * support "#K" for Explicit Layer List * update wiki |
||
|
|
cbfbe80ed8 |
ENH: filament preset edit menu should not change to self
jira: new Change-Id: Ia8eb3db05f83932d2eb0b8ef2ba8014e99c8e057 (cherry picked from commit 12932832ae793b142f66e2a9c6d9a5fd819e4125) |
||
|
|
7370dead32 |
ENH: refine dual extruder related UI details
jira: new Change-Id: I63dd6278f3e7d22336482dba0f178150ebe55f1d (cherry picked from commit 73c05eee3bbcbed6fc5909db638fa4bac9a75bfc) |
||
|
|
2fe654587b |
ENH: filament actions and dual extruder filaments
Change-Id: I12a83f29c96887fc910976ac8e025c4f1508d945 (cherry picked from commit 0065ea986fc41132df43cca6704c8c98318e6b71) |
||
|
|
6ae89f7d9b |
rename 2DHoneycomb and 2DLattice to LateralHoneycomb and LateralLattice (#10423)
* rename 2DHoneycomb and 2DLattice to LateralHoneycomb and LateralLattice * more renaming |
||
|
|
1ef427f661 |
Add template metalanguage support for infill rotation template (#9996)
* Add some new non-overlapping functions for rotation surfaces/infills I can't post the entire package of changes yet, but this is just the beginning. These features do not affect the latest changes to the pattern rotation system. They are merely adding new functionality. * Added relative rotation of the infill according to the template. * Update PrintConfig.cpp * Update PrintConfig.cpp * Update PrintConfig.cpp * Add height limitation * Both sparse and solid. +one-time instructions * implementation v3 need for clean code in future * + Multiply Instructions * Add solid layers into sparse infill * Update Layer.hpp * Update PrintObject.cpp * Update Tab.cpp * Remove some bugs and increase quality * rename apply_model_direction to align_infill_direction_to_model * Change the data type of top_surface_direction and bottom_surface_direction to float so that they are consistent with other infill direction parameters. * remove top_surface_direction and bottom surface_direction options * clean code --------- Co-authored-by: SoftFever <softfeverever@gmail.com> |
||
|
|
43a84842e8 |
Disable resonance avoidance in calibration routines + Calibration Reorder (#10174)
* Disable resonance avoidance in calibration routines * Reorder Calibrations * Moved Tolerance to Handy Models |
||
|
|
c4e8b26f17 |
Dialog for Clone (#9897)
* init * update * Update CloneDialog.cpp * fix focus |
||
|
|
51d844af2c |
Top/bottom surface pattern density (#9783)
* Create top surface density option * Update tooltip * Specify what 0% top infill means * Add density for bottom layers * Discourage users from using top/bottom density incorrectly * Fix percent don't need translation * Fix incorrect indentation --------- Co-authored-by: Noisyfox <timemanager.rick@gmail.com> |
||
|
|
88fb8187d9 |
Allow specifying rotation patterns for Sparse and Solid infill (#9924)
* SPE-2405: Add Zig Zag infill that is rectilinear infill but with a consistent pattern between layers. This Zig Zag infill is inspired by the Zig Zag infill in Cura. Change-Id: I798affa99f4b5c3bd67f47643e67530fb7c3e0cb (cherry picked from commit 2808d04d5deef6f99f9618648e46f11de03efc98) * Add Cross zag and locked-zag for shoes Ported from BambuStudio * wip * sparse infill roratation template * solid_infill_rotate_template * remove rotate_solid_infill_direction * hide sparse infill rotation template for non applicable infill pattern * hide solid_infill_rotate_template for non supported solid infill patterns * update icon * support empty string for ConfigOptionFloats deserialize * fix build errors --------- Co-authored-by: Lukáš Hejl <hejl.lukas@gmail.com> |
||
|
|
7cbd0d2b74 |
Remove classic overhang speed code (#9934)
* Remove code related to classic overhang speed * Remove `overhang_degree` and `curve_degree` |
||
|
|
0010dc6bb4 |
Add 2D honeycomb infill pattern (#9483)
* Add 2D honeycomb infill pattern * Reverted change of 2D lattice infill void area estimation --------- Co-authored-by: Noisyfox <timemanager.rick@gmail.com> |
||
|
|
b8c5ddd0ee |
Fix the spelling/grammar on the original english strings (#9487)
* Fix the spelling/grammar on english strings * Fix the spelling/grammar on english strings, part 2 |
||
|
|
57a6f61349 |
Fix the spacing on the original english strings (#9596)
* Remove extra spaces between words * Remove extra spaces after punctuation * Remove extra spaces before punctuation * Always needs a space after punctuation * Always needs a space before parens * Remove trailing spaces before newline |
||
|
|
a9a6f45f08 | Merge branch 'main' into dev/support-paint-vertical | ||
|
|
5145707801 |
Add "2D Lattice" fill pattern for lightweight aircraft structures (#8293)
* Add 2D lattice infill pattern * Add state invalidation behavior for lattice infill angles * Update SurfaceFillParams methods to account for lattice infill angles --------- Co-authored-by: SoftFever <softfeverever@gmail.com> Co-authored-by: Noisyfox <timemanager.rick@gmail.com> |
||
|
|
229a826aa7 |
Enhancement: Internal Bridge angle override (#7908)
Internal Bridge angle override |
||
|
|
1c686b3c04 |
ENH: improve tree supports
1. speedup organic tree support by using parallel for intersection of bed area jira: STUDIO-8451 2. add extra wall for hybrid tree support's tall branches 3. disable circle fitting for tree support. This feature produces inconsistent circles for tree supports. 4. expose the option tree_support_branch_diameter_angle. Tree supports' strength can be improved by increasing this value. Change-Id: If3688ca895df98a77f6ca538077daf8fe94e53f1 (cherry picked from commit 7697eb3dc8f87204d28e6be9adaf55dfcdadbc74) |
||
|
|
fd3ed419c2 |
NEW: add support_object_first_layer_gap option
jira: STUDIO-6202 github: #3521 Change-Id: I6f1ce9f5312e9482c0f5bf6ac3215861c501106c (cherry picked from commit 83027d923a6e67fa0013e5d9f627283c68e996de) (cherry picked from commit 29da3bc441a194d5b83ce267fe24ebf3f3811133) |
||
|
|
7a5746b1ae |
Support threshold overlap (#6606)
* Support threshold overlap * Update tooltip |
||
|
|
7834f78c90 | Feature Ironing Inset added (#7969) | ||
|
|
07d79376d3 |
Warnings: remove empty code (#6577)
* Warnings: remove empty code |
||
|
|
2c5478ee96 |
Combined infill max layer height (optional) parameter (#6401)
* Combined infill max layer height parameter * Combine sparse infill - allow % over nozzle diameter too. * Updated defaults and tooltips * Update PrintConfig.cpp |
||
|
|
2eb1adb719 |
Reduce warnings: remove unused variables (#6499)
Removed unused variables |
||
|
|
7082e945b1 |
Revert "Fix Compile Warnings (#5963)"
This reverts commit
|
||
|
|
98a243c302 |
Drop object on the plate (#6166)
Co-authored-by: SoftFever <softfeverever@gmail.com> |
||
|
|
b83e16dbdd |
Fix Compile Warnings (#5963)
* Fix calls to depreciated wxPen constructor * Fix use of wxTimerEvent * Fix unrecognized character escape sequence * Fix signed/unsigned mismatch At least as much as possible without significantly altering parts of the application * Clean unreferenced variables * fix mistyped namespace selector * Update deprecated calls * Fix preprocessor statement * Remove empty switch statements * Change int vector used as bool to bool vector * Remove empty control statements and related unused code * Change multi character constant to string constant * Fix discarded return value json::parse was being called on the object, rather than statically like it should be. Also, the value was not being captured. * Rename ICON_SIZE def used by MultiMachine By having the definition in the header, it causes issues when other files define ICON_SIZE. By renaming it to MM_ICON_SIZE, this lessens the issue. It would probably be ideal to have the definitions in the respective .cpp that use them, but it would make it less convenient to update the values if needed in the future. * Remove unused includes * Fix linux/macOS compilation * Hide unused-function errors on non-Windows systems * Disable signed/unsigned comparison mismatch error * Remove/Disable more unused variables Still TODO: check double for loop in Print.cpp * Remove unused variable that was missed * Remove unused variables in libraries in the src folder * Apply temporary fix for subobject linkage error * Remove/Disable last set of unused variables reported by GCC * remove redundant for loop * fix misspelled ifdef check * Update message on dialog * Fix hard-coded platform specific modifier keys * Remove duplicate for loop * Disable -Wmisleading-indentation warning * disable -Wswitch warning * Remove unused local typedefs * Fix -Wunused-value * Fix pragma error on Windows from subobject linkage fix * Fix -Waddress * Fix null conversions (-Wconversion-null) --------- Co-authored-by: SoftFever <softfeverever@gmail.com> |
||
|
|
93ec1dd7ee |
Fix typos (#5998)
* Fix typos * Update translation files appropriately * Fix more 'fond's with 'found's * Fix typos * Fix duplicate message error |
||
|
|
b3fff4ffd5 | Removed the copyright and credits in the header of each file. This information is outdated and hard to update. Orca Slicer maintains the autoher info in git history so this is not necessary. | ||
|
|
246fde0426 | change handy models to 3mf fileformat | ||
|
|
4bcc109ce1 |
Add "Add Models" to plate and background context menu (#5319)
* Add "Add Model" on plate and background context menu * Fix icon usage if its not windows os * Update item name with an existed translation "Add models" |
||
|
|
46b7a2953d |
Adjustable infill wall overlap for top and bottom surfaces (#4832)
* Adjustable infill wall overlap for top and bottom surfaces * Compile error and tool tip updates |
||
|
|
c2f5660afd |
Infill direction enhancements (#5267)
* infill direction wip * rotate solid infill dir |
||
|
|
5d20ecc756 |
Redesign of all icons / UI improvements (#4368)
* Changed Most of Icons * Updated Tab Bar icons Replaced with wider and a bit bigger ones • Used a bigger toolhead for printer icon on device tab * Tab Bar • Device icon > slightly increased nozzle size * Bed Plate images • Bed plate > Lock Enabled (Dark & Light Mode) > Hover > Used brighter background color • Bed plate > Settings (Changed status) (Dark & Light Mode) > Hover > Used brighter background color * Modifiers & Notification icons • Redesigned modifier icons • Added some of notification icons * Mixed imrovements • Added Sidebar collapse button with simpler design • Sidebar Printing Preset Section > Added "Advanced" Icon with atom like design • Sidebar Printing Preset Section > Improved "Support Filament" Icon .filaments tip supports an object now • Notifications > Corrected image sizes • Notifications > Corrected icon placements * Mixed improvements • Updated warning dialog icon • added plate stats images for multiple plate slicing • added icon for info dialog * Mixed improvements • updated volumetric speed icon • improved readability of preset compare button * Mixed improvements • Updated paint height range icon • Added paint triangle icon • Added multi material paint icon for toolbar * Mixed Improvements • updated titlebar file icon as square to increase similarity with other icons • redesigned toolbaar icons for painting (support, seam, color) they are sharing same design language now • updated sidebar icons wall, top/bottom shell, seam, support • added icons for compare window. (equal, not equal, spool, undefined, node_dot,cog,support) • Added confirm button icon for search boxes for toolbar popups * Mixed Improvements • Added new icons for project page • Added a loading icon to all sliced plates stats icon while slicing process continues • Updated lock and plate setting icons for plate buttons • Added new icons for cut modifier (cut_ / cut_connector) * Mixed • Updated notification icons (notification_preferences, notification_right, notification_eject_sd, notification_documentation) • Added missing original resources from my folder * Mixed improvements • Reworked network / wifi icon • Reworked bed adhension icon • Reworked raft icon • Reworked layer height and width icons • Added new icons to replace generic / missing icons on sidebar (param_overhang, param_bridge, param_wall_surface, param_overhang_speed, param_jerk) • Updated Edit, Save, Delete, Search icons on sidebar • Used a brighter color for all icons. they are more visible now on dark mode. #949494() color has better balance between dark / light theme • Sidebar > Improved readability of Support Material icon • Sidebar > Improved readability of compare icon. again * Mixed improvements • Added height_range_modifier.svg for context menu • Edited Placeholder > Lock icons. just increased heights to match with other icons • Edited slowdown for overhangs • Edited Object sinking icon • Reworked Add copies button • Updated add button * Mixed • Updated placeholder tempeture icon • Added new image for placeholder time icon - custom-gcode_time.svg . Added new one because i dont want to mess with other time icons • Restored original file model_time.svg * Mixed improvements • Updated Sidebar > Temperature icon • Reworked image of about page * Reworked about page • Updated orca slicer logo with custom made font * Readded Optimizsed PNG files Branch has not in sync with original branch. so i added manually Original commit https://github.com/SoftFever/OrcaSlicer/pull/4294 * Mixed Improvements • Updated Sidebar > Flush volumes icon • Updated Toolbar > Emboss & Measure icon (Shifted them 1 px to fixing minor placement mistake) * About Page • Minor change on L letter on logo • Slightly changed proportions on text * Mixed • Updated Tab bar > Device icon with added a tiny pixel for presenting fan. • Updated Sidebar > Device icon with bigger toolhead. added a tiny pixel for presenting fan. it matches with tab icon now • Updated Sidebar > Overhangs icon • Added new icons for missing placeholder items. Quality, Strenght, Other, Setting Overrides, Multi Material and many others. added them to tasklist * Mixed • Added new icons for missing filament setting items. Toolchange added to tasklist • Added new icons for missing printer setting items. Toolchange, Printable Space, Extruder Clearence, Adaptive Bed Mesh, Accesory, Multi Material, Size, Position, Lift Z Enforcement * Mixed • Reworked support enforcer and blocker icons. they are much better now • Slightly changed modifier icons • Updated Object sinking icon. added a wave intead of straight line. Will try too add waves more places to improve aqua effect • Used same revert icon for lock_normal.svg to increase UI constinency. added an cube icon as badge to indicate its spesific to object. Icon used in object list • Toolbar > Popup windows > Keyboard cheet sheet icon > Updated icon. changed resolution. tried many resolution but i couldnt fix blur on icon. So added it to task list for coding side fixes • Updated Sidebar > Compare icon • Updated Sidebar > Nozzle size icon * Removed misnamed files • Removed some unnecessary files caused by misnamed on illustrator * Mixed • Updated design of Context Menu > Reinforce support and Block support again • Updated design of Toolbar > Emboss > now it shares same design language with add object. Also using 3D shape for letter presents better emboss function • Updated design of Toolbar > Color paint > Added some waves and bubbles :) • Updated design of Toolbar > Paint > Brush types • Updated design of Toolbar > Auto Orient / Lay on Surface > Moved asteriks to middle of object and added an target icon for lay on surface. I choose target because lay on surface is selective function • Updated design of Toolbar > Auto Arrange > All shapes highlighted instead of one while hovering. this makes sense because it arranges all objects. Added different shapes to increase indication of works with multiple different objects / shapes. • Updated design of Toolbar > Add Plate > Added few plates to back to make it looks like a bit smaller. its now fit better with other icons • Updated design of Sidebar > Overhang Speed > Changes snail to turtle. its much more related with ocean • Updated design of Sidebar > Prime Tower > Used a light house to present tower • Updated design of Modifiers > Height range • Updated notification and dialog type icons. Added a wave and orca to improve branding • Updated Plate icons with new auto arrange and auto orient icons • Added 2 new images for object list to support lower resolutions. objlist_support_painting and objlist_seam_painting. added this change in tasklist • Many minor fixes * Updated object list icons • Updated object list icons for painting functions * Updated object list icons • Improved readability object list icons for painting functions * Mixed • Updated design of Toolbar > Emboss > Removed 3D design because its makes it hard to identify. Used a simplified 3D effect to present emboss function • Updated design of Toolbar > Add Plate > Removed + badge because it makes design a bit complicated and second/third plate on back already presents button related with multiple plates • Updated design of Toolbar > Auto Orient & Lay on Face > Changed bed shape to a single line. Icon fits better with other designs now • Updated design of Toolbar > Variable Layer Height > Used lines to present layer instead of rectangles. Icon fits better with other designs now. Also this change will improve design consistency with height range menu item icon • Updated design of Toolbar > Split to objects / parts > Increased gap between object to increase visibility of dashed line • Reduced opacity of edit, delete preset, search icon fot reducing contrast on sidebar • Updated icon of return icon (assemble_return.svg) • Updated all lock / Unlock icons • Updated Plate name edit icons. Used same line width with other plate icons and used same icon on other edit buttons • Found new icons to redesign in svg import popup. Updated files & designs > Refresh (refresh.svg) > Mirror on X (reflection_x.svg) > Mirror on Y (reflection_y) > Dropdown Menu > Bake / Forget the File Path (burn.svg) > Dropdown Menu > Change File (open.svg) • Found new icons to redesign in create printer. Updated files & designs > step_1.svg > step_2.svg > step_2_ready.svg > step_is_ok.svg > create_success.svg * Mixed • Updated Plate icons > Lock / Unlock > icon now shows opposite state while hover • Updated Plate icons > Auto orient > Changed bed shape to 1px line. now matches with toolbar icon • Fixed some opacity related issues on edit, delete, search buttons * Mixed • Found new icons to redesign on slided object > layer slider > im_slider_delete.svg > Used red color on this to reduce accidental usage > im_gcode_custom.svg > Changed backround to turquoise. Made icon pixel perfect and now easier to identify > im_gcode_pause.svg > Changed backround to turquoise. Made icon pixel perfect and now easier to identify • Reworked all plate normal and hover colors. Their background color not changes on hover. Only border and icon changes on hover now. Now it feel more naturally • Updated design of all preferences icons • Found new icon to redesign on SVG popup window. it appears when shape has not filled path > exclamation.svg > Made icon pixel perfect and now easier to identify. used filled shape like other dialog icons. Used orange color as warning color • Changed colors of object sinking to orange because its a warning * Mixed Logo Usages • Updated icons on dialogs. i will update all icons if design approved > OrcaSlicer.svg (Used on Most dialogs) > OrcaSlicer_192px_grayscale.png (Used on file not found error. connection error etc..) Bamboo Lab Related icons • Sidebar > Filament Titlebar > AMS Filament sync (ams_fila_sync.svg) > Made pixel perfect with minor changes • Bamboo Lap Printer > Print Plate > > print-time.svg > Made pixel perfect > print-weight.svg > Made pixel perfect and used a scale which fish are weighed. Orcas need fish not ingots :) > ams_editable.svg > Made pixel perfect and used same pen icon on other edit icons > ams_editable_light.svg > Made pixel perfect and used same pen icon on other edit icons > ams_arrow > Made pixel perfect > enable_ams.svg > Made pixel perfect and used same question mark on other related icons • Added Calibration Tab icon for Bamboo Lab printer. Thanks @KrisMorr for coding fixes * Mixed • Updated design of printer_in_lan.svg • Placeholders > Quality > Improved readability • Plate Icons > Used slightly lighter color for dark theme. It improves readability of preferences and lock button while they are at active status • Titlebar > Undo / Redo > Used slightly shorter arrow. This will make difference between revert icon and presents better function 1 step forward / backward. Revert icon is much more "Put back to original place" * Mixed • Preview > Layer Slider > Custom Code Icon > Used a / instead of G letter. Its easier to read now • Preview > Layer Mode Icon > Changed background color and changed single layer icon shape * Mixed • Re exported all images with better precision • Updated design of SVG modifiers • Notifications > Corrected preferences and next button resolution • Notifications > Expand / Collapse buttons > Fixed color usages between dark/light theme • Sidebar > Parameters > Minor change on speed / initial layer speed • Sidebar > Parameters > Minor change on bridging • Plate Setting > Filament order > Arrow > Made pixel perfect • Object List > Minor changes on Paint icons • Menubar > Increased size of all icons • Tab bar > Added icon for Debug tab • Added many icons related with bamboo lab monitor > Mostly corrected their resolution made them pixel perfect. This problem caused by they created an artboard on illustrator at 0,5px then it spreads to most of other artboards. Artboards exported as 17x17 intead of 16x16 while this problem exist in project > Matched design of some icons with designed ones to improve consistency on UI but keeped designs of Bamboo Lab spesific ones > Mostly used pictures that shared by people to identify correct resolutions but need a dummy account for further testing * Mixed • Removed delete/remove/export/import related icons on Context menu • Added new icon for printer settings > Extruder > Retraction when switching material • Added new icon for filament settings > Filament > Print Temperature • Added new icon for filament settings > Filament > Bed Temperature • Added new icon for filament settings > Cooling > Cooling specific layer • Added new icon for filament settings > Cooling > Part Cooling Fan • Added new icon for filament settings > Cooling > Auxiliary part cooling fan • Added new icon for filament settings > Cooling > Exhaust Fan • Added new icon for process settings > Quality > Wall Generator • Added new icon for question dialogs and used orange color for that because it mostly used critical dialogs (preset delete etc). Just found undefined icon on placeholder list uses this and added new icon for that • Changed info dialog icon fill color to turquase. because its mostly positive information • Updated design of Sidebar > Parameters > Overhangs and Overhang Speed • Fixed warning icon usage • Added new image for placeholders > undefined. this was sharing same icon with dialogs previously * Update ObjectDataViewModel.cpp Added new color and support painting icons for object list * Added new icons for Sidebar, Filament and Printer Settings • Added new icon for Sidebar > Process > Support > Tree Supports • Updated /src/slic3r/GUI/Tab.cpp > Process > Added new / missing icons • Updated /src/slic3r/GUI/Tab.cpp > Filament Settings > Added new / missing icons • Updated /src/slic3r/GUI/Tab.cpp > Printer Settings > Added new / missing icons Compiled from source and checked all changes * Updated Placeholder icons • Added new icons to placeholders window • Updated slic3r\GUI\EditGCodeDialog.cpp • Updated slic3r\GUI\Tab.cpp • Changed copy code icon to add.svg instead of add_copy.svg • Added new icon for Placeholders > Setting overrides * Update AboutDialog.cpp • Removed "Orca slicer" string to cleanup • Removed "Based on". already writes on bottom • Changed background color of version text to transparent • Changed github link color to turquoise • Aligned link text with other texts * Compare window - Update GUI\UnsavedChangesDialog.cpp • Updated icon for undefined category. question.svg is used for dialogs and not compatible with low res. used new icon undefined.svg • Also updated process > tab icons started to show up in compare window. blank images was used for tabs in original files * Added Height Range icons on Object List / Context Menu • Added new icon for Object list > Layers > Layer • Object list > Layers > Added Hight Range icon • Context menu > Height Range icon • Object list > Layers > Replaced icons of add / delete Height range buttons * Update imconfig.h • Fixes toolbar > measure > copy to clipboard icon uses "notification_arrow_right.svg" on dark theme instead of "copy_menu_dark.svg" * Context Menu Icons • Updated \GUI\GUI_Factories.cpp • Updated icons of split sub menu • Added new icons for modifier objects submenus. load, cube, cylinder, sphere, disc, torus, text, svg • Added new icons for mirror sub menu items * Fixed wrong warning icon usage on Emboss / SVG widgets • Emboss and SVG popups uses exclamation.svg instead of obj_warning.svg . exclamation.svg used for dialogs and not supports low resolution • Updated \GUI\Gizmos\GLGizmoEmboss.cpp • Updated \GUI\Gizmos\GLGizmoSVG.cpp * Toolbar > Emboss and Cut Emboss \GUI\Gizmos\GLGizmoEmboss.cpp • Added a small gap between vertical related and horizontal related text aligment buttons • Used style dropdown and its title in same line to reduce vertical usage. This will also improves visual consistency with other dropdowns • Used operation radio buttons and its title in same line \GUI\IconManager.cpp • Fixed blurry icons > Emboss > buttons near Style dropdown menu , bold / italic buttons and Text alignment buttons \GUI\ImGuiWrapper.cpp • Changed color of active radio button to turquoise. This will also improves visual consistency * Update GLGizmoEmboss.cpp * Fixed blurry tooltip icon on toolbar popup windows • Updated icon design on hover state. It looks like its pressed now • updated show_tooltip_information function in this. Set icon size as 30x22 intead of relative to font size and removed padding on icons \GUI\Gizmos\GLGizmoCut.cpp \GUI\Gizmos\GLGizmoFdmSupports.cpp \GUI\Gizmos\GLGizmoMeasure.cpp \GUI\Gizmos\GLGizmoMmuSegmentation.cpp \GUI\Gizmos\GLGizmoSeam.cpp \GUI\GLCanvas3D.cpp * Mixed Painting Tool / Brush icons • Made Dark mode icons a bit more darker \GUI\Gizmos\GLGizmoSeam.cpp \GUI\Gizmos\GLGizmoMmuSegmentation.cpp \GUI\Gizmos\GLGizmoFdmSupports.cpp • Updated button shapes of brush type icons (used square shape with more radius) • Updated margin between brush type buttons • Updated paddings of brush type buttons • Updated border color of brush type icons • Used brush / tool buttons bigger to make them easier to select • Fixed icons not uses colors on SVG files while using Light theme \GUI\Gizmos\GLGizmoMmuSegmentation.cpp • Fixed green border color on selected filament. now uses orca color • Used radio buttons for free / vertical / horizontal. Works better for options, reduces vertical height, Easier to understand \imgui\imgui_widgets.cpp > ImGui::ColorButton • Updated function for making sure drawing pixel perfect rectangles. It draws filament colors / borders on color painting gizmo \GUI\Gizmos\GLGizmoSeam.cpp • Used radio buttons for free / vertical / horizontal. Works better for options, reduces vertical height, Easier to understand \GUI\Gizmos\GLGizmoPainterBase.hpp • Added m_free_only variable for new radio buttons \GUI\ImGuiWrapper.cpp • Added darker and lighter versions of orca color as variable • Updated push_confirm_button_style for replacing BBS colors • Slightly reduced horizontal window padding for gizmos \GUI\IMSlider.cpp • Slice > Layer and move slider text is now using turquoise color • Fixed wrong resolution on some states of layer mode icon \GUI\Gizmos\GLGizmoSimplify.cpp • Object > Simplify model > Detail level slider is now using orca color • Object > Simplify model > Hover state of apply button is now using orca color \GUI\GLCanvas3D.cpp • Sliced Plates Toolbar > All Plate Stats > Changed color of "All plate stats" text to orca • Sliced Plates Toolbar > Changed button border color to Orca • Sliced Plates Toolbar > Changed position of plate number text to closer to edges so it will not overlaps with thumbnails * Mixed - Titlebar & Tabs & Search box \GUI\BBLTopbar.cpp > Titlebar • Updated icon background colors while hover / active states • Used same color on border and fill color for more modern look \GUI\Widgets\TabCtrl.cpp > Tabs on parameters / filament & machine window • Updated line color under selected tab to orca color \GUI\Tab.cpp • Fixed > Sidebar > Global > Delete button visible while using search box • Fixed > Sidebar > Global > Revert button visible while using search box • Tabs > Disabled using bold font for active tab. Advantages; tabs always stays at same position, makes switching between tabs a bit faster * \GUI\GUI_App.cpp > Splash Logo * Reworked Emboss Gizmo Reworked Icons • Simplified them as much as possible to give modernish look Reworked layout • Moved style to top. Fitted to window width. Used title and imput box on same line to reduce window height • Used height and depth at same line. Used icons for Height and Depth text to save some place • Moved alignment to top and used at same line with bold / italic icons • Used operation and its radio buttons on same line to recude window height • Made many changes how it scales on different languages Improvements • Surface related values only visible if embos used as modifier • Reworked stepper buttons. Looks more modern now • Reworked advanced expansion. Simplified and removed text • Hidden surface related settings if there is no relations with objects to save some vertical space UI consistency improvements • Used text > revert > input order for components line on sidebar • Revert icon and title used orange color if values edited like on sidebar • Used orca color on sliders, radio buttons • Removed border and other decorations on edit buttons of sliders Fixes • Moved warning icon a bit up to prevent overlapping with text preview box border Effects on other all widgets • Updated selected text background to orca color * Mixed Overall • All gizmos uses same paddings now. it will improve consistency between them. All uses padding value from push_toolbar_style Combobox • Removed paddings from combo box menu • Fixed frame background highlighting on hover • Used border for highlighting menu items instead of background color Combo Box with Filter • Now its shares very similar code with normal combo box. Used ImGui:ButtonBehavior in it to get hover effects properly • Added support for border highlighting on hover • Used border for highlighting menu items instead of background color Combo boxes • Made easier to manage styles for combo boxes Input box with step controls • Added support for border highlighting on hover or active Sliders • Added support for border highlighting on hover or active • Used fully rounded grab and frame. now it looks much more like slider Checkboxes • Made them a bit smaller. Old one is looks like giant and not matches with sidebar style • Updated hover effect to match with other components • Updated icons of checkboxes to match style Radio Buttons • Made them a bit smaller. Old one is looks like giant and not matches with sidebar style Gizmo > Painting tools • Updated all sliders with new one to improve UI consistency • Calculated slider start offset from maximum width of title of sliders to solve window width change between tool changes Gizmo > Simplify • Updated code for new radio buttons Gizmo > Measure • Used selection values with multiline. Window size highly reduced with this layout • Moved restart selection to bottom. like on other gizmos mostly at bottom. this will also reduce vertical spacing • Aligned measure type texts vertically to "copy to clipboard" button • Updated style of copy to clipboard button • Updated dimension value edit box on viewport. Values are much more readable now Color Fixes • Viewport > Plate Name / Number text colors > Updated them to orca color Icons • Updated keyboard cheat sheet icon on gizmos * Titlebar Remove icon from File and Dropdown menu * Sidebar and UI component improvements New Feature • Sidebar > Delete filament button only visible only if there is multi filaments Sidebar • Corrected most of aligment and spacing related problems. all icons has equal space between them and all elements has equal margin to frame • Updated style of Global/objects toggle to match style • Updated style of Advanced toggle. Updated SwitchButton.cpp and its not using vector images now • All combo boxes uses same height now • Slightly reduced vertical spaces on printer and filament sections. more vertical space for process section available now • Process > Global > Search Bar > added search icon UI component style updates • Updated style of most of UI components. All uses 4px corner rounding instead fully rounded • Updated some of old wxButtons with new buttons. still need too much work Added new icons for • param_default-pattern > Used for Support > Base Pattern Fixes • Converted these to step boxes ---- Sidebar > Support > Advanced > Top interface layers > this should not use drop down ---- Sidebar > Support > Advanced > Bottom interface layers > this should not use drop down Color Fixes • Dropdown focus / hold background color • Disabled element background color * Add missing side text for parameters * Gizmo Improvements All Gizmos • Updated button styles on all gizmos Arrange gizmo • Updated slider style Cut gizmo • Removed hexagon shapes for upper / lower part. Used colored text instead • Matched style of mode combo box Move & Rotate gizmo • Removed World axis text like on scale gizmo to reduce window size Variable Layer Height • Moved adaptive and smooth buttons to bottom • Changed name of smooth to smooth radius to improve relation with slider • Updated sliders style • Fixed gizmo not closing when other toolbar buttons clicked Assemble view • Updated slider and button styles • Used Assembly info window with vertical layout to reduce its size. This will also prevents overlapping with slider bar Mesh Boolean • Added new icons • Updated style of elements * Fix conflict * Update splash screen * Updated About Page * Mixed Sidebar • Updated style of Object list search bar • Updated Search list item background hover color Keyboard shortcuts window • Changed active tab color to orca color Color fixes • Disabled text color for UI components • "Slice" button disabled background and foreground color UI Component Styles • Matched style of more buttons --Progress dialog --Release Notes window * Update Toolbar icons * Update style of single choose dialog * Gizmo Improvements Cut Gizmo • Matched elements order with sidebar. Title > Revert button > Controller • Moved "Cut to Parts" checkbox to same line with "After Cut". This reduces vertical height and seems logical • Used slider for cut height controller • Used regular text color for build volume, groove, connector • Revert buttons only visible if value changed like on other UI sections • Removed shapes for "Upper Part" and "Lower Part". Used colored text instead • Matched radio button styles • Matched slider styles • Moved "Add Connector" and "Reset Cut" buttons to bottom to reduce vertical height • Connectors > Used icons for shapes • Connectors > Used regular button for "Remove connectors" • Connectors > Used radio buttons for connector style instead combo box SVG Gizmo • Matched elements order with sidebar. Title > Revert button > Controller • Slightly decreased preview size • Used Combo box for filename related dropdown • Surface related features will not show if there is no surface relation • Matched radio button styles • Matched slider styles Gizmos Combo Box • Fixed rendered with wrong width • Fixed drowpdown menu paddings * fix build with gcc13 Fix compilation error produced by GCC 13: /home/dbuzdyk/packages/3d/OrcaSlicer/src/slic3r/GUI/Gizmos/GLGizmoMeshBoolean.cpp:306: error: no match for call to ‘(Slic3r::GUI::GLGizmoMeshBoolean::on_render_input_window(float, float, float)::<lambda(wchar_t, bool, ImVec2, ImVec2, std::string&)>) (const wchar_t&, bool, ImVec2&, ImVec2&, std::string)’ 306 | if (tab_button( | ~~~~~~~~~~~~~~~ 307 | m_is_dark_mode ? ImGui::MeshBooleanUnionDark : ImGui::MeshBooleanUnion, | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 308 | m_operation_mode == MeshBooleanOperation::Union, | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 309 | tab_size, | ~~~~~~~~~ 310 | tab_padding, | ~~~~~~~~~~~~ 311 | _u8L("Union") | ~~~~~~~~~~~~~ 312 | )){ | /home/dbuzdyk/packages/3d/OrcaSlicer/src/slic3r/GUI/Gizmos/GLGizmoMeshBoolean.cpp:214: note: candidate: ‘Slic3r::GUI::GLGizmoMeshBoolean::on_render_input_window(float, float, float)::<lambda(wchar_t, bool, ImVec2, ImVec2, std::string&)>’ (near match) 214 | auto tab_button = [this](const wchar_t icon, bool selected, ImVec2 size, ImVec2 tab_padding, std::string& tooltip) { | /home/dbuzdyk/packages/3d/OrcaSlicer/src/slic3r/GUI/Gizmos/GLGizmoMeshBoolean.cpp:214: note: conversion of argument 5 would be ill-formed: In file included from /home/dbuzdyk/packages/3d/OrcaSlicer/src/slic3r/GUI/Gizmos/GLGizmoBase.hpp:11, from /home/dbuzdyk/packages/3d/OrcaSlicer/src/slic3r/GUI/Gizmos/GLGizmoMeshBoolean.hpp:4: /home/dbuzdyk/packages/3d/OrcaSlicer/src/slic3r/GUI/I18N.hpp:7:54: error: cannot bind non-const lvalue reference of type ‘std::string&’ {aka ‘std::__cxx11::basic_string<char>&’} to an rvalue of type ‘std::string’ {aka ‘std::__cxx11::basic_string<char>’} 7 | #define _u8L(s) Slic3r::GUI::I18N::translate_utf8((s)) | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~ /home/dbuzdyk/packages/3d/OrcaSlicer/src/slic3r/GUI/Gizmos/GLGizmoMeshBoolean.cpp:311: note: in expansion of macro ‘_u8L’ 311 | _u8L("Union") | * revert some icon changes * Add back missing menu icons --------- Co-authored-by: SoftFever <softfeverever@gmail.com> Co-authored-by: Dima Buzdyk <dima.buzdyk@gmail.com> |
||
|
|
6d19e2d29c |
Reload All and Project Path (#4903)
* Reload All and Project Path * Revert Reload All logic to original --------- Co-authored-by: SoftFever <softfeverever@gmail.com> |
||
|
|
1bb8fad63f |
Merge some changes from BS 1.9 (#4994)
* FIX: do not touch the plate with different printing sequence jira: STUDIO-5424 Change-Id: I8ad00fa991b753de126a5bef0d320c452033e2e7 (cherry picked from commit c4adfe16e285f238f2c5cd8938b2167fdfb6b1b0) * FIX: global arrange setting is wrong global arrange setting is wrong if a plate's setting is changed from object list jira: STUDIO-5438 Change-Id: Iaa7f35837edbacff9b97ca17a8ab34c8e6bb023d (cherry picked from commit fa2f56575b2e4305e35dd59ff55e0881720de025) * FIX: temperature symbols not shown correctly Need to use wxString::FromUTF8 to convert unicode symbols to wxString. jira: none Change-Id: Ia8b559d437c956a2cc28916d8963823356402d05 * FIX:Repair calculation process of plate_box Jira: STUDIO-5520 Change-Id: I4c3f9597542ad2dfec4d7849e75fa28272fa4ea3 * FIX:frequent calls to _update_imgui_select_plate_toolbar Jira: STUDIO-5488 Change-Id: I12e6f37c2fe94de004aa6da43421970d6df10f0f * FIX: & is not displayed on the sending print page Jira: STUDIO-5343 Signed-off-by: wenjie.guo <wenjie.guo@bambulab.com> Change-Id: I1736bb97433581ff117bfe09afe8ee70c1b08fc4 * FIX: file name is not fully displayed if it is too long Jira: STUDIO-5230 Signed-off-by: wenjie.guo <wenjie.guo@bambulab.com> Change-Id: I992fa0c0575afbd2eecb2af02c8a305eda028f7f (cherry picked from commit d0d7fb0b1394429ee9d28d8ef4060a286ba0112d) * FIX: The warning box still exits when the temperature has reset. Jira: STUDIO-5562 Signed-off-by: wenjie.guo <wenjie.guo@bambulab.com> Change-Id: I7532db69880449eb3fa0a14fc4dfc61e7f6d518e (cherry picked from commit 589ed5fe045b5e7ec3effe437c9685085960c0fc) * FIX: White circle is not clear on auto refill page Jira: STUDIO-3262 Signed-off-by: wenjie.guo <wenjie.guo@bambulab.com> Change-Id: I05ac6257638063d32a9943c09bb7c14cc9229b3a * FIX: Groove text ctrl is not wide engough Jira: STUDIO-5434 Signed-off-by: wenjie.guo <wenjie.guo@bambulab.com> Change-Id: I93c0995473a72b5c19bc413c38c090906e360455 (cherry picked from commit e4a8b0ef5e62ba0053dc782c30ea79b237a46ac3) * FIX: values are not saved when clicking on an empty space Jira: STUDIO-4637 Signed-off-by: wenjie.guo <wenjie.guo@bambulab.com> Change-Id: I837050029635f673b3ae671ea1ad049aaf4fdd16 * FIX: Temperature warning is not fully displayed Jira: STUDIO-5038 Signed-off-by: wenjie.guo <wenjie.guo@bambulab.com> Change-Id: I460cbe2a5d0a092c4257b7bd5192058bf2e4707b * NEW: display bitmap when calibrating Jira: STUDIO-4661 Signed-off-by: wenjie.guo <wenjie.guo@bambulab.com> Change-Id: I60cf4f9769feca74699012418880e93fcfe34432 (cherry picked from commit 1213aea816694405311dc0c1061655a4c2a1d067) * FIX: remember the flow ratio calibration type Jira: STUDIO-5181 Signed-off-by: wenjie.guo <wenjie.guo@bambulab.com> Change-Id: Id6125d1d4ea58972ce55c2c2498259596b25111e (cherry picked from commit 1af1038fd4824d989e992cb630cf34e00c787af7) * FIX: File panel crash on scroll Change-Id: I56833a376fa52c960efea5fbd60003367ba410c2 Jira: STUDIO-5337, STUDIO-5513 * FIX: auto arranging skip unprintable high items Jira: STUDIO-5646 Change-Id: I72dc3d8c71a075bab8204f4418e869a7a34c0c8e (cherry picked from commit 0afdf8361493485da2254c426719594fd9a982ed) * FIX: MediaFilePanel error state Change-Id: I318ef59fb97478ffee16dff594022b2b9029964a Jira: STUDIO-5638 * FIX: sync whole preset vendor directory Change-Id: I191dbe979a87ff35d38cab1149b7975664344838 Jira: STUDIO-5534 * ENH: support turn off liveview auto retry Change-Id: I24b39f74e0a40a13277d6eae3830c95c5c9de333 Jira: none (cherry picked from commit f6ceb3fb8e4df3f876c50a1c4ba96b4a1be60190) * FIX: SwitchButton auto scale font Change-Id: If4004c0963cc8bb2f41e8e71c304d5239bf252ab Jira: STUDIO-4969 STUDIO-4921 * FIX: set WEBKIT_DISABLE_COMPOSITING_MODE=1 for linux gtk Change-Id: I8a500585ca815948bab1210578ba5c45858ed78e Jira: STUDIO-5199 * FIX: Prefer old selection when sync AMS not compatible Change-Id: I6b18db51887132a997cf78d70fff9a92e23bc44a Jira: STUDIO-5416 * ENH: show liveview stat Change-Id: I70d1f458aa2ed379ad7fe07dee76fbe035316420 Jira: none * NEW:remember custom color Jira: STUDIO-5635 Change-Id: I439080f6a8ddb6fde3899cffbabc3b6e66afbd96 * FIX: copy live555 dll Change-Id: Idf727b8e26107e93aa9934299e87dc71531d1c63 Jira: STUDIO-4480 * FIX: optimize batch update object list on macOS Change-Id: I92e24cc53c0b3bf0658d15abc64292f0e17c0a82 Jira: STUDIO-5440 STUDIO-5515 * FIX: network plugins tip disappear on dark mode Change-Id: I422ab63f71158a49920438f01dd9c39774c27744 Jira: STUDIO-4891 * FIX: Display inconsistence in parameter table JIra: STUDIO-3716 Signed-off-by: wenjie.guo <wenjie.guo@bambulab.com> Change-Id: I986473bcbb3efff4abd9c5917926d9e888a4f28c * FIX: Incomplete copy display in Transfer or discard dialog Jira: 5569 5549 Change-Id: I757b636259d7e1a222b9fc09276c12235360fd57 * FIX: Limit the max length of k when calibrating Jira: STUDIO-4291 Signed-off-by: wenjie.guo <wenjie.guo@bambulab.com> Change-Id: Ie7cff086cf2a3c744213525d5d83f9ac4b55333d * fix build break * FIX: delete sdcard file crash Change-Id: I814fd4b557fa92ac4060cbeb18a53f5616e49662 Jira: STUDIO-5977 * FIX: Yield when join media thread Change-Id: I746d7df88a0de8363da7d9507cb63c9e0ffe970a Jira: STUDIO-5952 * FIX: Guide page can't show in screen with mainframe Jira: STUDIO-4911 Change-Id: I7e89614e0f1585263456c847a1b38dcfd0ad59e6 * FIX: filament combox has blank line Change-Id: Ia39ddb564b3c9cc943d0ea4c0cf7cc4d24bef799 * FIX: load 3mf crash when studio has no base filament Jira: none Change-Id: I4387f425f60e6a53a53cf68addb1ab2d6f8f8901 Signed-off-by: maosheng.wei <maosheng.wei@bambulab.com> * FIX:add resume button JIRA |
||
|
|
ec8d91e14f |
Display filament labels in "change filament" context menus (#4921)
* ENH: display filament labels in "change filament" context menus |
||
|
|
d1eea4c677 |
Add a new handy model: Orca string hell (#3892)
* add string hell * tweak message |
||
|
|
3cb573dcb9 |
Feature/merge 1.8.4 (#3827)
* FIX: the logic of buried points that were not buried JIRA: none Signed-off-by: Kunlong Ma <kunlong.ma@bambulab.com> Change-Id: Id95174659c5fce7feba409eb5e14916608745fa4 * ci: update network module based on commit bc7ca98 Change-Id: I923526f0bf9ce5a288144fa1f9b0f2fc640f41b7 * Fix Firefox Co-authored-by: hadess <hadess@hadess.net> * FIX: cali: custom created filament from AMS displayed as incompatible jira: new remove the condition: is_system Change-Id: Ib1366966bbdbe01bc9e2483d9914d270ebefa976 * FIX: duplicated items in comboBox at calibration completed page jira: new Change-Id: I4749a2206df16c438e0d3098e36274b2a20f313e * ENH:update support for P1S plus jira:[for p1s plus] Change-Id: Id577d4e94e2162cb0045d261dfaa5f396ecded2f * ENH: CLI: add mk information support JIRA: no jira Change-Id: Idd89b143d439de50d9f52eb8aec95b262d66875d * ENH:calibration support p1p plus jira:[plus] Change-Id: Ia290d3a8a8b9adaac7a6ee26d9a8b5ea0c1b3aee * FIX: add log for base_id and filament_id github: #3087 Change-Id: Iebfbd0f224fce49f33fc81c71e6108f6e3abb5ff * FIX: sync whole preset vendor directory Change-Id: I191dbe979a87ff35d38cab1149b7975664344838 Jira: STUDIO-5534 (cherry picked from commit 628866608116336453804aa1217dd55db04d47ad) * FIX: use t_utc for debug only Change-Id: Ia05d8969d4de3dd38908980d6e17a3ebb11ca279 Github 3045 Change-Id: I77935df53bbf2772b1146e5c330c537165a3a2e6 * FIX:make sort_volumes right Jira: STUDIO-5645 Change-Id: If324c9115bfaaf0c1b7b4be7c7ee96ba6b8ac890 * ENH:keep an unload logic jira:[for unload] Change-Id: Id30ec71ffa5b2dac89346ea47ca48a62479e3ab1 * FIX: several problems with mesh boolean 1. Cut with multiple volumes are OK now. 2. Close mesh boolean fail error with new object or open object 3. Fix wrong name and config of boolean resulting object github: #3118 jira: none Change-Id: If2c9dbfb36cbdfe4917a2371217923891bb7909c (cherry picked from commit 982c0ecb92cf7c2b5ae5972ab900a6b10e7dda50) * NEW:limit the length of project name jira:[project name] Change-Id: I955620f7073b3b7fda280d1118524f561d047751 * ENH:adjusting the warning level of timelpase jira:[STUDIO-5662] Change-Id: I4902b22d316f5e09a97a62c88b8a98e55c405434 * FIX: 3mf specification: change namespace form slic3rpe to BambuStudio Jira: XXXX Change-Id: Id705affc875ef23fdf2ac6d79f0cb0aafc4f7050 * NEW: Open MakerWorld With BambuStudio GetParam JIRA: none Change-Id: I0d65b364f1cd2d634a88882ab072c3e61ea89167 (cherry picked from commit 8eaf45e5359439a7c796fd79876c86775abcf48e) * FIX: Filament issue generated when creating a printer Jira: XXXX Change-Id: I976770b69b47641bd54aa7a9c56fba7f58d1ab68 (cherry picked from commit ba42188b93c58b3954234d72acdd9769a68e3d3c) * FIX: Blank page appears when editing presets Jira: 5563 Change-Id: I4c49e05515b1beff55991e92f8079c4499c27eab (cherry picked from commit e86517d290f4cd0765a230d811b0ddf2c9f34c17) * FIX: context menu didn't update UI jira: STUDIO-5691 Change-Id: Ia66b8623d832eba805aff5320941233a68ff258b * FIX: crash of "filling bed" "get_arrange_settings() const" gets trapped in infinite recursive calling. Now we delete this function. jira: STUDIO-5688 Change-Id: Ia39974734bb37b2a2f06b5bf78185f01be726872 * FIX: boolean hangs in the middle of color painting Can't do splits in combine_mesh_fff, as do_boolean of mcut will split meshes. jira: STUDIO-5693 Change-Id: Idddb7d20dd7ca386c39ddd3d87d9defc3136aa5d (cherry picked from commit 6c67d015941458e37faaf0015b6509b5a0eadc0e) * Fix: Fix a number of compilation problems issues found when using gcc version 13.2.0 (GCC) in a Flatpak sandbox github : https://github.com/bambulab/BambuStudio/issues/3074 github pull request: https://github.com/bambulab/BambuStudio/pull/3096 Change-Id: I08aeac593eb1ce7675894df72e8489200bae713d (cherry picked from commit 069d133d66bfa682de4a860e379d5dc16b3d907c) * fix: macos icns issue when icon was not attached github pull request:https://github.com/bambulab/BambuStudio/pull/3116 Change-Id: I49072ad49f3af7669a6d307c791594ade210da50 (cherry picked from commit c977e5582e3a30ad16dd267810037423aad9a53c) * FIX: Add flush_length for change_filament_gcode Change-Id: I30f4b97d3d61c2a57f0e92f157cbd31c38aa7265 Jira: XXXX (cherry picked from commit 92eb2bac977a0c4095b316cbbc6580fb5228b710) * FIX: edit preset dialog can't close on mac Jira: 5696 Change-Id: Ib33dfd07cc588ddd3805e3490a4d8c36dcd890ac * ENH: add dev_ota_version in ssdp JIRA: STUDIO-5740 Change-Id: Ic80e6d4b9bf82813fdc4a76604a3d36213d12b03 Signed-off-by: Stone Li <stone.li@bambulab.com> * NEW:Adapt to multicolour and gradient colour JIRA:xxxx Change-Id: I8084cab603d5681cbcaf2d6f5e0d7ad5419cb2af * NEW:Adaptation of semi transparent materials JIRA: XXXX Change-Id: Ie32d8ce67c37b85eb6d7d6594cb514a696307e68 * FIX: disable flush options if prime tower is unchecked jira: STUDIO-5639 Change-Id: I25081584d430bc7d062e14bcc2cdbf7522cf9d99 * ENH: refine GetVersion for HMS query JIRA: STUDIO-5763 Change-Id: Ia3ccc07d79cc0736eb12e9782da50211abb74772 Signed-off-by: Stone Li <stone.li@bambulab.com> * FIX: Prefer old selection when sync AMS not compatible Change-Id: I6b18db51887132a997cf78d70fff9a92e23bc44a Jira: STUDIO-5416 (cherry picked from commit 077fae29823cf4f3071d408b1b40f55ee0cb33c6) * FIX: The flushing was not auto-calc when sync ams list JIRA: STUDIO-5551 1. flushing volume auto-calc when sync ams list 2. flushing volume takes the larger calculation value when filament has multi-colors Signed-off-by: Kunlong Ma <kunlong.ma@bambulab.com> Change-Id: I72e6f9780ea56103a44c2da6068440a4615c254d * FIX:fixed invalid links jira:[fixed link] Change-Id: I036a38b6e8e94da762f93805bd7be706538771fe * FIX: Prompt to delete problematic presets Jira: XXXX Change-Id: Ic43f7bb782794d7ab0b6acbffbb5d73e94f6ed73 * FIX:fixed incorrect HMS content jira:[STUDIO-5818] Change-Id: Ia2896d6f0ab1ffedbc850e54168acece8e47bdbb * FIX:external transparent material display error JIRA: STUDIO-5845 Change-Id: I0a4f05ac5d5c0ac49d85a704ee65a7221c5f1e1d * FIX: [5846] Custom Filament Page show System Filament Simultaneously solve: When downloading Preset from the cloud, the filament_id of the preset in m_preset is null. Jira: 5846 Change-Id: I6ba1b46fe92e345614b6a4af3fffa87d81fa2456 * FIX:A1 and p1 series do not support custom materials JIRA:XXXX Change-Id: Ib0459273d1f9a7152a5563757204634a8d0cd6f5 * FIX: exception when comparing profiles jira:[NEW] Signed-off-by: XunZhangBambu <xun.zhang@bambulab.com> Change-Id: I946b5fcd35f779d271df2b3de731fdcada5aab29 (cherry picked from commit 00e739570812e5c4be3e0f7702ce8c72c0f9e72b) * FIX: hide_id_middle_string Change-Id: I28f32ec526b443d31d7992971b80ab1cb737deb6 Github: STUDIO-5825 * ENH: modify some logs level JIRA: STUDIO-5958 Change-Id: I5a8592dfb8ffa9a81952535cb30944f867aa0e22 Signed-off-by: Stone Li <stone.li@bambulab.com> * NEW:build plate marker detect Change-Id: I70f03efea688bb6ce71c3f5990bb3c50605ab184 * FIX: Studio UI Freeze when saving user preset github: #3335 Change-Id: Idaf53f673a3e46408826c06bdde2c592395d358b * update bbl plugin version * fix build errors * update bbl profiles * update color --------- Signed-off-by: Kunlong Ma <kunlong.ma@bambulab.com> Signed-off-by: Stone Li <stone.li@bambulab.com> Co-authored-by: Kunlong Ma <kunlong.ma@bambulab.com> Co-authored-by: gerrit <gerrit@bambulab.com> Co-authored-by: liz.li <liz.li@bambulab.com> Co-authored-by: tao wang <tao.wang@bambulab.com> Co-authored-by: lane.wei <lane.wei@bambulab.com> Co-authored-by: maosheng.wei <maosheng.wei@bambulab.com> Co-authored-by: chunmao.guo <chunmao.guo@bambulab.com> Co-authored-by: zhou.xu <zhou.xu@bambulab.com> Co-authored-by: Arthur <arthur.tang@bambulab.com> Co-authored-by: Bastien Nocera <hadess@hadess.net> Co-authored-by: zhimin.zeng <zhimin.zeng@bambulab.com> Co-authored-by: hu.wang <hu.wang@bambulab.com> Co-authored-by: Stone Li <stone.li@bambulab.com> Co-authored-by: XunZhangBambu <xun.zhang@bambulab.com> |
||
|
|
374f78c768 |
Revert to WxWidgets 3.1.5 (#3249)
* revert to WxWidgets 3.1.5 * update nanosvg unicode path |
||
|
|
eeef52bf5d |
Rename bunny to Stanford Bunny
|
||
|
|
69602d24fc | Add more built-in models: Disc/Torus/Bunny | ||
|
|
933aa3050b |
Port Emboss & SVG gizmo from PrusaSlicer (#2819)
* Rework UI jobs to make them more understandable and flexible. * Update Orca specific jobs * Fix progress issue * Fix dark mode and window radius * Update cereal version from 1.2.2 to 1.3.0 (cherry picked from commit prusa3d/PrusaSlicer@057232a275) * Initial port of Emboss gizmo * Bump up CGAL version to 5.4 (cherry picked from commit prusa3d/PrusaSlicer@1bf9dee3e7) * Fix text rotation * Fix test dragging * Add text gizmo to right click menu * Initial port of SVG gizmo * Fix text rotation * Fix Linux build * Fix "from surface" * Fix -90 rotation * Fix icon path * Fix loading font with non-ascii name * Fix storing non-utf8 font descriptor in 3mf file * Fix filtering with non-utf8 characters * Emboss: Use Orca style input dialog * Fix build on macOS * Fix tooltip color in light mode * InputText: fixed incorrect padding when FrameBorder > 0. (ocornut/imgui#4794, ocornut/imgui#3781) InputTextMultiline: fixed vertical tracking with large values of FramePadding.y. (ocornut/imgui#3781, ocornut/imgui#4794) (cherry picked from commit ocornut/imgui@072caa4a90) (cherry picked from commit ocornut/imgui@bdd2a94315) * SVG: Use Orca style input dialog * Fix job progress update * Fix crash when select editing text in preview screen * Use Orca checkbox style * Fix issue that toolbar icons are kept regenerated * Emboss: Fix text & icon alignment * SVG: Fix text & icon alignment * Emboss: fix toolbar icon mouse hover state * Add a simple subtle outline effect by drawing back faces using wireframe mode * Disable selection outlines * Show outline in white if the model color is too dark * Make the outline algorithm more reliable * Enable cull face, which fix render on Linux * Fix `disable_cullface` * Post merge fix * Optimize selection rendering * Fix scale gizmo * Emboss: Fix text rotation if base object is scaled * Fix volume synchronize * Fix emboss rotation * Emboss: Fix advance toggle * Fix text position after reopened the project * Make font style preview darker * Make font style preview selector height shorter --------- Co-authored-by: tamasmeszaros <meszaros.q@gmail.com> Co-authored-by: ocornut <omarcornut@gmail.com> Co-authored-by: SoftFever <softfeverever@gmail.com> |
||
|
|
25a055491e |
Update wxWidgets to v3.2.1 (#2905)
* Upgrade wxWidgets to 3.2.1 Based on prusa3d/PrusaSlicer@9a7e024 Co-authored-by: tamasmeszaros <meszaros.q@gmail.com> * Implement BitmapCache * update wxExtensions while keeping legacy items * update dc.DrawBitmap calls to use get_bitmap * Fix GetSize/Width/Height calls * update BitmapComboBox * fix ifndef in wxExtensions.hpp * update my todos to OcraftyoneTODO * Get to a compilable state Everything seems to be working (including the plater). I am not seeing any graphical issues * fix extruder color icons * fix crash on opening support tab * remove GetBmpSize method from DropDown.cpp * Update TextInput to use bitmap bundles * update a TODO after testing * fix the rendering of the icons on combobox * fix a few todos * fix WipeTowerDialog.cpp * Overhaul WipeTowerDialog Removed simple version of the dialog since BBS removed the functionality but left the code. Center the table (only seen when the table is smaller than the minimum size of the dialog) Fix issue where editing a value causes the m_min_flush_label to change colors slightly Fix an issue where changing a value or running an auto calc changes the disabled value from "-" to "0" * update a few todos * Update some todos * Show dropdown when editing is started * Update NanoSVG.cmake Update NanoSVG to work with PR #2780 * Dim the icon on ComboBox when disabled * solve ObjectDataViewModel todos leaving colPrint and colEditing cases alone as it does not seem to impact anything * Update names in wxExtensions -Rename msw_rescale to sys_color_changed -Replace GetBmpSize, GetBmpWidth, GetBmpHeight with renamed version (same name without "Bmp") Both of these changes were also made by PrusaSlicer. Original Commit: Prusa3D/PrusaSlicer@066b567 Co-authored-by: YuSanka <yusanka@gmail.com> * update BitmapCache::from_svg disable finding bundle in the cache to match load_svg update to match values used in load_svg * Update ScalableButton change the signature and remove functions/vars pertaining to a default bmp fix TODOs in ScalableButton Original Commit: Prusa3D/PrusaSlicer@066b567 Co-authored-by: YuSanka <yusanka@gmail.com> * fix up some more todos in wxExtensions * update ScalableBitmap to use bmp bundles use wxBitmapBundle by default add flag to use old scaled bitmap function (specifically to solve issue with advanced toggle) * attempt to fix macos deps build * fix ubuntu build * Revert "attempt to fix macos deps build" Mistakenly made change to wrong file This reverts commit d9c20b51216db1d409aeb0420d9d901000ad1b00. * update wxWidgets patch an attempt to fix macOS build * Remove duplicate variable from OrcaSlicer.cpp * Fix macOS build issue * Fix blank DataViewItem being added to objects list * Filament ComboBox editor updates -Add show drop down feature to ObjectTable -Call finish editing when ComboBox is closed in ObjectList * remove Apple specific declarations missed during refactor * delete old wxWidgets patch * fix ubuntu seg fault * include patch from #2926 * update patch to include wxWidgets/wxWidgets@991a74c * fix deps not compiling on Windows * update WipeTowerDialog relocates the recalculate button back to its previous position changes the wording of the tip message label add spacing below the matrix * finish patching wxWidgets from prusa3d/PrusaSlicer@f8477d1 and prusa3d/PrusaSlicer@066b567 Co-authored-by: YuSanka <yusanka@gmail.com> * fix combobox crash * revert outside plate changes --------- Co-authored-by: tamasmeszaros <meszaros.q@gmail.com> Co-authored-by: YuSanka <yusanka@gmail.com> |
