Re-write of Search and Replace #19796

GregValiant · 2024-10-23T11:03:59Z

Added some options:

Replace only the 'First Instance' of the Search term.
Limit the Search to a layer range.
'Ignore StartUp G-code'
'Ignore Ending G-code'

Description

Added flexibility to the script. The options still allow a full Search and Replace as well as a limited Search and Replace.

Type of change

[ X] New feature (non-breaking change which adds functionality)

How Has This Been Tested?

I have been using this version for a year with multiple Cura versions.

Test Configuration:
Win10 Pro on a laptop.
UM Cura 4.13.1 to 5.9beta.

Checklist:

[ X] My code follows the style guidelines of this project as described in UltiMaker Meta and Cura QML best practices
[ X] I have read the Contribution guide
[ X] I have commented my code, particularly in hard-to-understand areas
[ X] I have uploaded any files required to test this change

Added some options: - Replace the 'First Instance Only' of the Search term. - Limit the Search to a layer range. - 'Ignore StartUp G-code' and 'Ignore Ending G-code'

wawanbreton · 2024-11-25T07:27:44Z

Thanks, we will take a look when we are not overbusy 😊
For internal reference: CURA-12325

Update a description Update SearchAndReplace.py Fixed the "descriptions". Cura didn't like the dashes or backslashes.

github-actions · 2025-01-07T14:36:03Z

Test Results

23 486 tests ±0 23 484 ✅ ±0 47s ⏱️ +2s
1 suites ±0 2 💤 ±0
1 files ±0 0 ❌ ±0

Results for commit 652922a. ± Comparison against base commit d5649ac.

♻️ This comment has been updated with latest results.

fieldOfView · 2025-01-07T15:16:23Z

plugins/PostProcessingPlugin/scripts/SearchAndReplace.py

                }
            }
        }"""

    def execute(self, data):
+        curaApp = Application.getInstance().getGlobalContainerStack()


Code style: cura_app instead of curaApp.
Or better, since you are actually getting the global container stack: global_stack

fieldOfView · 2025-01-07T15:23:41Z

plugins/PostProcessingPlugin/scripts/SearchAndReplace.py


-        for layer_number, layer in enumerate(data):
-            data[layer_number] = re.sub(search_regex, replace_string, layer) #Replace all.
+    #Find the raft and layer:0 indexes--------------------------------------------------------------------------


Strange comment style. Please use the same style of comments as the rest of Cura.
I am somewhat surprised Python does not complain about the indentation; strictly speaking this indentation ends the previous codeblock.

fieldOfView · 2025-01-07T15:26:46Z

plugins/PostProcessingPlugin/scripts/SearchAndReplace.py

+                    replaceone = True
+                    break
+                if replaceone: break


As far as I can see, this condition is never met because we're already broken out of the for loop. As a matter of fact, it seems to me that the whole replaceone variable is useless.

I think that was vestigial code. There may have been a second "for" in there and I used the second 'break' to back all the way out.

fieldOfView · 2025-01-07T15:31:46Z

There seems to be a lot of unnecessary code duplication after line 170

Update SearchAndReplace.py Changed comments. Revised code below line 170. Changed 'curaApp' to 'cura_app'

GregValiant · 2025-01-07T17:28:38Z

Thanks @fieldOfView.
I must have missed the first few suggestions. The latest commit addresses the issues from line 170. I'll look at the others here in a minute.

A quick squash and all the changes are in that last commit.

Change variable name from cura_app to global_stack.

wawanbreton

Hi @GregValiant, the code looks overall good and I do like the new settings very much, this is a real improvement 🙂
I do have some questions, and a few nitpicking code-style remarks but nothing serious

plugins/PostProcessingPlugin/scripts/SearchAndReplace.py

GregValiant · 2025-02-07T23:44:54Z

Much simpler.
One list for layers and one list for data and a quick compare to figure out the start_index and end_index.
As an added bonus - no magic numbers and no 'try/except'.

Replaced the complex method of dealing with rafts to something simpler. Update SearchAndReplace.py Update

wawanbreton · 2025-02-10T09:42:25Z

I made slight adjustments to the settings descriptions, @GregValiant tell me if this is ok for you, if yes it's all good to me.

GregValiant · 2025-02-10T12:35:42Z

Looks good.
As I final thing, I think you should change the year in my "by line" to 2025.

"\n" eh?
That's making me feel sheepish. I tried several different ways to get '\n' displayed rather than acted on and that obviously wasn't one that occurred to me.

Thanks.

wawanbreton · 2025-02-10T12:41:14Z

That's making me feel sheepish. I tried several different ways to get '\n' displayed rather than acted on and that obviously wasn't one that occurred to me.

That's ok, I have faced similar issues A LOT of times, within different languages/encodings/file types/... so I know how annoying it can be 🙂

Re-write of Search and Replace

ee61854

Added some options: - Replace the 'First Instance Only' of the Search term. - Limit the Search to a layer range. - 'Ignore StartUp G-code' and 'Ignore Ending G-code'

github-actions bot added the PR: Community Contribution 👑 Community Contribution PR's label Oct 23, 2024

GregValiant requested review from wawanbreton and HellAholic October 23, 2024 11:05

GregValiant added the PR: Post Processing ➕ Like adding beeps, more tunability or different Gcode pause at heights label Oct 23, 2024

Update SearchAndReplace.py

349c528

Update a description Update SearchAndReplace.py Fixed the "descriptions". Cura didn't like the dashes or backslashes.

GregValiant force-pushed the SearchAndReplace branch from 146f2f9 to 349c528 Compare January 7, 2025 14:24

fieldOfView reviewed Jan 7, 2025

View reviewed changes

Update SearchAndReplace.py

be509b6

Update SearchAndReplace.py Changed comments. Revised code below line 170. Changed 'curaApp' to 'cura_app'

GregValiant force-pushed the SearchAndReplace branch from fbe4c39 to be509b6 Compare January 7, 2025 17:27

GregValiant and others added 2 commits January 12, 2025 10:04

Update SearchAndReplace.py

5678c64

Change variable name from cura_app to global_stack.

Merge branch 'main' into SearchAndReplace

28a21cb

wawanbreton requested changes Feb 7, 2025

View reviewed changes

Update SearchAndReplace.py

36141b0

Replaced the complex method of dealing with rafts to something simpler. Update SearchAndReplace.py Update

GregValiant force-pushed the SearchAndReplace branch from a2208a3 to 36141b0 Compare February 7, 2025 23:52

wawanbreton added 2 commits February 10, 2025 10:36

Adjust settings descriptions

e1bd4ba

Merge branch 'main' into SearchAndReplace

d49b5c5

Update altered year

80fa6aa

Merge branch 'main' into SearchAndReplace

652922a

wawanbreton approved these changes Feb 10, 2025

View reviewed changes

HellAholic merged commit 26d5afe into Ultimaker:main Feb 14, 2025
3 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Re-write of Search and Replace #19796

Re-write of Search and Replace #19796

GregValiant commented Oct 23, 2024

wawanbreton commented Nov 25, 2024

github-actions bot commented Jan 7, 2025 •

edited

Loading

fieldOfView Jan 7, 2025

GregValiant Jan 8, 2025

fieldOfView Jan 7, 2025

GregValiant Jan 8, 2025

fieldOfView Jan 7, 2025

GregValiant Jan 7, 2025

GregValiant Jan 7, 2025

fieldOfView commented Jan 7, 2025

GregValiant commented Jan 7, 2025

wawanbreton left a comment

GregValiant commented Feb 7, 2025

wawanbreton commented Feb 10, 2025

GregValiant commented Feb 10, 2025

wawanbreton commented Feb 10, 2025

Re-write of Search and Replace #19796

Re-write of Search and Replace #19796

Conversation

GregValiant commented Oct 23, 2024

Description

Type of change

How Has This Been Tested?

Checklist:

wawanbreton commented Nov 25, 2024

github-actions bot commented Jan 7, 2025 • edited Loading

Test Results

fieldOfView Jan 7, 2025

Choose a reason for hiding this comment

GregValiant Jan 8, 2025

Choose a reason for hiding this comment

fieldOfView Jan 7, 2025

Choose a reason for hiding this comment

GregValiant Jan 8, 2025

Choose a reason for hiding this comment

fieldOfView Jan 7, 2025

Choose a reason for hiding this comment

GregValiant Jan 7, 2025

Choose a reason for hiding this comment

GregValiant Jan 7, 2025

Choose a reason for hiding this comment

fieldOfView commented Jan 7, 2025

GregValiant commented Jan 7, 2025

wawanbreton left a comment

Choose a reason for hiding this comment

GregValiant commented Feb 7, 2025

wawanbreton commented Feb 10, 2025

GregValiant commented Feb 10, 2025

wawanbreton commented Feb 10, 2025

github-actions bot commented Jan 7, 2025 •

edited

Loading