Port EditGCodeDialog from PrusaSlicer #3417

Ocraftyone · 2024-01-01T16:01:09Z

This is a port of the EditGCodeDialog from PrusaSlicer 2.7.x. There were a few changes made to make it a bit more functional. Also, it isn't quite fully complete, but it should be in a very usable state.

General Changes:

Implement UndoValueUIManager and EditValueUI in Field
Implement EditGCodeDialog and add buttons to the tabs
Other minor changes to accommodate the new classes

Differences from PrusaSlicer's Implementation:

backported to wxWidgets 3.1.5 (reverse commit 8770c4b after updating to 3.2.x)
icons have been updated to use Orca colors
improve the report that tells you if certain placeholders have not been defined properly for the dialog. It now shows all issues at once rather than having to fix then recompile to see the next issue.
allow the use of the cmake option ORCA_CHECK_GCODE_PLACEHOLDERS to toggle the above report since our workflow rarely uses debug mode.
if a custom gcode value is not set when checking gcode placeholders, a testing value is set. Custom gcode is not parsed if it is empty, and the only way to check if the placeholders are all defined is by running the placeholder operation on the custom gcode.
some calls to print.config() in Gcode.cpp were changed to m_config to support the above testing values feature (only m_config is modified with the placeholders and print.config() would return an empty string)
a macro has been added to quickly add a definition to SlicingStatesConfigDefs with less boiler plate (it could technically be used for any ConfigOptionDef, but that would hurt interoperability with PS. I tried to not use the macro for too many PS defined definitions.)
the presets are now also categorized by the page they are on in their tab

Prusa	Orca

TODO:

Make sure all linux fixes have been applied
Finish adding "universal" gcode options
add search function to dataview (maybe?)
determine if any options are being left out of the preset categories by getting options from Tab rather than Presets. If so, consider adding outside of the groupings

from prusa3d/PrusaSlicer@32ff20d Co-authored-by: YuSanka <[email protected]>

Original Commit: prusa3d/PrusaSlicer@7db83d5 Co-authored-by: YuSanka <[email protected]>

Only current issue is that the grabber for the resizeable window is currently white (ongoing issue for Orca) Original Commit: prusa3d/PrusaSlicer@a8307bf Co-authored-by: YuSanka <[email protected]>

+ GUI_App : Fixed update of the dark mode, when DataViewCtrl doesn't have header -Orca: currently doesn't seem to display dataview labels properly. TBD if it continues to be an issue. Original Commit: prusa3d/PrusaSlicer@c577b7f Co-authored-by: YuSanka <[email protected]>

Original Commit: prusa3d/PrusaSlicer@59af551 Co-authored-by: YuSanka <[email protected]>

Included pre-generated files specific to Orca rather than PS provided files Original Commit: prusa3d/PrusaSlicer@55d5921 Co-authored-by: YuSanka <[email protected]>

Original Commit: prusa3d/PrusaSlicer@b2bd7f5 Co-authored-by: YuSanka <[email protected]>

Original Commit: prusa3d/PrusaSlicer@d652f15 Co-authored-by: YuSanka <[email protected]>

Orca: Added option to use CMake config option ORCA_CHECK_GCODE_PLACEHOLDERS to check custom gcode placeholders rather than using debug Original Commit: prusa3d/PrusaSlicer@b8bb7f2 Co-authored-by: YuSanka <[email protected]>

Original Commit: prusa3d/PrusaSlicer@83b8988 Co-authored-by: YuSanka <[email protected]>

Original Commit: prusa3d/PrusaSlicer@7efdbec Co-authored-by: Lukas Matena <[email protected]>

Original Commit: prusa3d/PrusaSlicer@361ef22 Co-authored-by: YuSanka <[email protected]>

Add new icons from PS and update to use Orca color scheme Original Commit: prusa3d/PrusaSlicer@37afe79 Co-authored-by: YuSanka <[email protected]>

Also organized and added missing options to `s_CustomGcodeSpecificPlaceholders`

Dialog now shows all issues within the same dialog If a custom gcode value is not specified within the config, a testing value is added. This ensures that (most) of the custom gcode is parsed, and thus checked against the definitions.

# Conflicts: # src/slic3r/GUI/OG_CustomCtrl.cpp # src/slic3r/GUI/OG_CustomCtrl.hpp

This should be reverted when wxWidgets 3.2.1 is re-implemented

make sure that the local copy of the config is being used when checking if there is custom gcode otherwise it would be possible it doesn't get run during testing

Ocraftyone · 2024-01-01T16:02:28Z

sorry about the couple of extra PRs created. I had merged some of the changes from the wx upgrade ahead of time and it cause issues because of the reversion. Some cherry picking magic later, new branch!

…h-port-edit-gcode-dlg

tsmith35 · 2024-01-02T06:30:37Z

@Ocraftyone and @SoftFever, I noticed your check builds were failing. I ran into the same issue here today and found that it's because the site hosting Boost (https://boostorg.jfrog.io/artifactory/main/release/1.78.0/source/boost_1_78_0.tar.gz) was returning "409 Conflict". Now it's prompting for the original registrant's email address to be added.

TL;DR, I got a copy of Boost from here: https://sourceforge.net/projects/boost/files/boost/1.78.0/boost_1_78_0.tar.gz

I put it in the OrcaSlicer\deps\DL_CACHE\Boost directory and after that, I could successfully compile. Just a PITA. lol

discip · 2024-01-11T21:06:08Z

@Ocraftyone
Finally I had time to test this on Linux (Manjaro) but unfortunately it doesn't work at all.
As soon as I click on the corresponding icon, it asks me to either wait or to force quit, but even if I choose "Wait" it crashes.

Also I'm not sure where to find the related logfile.

setup

CPU	GPU	RAM	SSD
Ryzen 9 7950X3D	XFX 7900 XTX	G.Skill Flare X5 32 GB (EXPO I enabled)	Samsung 990 Pro 2 TB

igiannakas · 2024-01-12T10:15:15Z

Nice one this PR! There are so many gcode options that knowing them all is impossible!

UI wise on an M1 Pro MacBook Pro

Screen.Recording.2024-01-12.at.12.13.21.mov

When clicking an option the list is momentarily refreshed displaying that option as a label for all Gcode placeholders. Once the tree loads, the correct values are displayed.

Ocraftyone · 2024-01-12T10:44:30Z

@igiannakas would mind trying PrusaSlicer and see if it does something similar?

igiannakas · 2024-01-12T10:47:02Z

@igiannakas would mind trying PrusaSlicer and see if it does something similar?

Yeap it does exactly the same... It's cosmetic so no real issue, but was the only thing I could see!

Another thing to consider is possibly filtering the list by the options available to the current print model - for example ramming doesn't apply to BBL printers etc. Again, that is polishing type stuff.

Ocraftyone · 2024-01-12T10:55:43Z

Another thing to consider is possibly filtering the list by the options available to the current print model - for example ramming doesn't apply to BBL printers etc. Again, that is polishing type stuff.

That would be nice, but it would be a pretty manual process of determining all of the options that don't apply to BBL printers. Unless there is somewhere that specifies the options that are disabled or there are only a handful of options that would need to be disabled, I am hesitant to do that.

As for the dataview issue, do you have the same issue with the object list dataview? Maybe it has some logic to alleviate this. While building this, I saw that there were some options indicating that you can set an animation for expanding and collapsing items, but I did not mess with them. Maybe it has to be explicitly disabled for mac.

Ocraftyone · 2024-01-12T11:11:50Z

Finally I had time to test this on Linux (Manjaro) but unfortunately it doesn't work at all.
As soon as I click on the corresponding icon, it asks me to either wait or to force quit, but even if I choose "Wait" it crashes.

Just got a chance to test on ubuntu and I am getting a seg fault. I am having trouble building it in my test environment with github codespaces, so I still haven't been able to debug it yet.

SoftFever · 2024-01-16T14:45:23Z

src/slic3r/GUI/OG_CustomCtrl.cpp

@@ -373,22 +373,31 @@ void OG_CustomCtrl::OnMotion(wxMouseEvent& event)
            break;
        }

-        for (size_t opt_idx = 0; opt_idx < line.rects_undo_icon.size(); opt_idx++)
+        size_t undo_icons_cnt = line.rects_undo_icon.size();


Curiously, what are these changes for?

I believe a lot of it is a refactor. Rather than having multiple loops, it is a single loop that handles all cases

SoftFever · 2024-01-16T14:48:15Z

src/slic3r/GUI/Field.hpp

@@ -41,7 +41,120 @@ wxString double_to_string(double const value, const int max_precision = 4);
 wxString get_thumbnail_string(const Vec2d& value);
 wxString get_thumbnails_string(const std::vector<Vec2d>& values);

-class Field {
+class UndoValueUIManager


Just trying to understand here: if I'm not wrong, this micro refactoring is not directly related to the EditGCodeDialog, right?

According to the commits from PS, it was a refactoring done in preparation for the dialog. It is still fully compatible. The EditUIManager IS directly related.

SoftFever · 2024-01-16T15:03:40Z

src/slic3r/GUI/OptionsGroup.hpp

+
+    inline Line*	get_line(const t_config_option_key& id) {
+		for (Line& line : m_lines)
+			if (line.has_only_option(id))


Shall we is_separator() too?
I can't recall the exact causes why I added that check. I remember there were crashes caused by separators

ill look back into the commit it was added and get back to you

The commit is from the implementation of internal bridge speed. I didn't get any crashes, but that doesn't mean much. I am kinda leaning towards just going back the the original BBL function...

hehehe, that change was introduced by myself.
It was crashing when a separator line was added

Ocraftyone · 2024-01-21T00:45:42Z

@discip I fixed that linux crash. It was one of the STUPIDEST mistake I have ever made, but its fixed now! 🤦

tsmith35 · 2024-01-21T20:18:52Z

@discip I fixed that linux crash. It was one of the STUPIDEST mistake I have ever made, but its fixed now! 🤦

@Ocraftyone People who don't make mistakes never learn anything and are most likely doing nothing. You're doing fine. 👍

Ocraftyone · 2024-01-21T20:43:28Z

@discip I fixed that linux crash. It was one of the STUPIDEST mistake I have ever made, but its fixed now! 🤦

@Ocraftyone People who don't make mistakes never learn anything and are most likely doing nothing. You're doing fine. 👍

Ain't that the truth!

discip · 2024-01-22T20:30:41Z

@Ocraftyone
Sorry for the late answer. 😅

Indeed, it works now on Linux as well, but I think the color of the text is definitely too dim:

Just that.
Otherwise: Much appreciated!

SoftFever

Fantastic work!
Thank you very much

discip · 2024-01-27T21:15:38Z

@Ocraftyone
@SoftFever

Sorry to bother, but unfortunately this issue persists.

the color of the text is definitely too dim:

setup

CPU	GPU	RAM	SSD
Ryzen 9 7950X3D	XFX 7900 XTX	G.Skill Flare X5 32 GB (EXPO I enabled)	Samsung 990 Pro 2 TB

Ocraftyone · 2024-01-27T21:33:54Z

@discip I'll take a look when I get a chance. I had meant to before merging but I will try to get a patch together.

discip · 2024-01-27T21:39:31Z

Thank you! 👍🏻

I just noticed there are even more cases where the font is to dark:

Maybe there is even more. 🤷🏻‍♂️

discip · 2024-02-19T19:39:58Z

@Ocraftyone
Have you had time to look into that by any chance?

tsmith35 · 2024-02-20T22:27:08Z

@Ocraftyone Have you had time to look into that by any chance?

Is the text really that dark on Linux? Is there a light mode or similar available?

discip · 2024-02-20T22:34:58Z

This is a screenshot. 😆
It shows what I see on my machine. 😊

In the linux version there is no option to choose from.

Ocraftyone and others added 25 commits January 1, 2024 10:57

add UndoValueUIManager from PS

4f0a47b

from prusa3d/PrusaSlicer@32ff20d Co-authored-by: YuSanka <[email protected]>

Implement Preparation for Edit Custom Gcode

accdbb9

Original Commit: prusa3d/PrusaSlicer@7db83d5 Co-authored-by: YuSanka <[email protected]>

Add first impl of EditGCodeDialog

dd80276

Only current issue is that the grabber for the resizeable window is currently white (ongoing issue for Orca) Original Commit: prusa3d/PrusaSlicer@a8307bf Co-authored-by: YuSanka <[email protected]>

Improved ParamsViewCtrl

05e1590

Original Commit: prusa3d/PrusaSlicer@59af551 Co-authored-by: YuSanka <[email protected]>

Partial Automation of getting Gcode placeholders

6d19d62

Included pre-generated files specific to Orca rather than PS provided files Original Commit: prusa3d/PrusaSlicer@55d5921 Co-authored-by: YuSanka <[email protected]>

Implemented new grouping for the params

58cd50c

Original Commit: prusa3d/PrusaSlicer@b2bd7f5 Co-authored-by: YuSanka <[email protected]>

Add parameter description

6539dc4

Original Commit: prusa3d/PrusaSlicer@d652f15 Co-authored-by: YuSanka <[email protected]>

Edit Custom G-Codes Improvements

0e59008

Orca: Added option to use CMake config option ORCA_CHECK_GCODE_PLACEHOLDERS to check custom gcode placeholders rather than using debug Original Commit: prusa3d/PrusaSlicer@b8bb7f2 Co-authored-by: YuSanka <[email protected]>

Add wrapping description

036b21e

Original Commit: prusa3d/PrusaSlicer@83b8988 Co-authored-by: YuSanka <[email protected]>

Update Labels

8c6100e

Original Commit: prusa3d/PrusaSlicer@7efdbec Co-authored-by: Lukas Matena <[email protected]>

Add fix for linux

7a1d782

Original Commit: prusa3d/PrusaSlicer@361ef22 Co-authored-by: YuSanka <[email protected]>

Remove extraneous options

011d7ad

Fix duplicate else statement

2109ac6

Update Icons

5fc6301

Add new icons from PS and update to use Orca color scheme Original Commit: prusa3d/PrusaSlicer@37afe79 Co-authored-by: YuSanka <[email protected]>

Remove SlicingState Options that aren't in Orca

d839d67

Also organized and added missing options to `s_CustomGcodeSpecificPlaceholders`

Improve checking placeholders

4e3039b

Dialog now shows all issues within the same dialog If a custom gcode value is not specified within the config, a testing value is added. This ensures that (most) of the custom gcode is parsed, and thus checked against the definitions.

Merge branch 'main' into enh-port-edit-gcode-dlg

f78d55e

# Conflicts: # src/slic3r/GUI/OG_CustomCtrl.cpp # src/slic3r/GUI/OG_CustomCtrl.hpp

Make Compatible with wx 3.1.5

066e2f6

This should be reverted when wxWidgets 3.2.1 is re-implemented

Use proper config when checking for custom gcode

529f14d

make sure that the local copy of the config is being used when checking if there is custom gcode otherwise it would be possible it doesn't get run during testing

Don't show option if defined with type coNone

2235371

Add defs for custom gcode

7297997

Subgroup presets by page

7f1f94d

fix spacing in tooltip

2394278

Merge branch 'main' into enh-port-edit-gcode-dlg

a8148d8

Ocraftyone marked this pull request as draft January 1, 2024 16:02

Ocraftyone added 2 commits January 2, 2024 00:56

Check if cmake option is truthy rather than defined

42e6b18

Merge remote-tracking branch 'origin/enh-port-edit-gcode-dlg' into en…

b619e5b

…h-port-edit-gcode-dlg

Ocraftyone and others added 2 commits January 14, 2024 03:54

Merge branch 'main' into enh-port-edit-gcode-dlg

0af1b9b

Merge branch 'main' into enh-port-edit-gcode-dlg

95adb89

SoftFever reviewed Jan 16, 2024

View reviewed changes

Ocraftyone added 2 commits January 21, 2024 00:40

Fix linux crashing when opening EditGcodeDialog

595f707

Merge branch 'main' into enh-port-edit-gcode-dlg

9f44e15

Ocraftyone added 2 commits January 21, 2024 14:11

Revert to BBL get_line function

7c02b5c

Merge branch 'main' into enh-port-edit-gcode-dlg

11fd73a

SoftFever approved these changes Jan 24, 2024

View reviewed changes

SoftFever merged commit 5ff00fb into SoftFever:main Jan 24, 2024
12 checks passed

Ocraftyone deleted the enh-port-edit-gcode-dlg branch January 24, 2024 16:36

discip mentioned this pull request Apr 4, 2024

Dark mode fixes #4860

Closed

jamincollins mentioned this pull request Apr 5, 2024

Dark Mode Issues Tracking Ticket #4888

Closed

11 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Port EditGCodeDialog from PrusaSlicer #3417

Port EditGCodeDialog from PrusaSlicer #3417

Ocraftyone commented Jan 1, 2024 •

edited

Loading

Ocraftyone commented Jan 1, 2024

tsmith35 commented Jan 2, 2024

discip commented Jan 11, 2024

igiannakas commented Jan 12, 2024

Ocraftyone commented Jan 12, 2024

igiannakas commented Jan 12, 2024

Ocraftyone commented Jan 12, 2024

Ocraftyone commented Jan 12, 2024

SoftFever Jan 16, 2024

Ocraftyone Jan 21, 2024

SoftFever Jan 16, 2024

Ocraftyone Jan 21, 2024

SoftFever Jan 16, 2024

Ocraftyone Jan 21, 2024

Ocraftyone Jan 21, 2024

SoftFever Jan 24, 2024

Ocraftyone commented Jan 21, 2024

tsmith35 commented Jan 21, 2024 •

edited

Loading

Ocraftyone commented Jan 21, 2024

discip commented Jan 22, 2024

SoftFever left a comment

discip commented Jan 27, 2024

Ocraftyone commented Jan 27, 2024

discip commented Jan 27, 2024

discip commented Feb 19, 2024

tsmith35 commented Feb 20, 2024 •

edited

Loading

discip commented Feb 20, 2024

Port EditGCodeDialog from PrusaSlicer #3417

Port EditGCodeDialog from PrusaSlicer #3417

Conversation

Ocraftyone commented Jan 1, 2024 • edited Loading

Ocraftyone commented Jan 1, 2024

tsmith35 commented Jan 2, 2024

discip commented Jan 11, 2024

igiannakas commented Jan 12, 2024

Ocraftyone commented Jan 12, 2024

igiannakas commented Jan 12, 2024

Ocraftyone commented Jan 12, 2024

Ocraftyone commented Jan 12, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Ocraftyone commented Jan 21, 2024

tsmith35 commented Jan 21, 2024 • edited Loading

Ocraftyone commented Jan 21, 2024

discip commented Jan 22, 2024

SoftFever left a comment

Choose a reason for hiding this comment

discip commented Jan 27, 2024

Ocraftyone commented Jan 27, 2024

discip commented Jan 27, 2024

Thank you! 👍🏻

discip commented Feb 19, 2024

tsmith35 commented Feb 20, 2024 • edited Loading

discip commented Feb 20, 2024

Ocraftyone commented Jan 1, 2024 •

edited

Loading

tsmith35 commented Jan 21, 2024 •

edited

Loading

tsmith35 commented Feb 20, 2024 •

edited

Loading