Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes for new icons #5221

Merged
merged 43 commits into from May 20, 2024
Merged

Fixes for new icons #5221

merged 43 commits into from May 20, 2024

Conversation

yw4z
Copy link
Contributor

@yw4z yw4z commented May 1, 2024

Code Changes

  • Sidebar / Parameter icons

Quality > Wall Generator > param_wall_generator.svg
Quality > Walls and surfaces > param_wall_surface.svg
Quality > Bridging > param_bridge.svg
Quality > Overhangs > param_overhang.svg
Strength > Support Tree > param_support_tree.svg
Overhang Speed > param_overhang_speed.svg
Speed > Jerk(X/Y) > param_jerk.svg

  • Filament Settings icons

Filament > Print Temperature > param_extruder_temp.svg
Filament > Bed Temperature >param_bed_temp.svg
Cooling > Cooling specific layer > param_cooling_specific_layer.svg
Cooling > Part Cooling Fan > param_cooling_part_fan.svg
Cooling > Auxiliary part cooling fan > param_cooling_aux_fan.svg
Cooling > Exhaust Fan > param_cooling_exhaust.svg
Multi Material > Wipe tower parameters > param_tower.svg
Multi Material > Toolchange Parameters > param_toolchange.svg

  • Machine Settings icons

Basic Information > Printable Space > param_printable_space.svg
Basic Information > Cooling Fan > param_cooling_fan.svg
Basic Information > Extruder Clearence > param_extruder_clearence.svg
Basic Information > Adaptive Bed Mesh > param_adaptive_mesh.svg
Basic Information > Accessory > param_accessory.svg
Multi Material > Single Extruder Multi Material Setup > param_multi_material.svg
Multi Material > Wipe tower > param_tower.svg
Multi Material > Single Extruder Multi Material Parameters > param_settings.svg
Extruder > Size > param_extruder_size.svg
Extruder > Layer Height Limits > param_layer_height.svg
Extruder > Position > param_position.svg
Extruder > Lift Z Enforcement > param_extruder_lift_enforcement.svg
Extruder > Retraction when swithing material > param_retraction_material_change.svg
Motion Ability > Jerk Limitation > param_jerk.svg

  • Placeholder icons

Timestamps > custom-gcode_time.svg (there is an icon existing but not compatible with current design this will fit better)
Presets > Print Settings > process.svg
Presets > Print Settings > Quality > custom-gcode_quality.svg
Presets > Print Settings > Strength > custom-gcode_strength.svg
Presets > Print Settings > Speed > custom-gcode_speed.svg
Presets > Print Settings > Support > custom-gcode_support.svg
Presets > Print Settings > Other > custom-gcode_other.svg
Presets > Print Settings > Notes > custom-gcode_note.svg
Presets > Filament Settings > Filament > custom-gcode_filament.svg
Presets > Filament Settings > Cooling > custom-gcode_cooling_fan.svg
Presets > Filament Settings > Setting Overrides > custom-gcode_setting_override.svg
Presets > Filament Settings > Advanced > custom-gcode_advanced.svg
Presets > Filament Settings > Multi Material > custom-gcode_multi_material.svg
Presets > Filament Settings > Notes > custom-gcode_note.svg
Presets > Printer Settings > Basic Information > custom-gcode_object-info.svg
Presets > Printer Settings > Machine G-Code > custom-gcode_gcode.svg
Presets > Printer Settings > Multi Material > custom-gcode_multi_material.svg
Presets > Printer Settings > Extruder > custom-gcode_extruder.svg
Presets > Printer Settings > Motion Ability > custom-gcode_motion.svg
Presets > Printer Settings > Notes > custom-gcode_note.svg

  • Add ability to pulling icons from tabs for gCode Editor to show them in placeholders and compare window

  • Object list > Height range icons for layer menu item

Screenshot-20240501114115

  • Object list > Height range add / delete buttons (previous code uses add_filament / delete_filament)

before
Screenshot-20240507143003

after
Screenshot-20240501114104

  • Compare window > Updated undefined category icon with low resolution compatible one. Previous code used question icon that used for dialogs
Before After
Screenshot-20240507143116 Screenshot-20240507143131

Fixes

  • Object list > Support / Seam painting icons ( previous ones not compatible with low resolution & Dark theme)

Screenshot-20240501120440

  • SVG and Emboss Gizmos > Changed warning icon with obj_warning.svg . because exclamation.svg is used for dialogs and not compatible with low resolution
Before After
Screenshot-20240502002041 Screenshot-20240502002642
Screenshot-20240502003520 Screenshot-20240502002923
  • Updated warning icon on dialogs. Changed obj_warning.svg icon with exclamation.svg . because exclamation.svg designed for dialogs
Before After
Screenshot-20240514160312 Screenshot-20240514160013
  • Combo Box icon size for dropdown arrow

I was changed icon resolution on combo box code on previous commit and resolution of arrow icon set for it. reverted icon res back to 16x16

Before After
Screenshot-20240507142741 Screenshot-20240507142727
  • Gizmos > Keyboard cheat sheet icon resolution fix

Icon appears on > Variable Layer Height, Cut, Support Painting, Seam Painting, Color Painting, Measure
Problem with this icon they defined 30, 22 resolution on GLGizmosManager.cpp but gizmos uses ImVec2(font_size * 1.8, font_size * 1.3) for resolution. Resolution ratio is not matching and using font size as a different ratio is not a good choose
Let me know if you have simpler solution

Screenshot-20240502012153

  • Notifications > Swapped collapse / expand arrow directions

Problem is notifications expands bottom to top and collapse button icon not looks right
I was used directions from original source but they already set wrong. so changed that in this commit

Before After
Screenshot-20240507023132 Screenshot-20240507023225
Screenshot-20240507023141 Screenshot-20240507023233
  • Gizmos > Vertically centered icons rendered blurry / pixelated
    this should fix more. included to this commit because its already a orca change. i can this as separate commit if its not
Before After
Screenshot-20240511160712 Screenshot-20240511160543
Screenshot-20240511160720 Screenshot-20240511160905

Icon updates

  • Toolbar > Auto Orient
  • Plate > Auto Orient
  • Toolbar > Lay on surface
  • Toolbar > Variable Layer height
  • Top Bar > Calibration tab icon (Matched icon name that used on code)
  • Checkboxes > matched disabled color and fixed an alignment problem

New icons

  • Cross Hatch fill pattern
  • Parameters > Skirt group

Deleted this icons from source (they are leftovers from previous icons commit). i will send them as separate commit

cut_circle_dark.svg
cut_circle.svg
cut_triangle_dark.svg
cut_hexagon.svg
cut_hexagon_dark.svg
cut_square.svg
cut_square_dark.svg
cut_triangle.svg
measure_edit.svg
mesh_boolean_a.svg
mesh_boolean_b.svg
mesh_boolean_difference.svg
mesh_boolean_difference_dark.svg
mesh_boolean_intersection.svg
mesh_boolean_intersection_dark.svg
mesh_boolean_keep.svg
mesh_boolean_subtract.svg
mesh_boolean_union.svg
mesh_boolean_union_dark.svg
param_default-pattern.svg
param_search.svg
topbar_blank.svg

@yw4z yw4z changed the title Icon changes for code Code changes for new icons May 1, 2024
@yw4z yw4z changed the title Code changes for new icons Fixes for new icons May 1, 2024
@olcayoren
Copy link
Contributor

olcayoren commented May 2, 2024

Hello, there seems to be a problem with the icon in the picture, it would be nice if you edit it, thank you. @yw4z
yw4z
Ekran Resmi 2024-05-02 21 49 41

@yw4z
Copy link
Contributor Author

yw4z commented May 2, 2024

@olcayoren this fixed in this commit, is that screenshot from your compiled source from my branch?

@olcayoren
Copy link
Contributor

@olcayoren this fixed in this commit, is that screenshot from your compiled source from my branch?

I tried Pr-5239.

@SoftFever
Copy link
Owner

@yw4z
I noticed a small artefact on plater icons
image
image

@yw4z
Copy link
Contributor Author

yw4z commented May 18, 2024

@SoftFever Looks like a rendering issue because there is no elements on out of frame on icons.
i left 1px gap on right and bottom edge on most of icons to get odd number for perfect center but i guess its not important on plate icons. they will always blurred by antialiasing
also same issue visible on top border too if you look closely
i will change plate icons with that uses full icon frame soon

interesting part there is no visible mark on edit plate name icon. i guess problem its rendering textures as seamless so left edge offsets on right edge

Yes giving 1px space on all edges solves problem. applied on close button
Screenshot-20240518053152

@yw4z
Copy link
Contributor Author

yw4z commented May 18, 2024

@SoftFever updated them now

@SoftFever
Copy link
Owner

@SoftFever updated them now

Awesome.
It looks good.

@SoftFever
Copy link
Owner

@yw4z
All the changes look good to me.
Do you think the PR is ready?

@yw4z
Copy link
Contributor Author

yw4z commented May 18, 2024

@SoftFever I'm happy with result. especially with toolbar icons. Do you have any doubt on fixes / toolbar icons?

@yw4z yw4z marked this pull request as ready for review May 18, 2024 05:31
@igiannakas
Copy link
Contributor

igiannakas commented May 18, 2024

Testing wise it’s been great here.

the only feedback I have is the paint icon in the model painting gizmo. (Using old screenshot as am away from computer today)

IMG_3717

something a bit more intuitive other than the rectangle with the blobs on it would be nice - a bucket or something would really help clarify this icon. (Second to last icon on the gizmo)

@SoftFever
Copy link
Owner

Testing wise it’s been great here.

the only feedback I have is the paint icon in the model painting gizmo. (Using old screenshot as am away from computer today)

IMG_3717

something a bit more intuitive other than the rectangle with the blobs on it would be nice - a bucket or something would really help clarify this icon. (Second to last icon on the gizmo)

@yw4z
I think @igiannakas makes a good point here. I feel that the 'fill' and 'gap fill' are not intuitive too.

image

For the 'fill' icon, a bucket-style icon would be easier to understand as it has been widely used in paint applications like Windows Paint.
image

Bambu's old icon is not bad; perhaps we could use a similar concept?

image

@yw4z
Copy link
Contributor Author

yw4z commented May 18, 2024

@SoftFever @igiannakas

Screenshot-20240519000720

Gap Fill
1- Original > Lines represents layers. created gaps between lines and added new lines with accent color to represents fill
2- Increased gap space compared to original one. its easier to identify compared to previous one
3- created gaps between lines and placed a drop

2 is my favorite but im ok with 3

Fill
1- Original > Designed a easy to identify shape with accent color that not looks similar to triangle tool
2- Used spray icon same as toolbar icon badge. I'm always picking spray because its easy to identify on this resolution compared to bucket
3- Used paint bucked and tried to fill icon frame as much as possible otherwise it will look small compared to other icons. thats why i didnt use 45 degree angle

2 is a good alternative because it already used on toolbar icon. it will improve consistency if used together.

i dont recommend to use it on toolbar icon because that icon has much smaller version on object list. Bucket is hard to identfy at that resolution and looks similar to object sinking icon
One downside, cosistency reduced a bit if toolbar icon uses spray and fill icon uses bucket

@SoftFever
Copy link
Owner

@SoftFever @igiannakas

Screenshot-20240519000720

Gap Fill 1- Original > Lines represents layers. created gaps between lines and added new lines with accent color to represents fill 2- Increased gap space compared to original one. its easier to identify compared to previous one 3- created gaps between lines and placed a drop

2 is my favorite but im ok with 3

Fill 1- Original > Designed a easy to identify shape with accent color that not looks similar to triangle tool 2- Used spray icon same as toolbar icon badge. I'm always picking spray because its easy to identify on this resolution compared to bucket 3- Used paint bucked and tried to fill icon frame as much as possible otherwise it will look small compared to other icons. thats why i didnt use 45 degree angle

2 is a good alternative because it already used on toolbar icon. it will improve consistency if used together.

i dont recommend to use it on toolbar icon because that icon has much smaller version on object list. Bucket is hard to identfy at that resolution and looks similar to object sinking icon One downside, cosistency reduced a bit if toolbar icon uses spray and fill icon uses bucket

For the fill icon, I prefer option 3.

Now, for the gap fill, let me demonstrate the use case so that you might have a better idea of its usage. This tool is used to automatically absorb small color islands into the surrounding colors. Hence, neither the line (options 1 and 2) nor the water drop (option 3) are intuitive enough for its purpose, in my opinion.

image

@igiannakas
Copy link
Contributor

Agreed. Option 3 for the fill is fantastic. Agree with Softfever above on the gap fill one - the Bambu one is I think quite good , just needs re styling?

@yw4z
Copy link
Contributor Author

yw4z commented May 19, 2024

Screenshot-20240519183106

• made paint bucket a bit bigger so it will fit better with other icons. you can see comparison on bottom
• Function basically fixes small problems with painting so i thought medic / bandage icons can be used for that. photoshop already uses a bandage icon for patch tool
• Added a spatula as alternative. mainly used for filling gaps on mockups / clay models / walls. also fits imo
• Just used dost with different sizes to represent gaps in last one
• Replaced height range icon on some alternatives that already used for height range in UI. but old one fits better in here imo

last alternative looks nice

@igiannakas
Copy link
Contributor

The bucket looks great! Much more intuitive. And the size feels ok from what I see

For the gap fill one, honestly no idea... I'd probably vote for either the spatula doing the wipe move or the rectangle with the dots - the only downside to the dots one is it may mean that you're creating a dot pattern when selecting this :P So maybe the spatula is better.

Maybe post on discord and check what users think? Hmm

@SoftFever
Copy link
Owner

Screenshot-20240519183106

• made paint bucket a bit bigger so it will fit better with other icons. you can see comparison on bottom • Function basically fixes small problems with painting so i thought medic / bandage icons can be used for that. photoshop already uses a bandage icon for patch tool • Added a spatula as alternative. mainly used for filling gaps on mockups / clay models / walls. also fits imo • Just used dost with different sizes to represent gaps in last one • Replaced height range icon on some alternatives that already used for height range in UI. but old one fits better in here imo

last alternative looks nice

The last row of icons looks good to me. For the gap fill icon, do you think it would be better to use irregular polygons or triangles instead of circles? As shown in the screenshot, those gaps are usually triangular.

image

@yw4z
Copy link
Contributor Author

yw4z commented May 20, 2024

here is my selections
Screenshot-20240520154125

1- Dots
2- 1 big triangle and 3 small triangles to indicate it will work with different sizes of gaps
3- 2 triangles with border. this one has best contrast
4- 3 triangles. triangle is bigger and easier to identify compared to 2

and tries
Screenshot-20240520154132

• Many small triangles looks like shatter / shattering
• Not recommended to use only triangles without frame. it looked so weak visually
• 3 similar sized triangles looks like face from halloween :)
• Badges looked so small and hard to identify

@SoftFever
Copy link
Owner

here is my selections Screenshot-20240520154125

1- Dots 2- 1 big triangle and 3 small triangles to indicate it will work with different sizes of gaps 3- 2 triangles with border. this one has best contrast 4- 3 triangles. triangle is bigger and easier to identify compared to 2

and tries Screenshot-20240520154132

• Many small triangles looks like shatter / shattering • Not recommended to use only triangles without frame. it looked so weak visually • 3 similar sized triangles looks like face from halloween :) • Badges looked so small and hard to identify

Option 4 looks perfect to me!

@igiannakas
Copy link
Contributor

Nice one on the skirt icon! thank you :)

@yw4z
Copy link
Contributor Author

yw4z commented May 20, 2024

@SoftFever updated icons for fill and gap fill

Screenshot-20240520175115
Screenshot-20240520175131

and added new icon for skirt parameter (this parameter renamed currently as "Skirt" from "Bed Adhesion")
Screenshot-20240520175101

@SoftFever
Copy link
Owner

@SoftFever updated icons for fill and gap fill

Screenshot-20240520175115 Screenshot-20240520175131

and added new icon for skirt parameter (this parameter renamed currently as "Skirt" from "Bed Adhesion") Screenshot-20240520175101

Awesome!
Thank you.
I will merge it into main branch so that more people can test it.

@SoftFever SoftFever merged commit 34d3409 into SoftFever:main May 20, 2024
12 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants