Fixed Some bugs of code_mobject.py and Text_mobject.py #198

NavpreetDevpuri · 2020-07-12T09:54:23Z

Reopening #90
Fixed 3b1b/manim#1067
NOTE : SurroundingRectangle() only contains visible text.

class te(Scene):
    def construct(self):
        text1 = Text(" ab ", font="Consolas", size=2)
        rect1 = SurroundingRectangle(text1)
        text1.chars[1].set_color(GREEN)
        self.add(text1,rect1)

Output

class bug1(Scene):
    def construct(self):
        text1 = Text("  ab\ncd", font="Consolas", size=2)
        text2 = Text("ab\ngh", font="Consolas", size=2)
        rect1 = SurroundingRectangle(text1)
        rect2 = SurroundingRectangle(text2)
        self.play(Transform(remove_invisible_chars(text1), remove_invisible_chars(text2)), Transform(rect1, rect2))
        self.wait()

Output

Added new parameters background_stroke_width and background_stroke_color

class bug2andbug3(Scene):
    def construct(self):
        helloworldc = Code(
            "helloworldc.c",
            tab_width=4,
            background_stroke_width=1,
            background_stroke_color=WHITE,
            insert_line_no=True,
            style=Code.styles_list[4],
            background="window",
            language="cpp",
        )
        helloworldcpp = Code(
            "helloworldcpp.cpp",
            tab_width=4,
            background_stroke_width=1,
            background_stroke_color=WHITE,
            insert_line_no=True,
            style=Code.styles_list[15],
            background="window",
            language="cpp",
        )
        helloworldc.move_to(np.array([-3.6, 0, 0]))
        helloworldcpp.move_to(np.array([3.1, 0, 0]))
        self.add(helloworldc,helloworldcpp)

Output

Updated Paragraph() and added new methods set_line_to_initial_position() and set_all_lines_to_initial_positions()

class para(Scene):
    def construct(self):
        t = Paragraph('this is a awesome', 'paragraph', 'With \nNewlines', '\tWith Tabs', '  With Spaces',
                      'With Alignments',
                      'center', "left", "right")
        t.set_line_alignment("center", 7)
        t.set_line_alignment("right", 9)
        t.shift(2 * RIGHT)
        rect = SurroundingRectangle(t)
        self.add(t, rect)
        self.wait()
        self.play(t.set_all_lines_alignments, "right")
        self.play(t.set_line_to_initial_position, 4)
        self.play(t.set_all_lines_to_initial_positions)
        self.play(t.set_line_alignment, "center", 7)
        self.play(t.set_line_alignment, "right", 9)
        t.chars[0][5:7].set_color(GREEN)
        t[1][0:4].set_color(YELLOW)
        self.wait()

Output

Aathish04

@NavpreetDevpuri .

There have been some major changes since you last pulled from master.

These include changing all the imports to relative imports, and
Changing the main config system.
Cleaning up some things from constants.py.
Internally renaming the manimlib library to manim.

Your PR has added back some of the things that were once removed.
These include the relative imports in code_mobject.py and a lot of what was cleaned up from constants.py. Your code also makes frequent imports from manimlib which has been renamed to manim.

Please address these.

The easiest way would be to pull from ManimCommunity/Master, and simply go through your changes and re-add them.

NavpreetDevpuri · 2020-07-12T10:28:09Z

@Aathish04 thanks for that. i did not notice that.
Now i fixed it. check it.

huguesdevimeux · 2020-07-20T19:24:48Z

I didn’t follow this PR at all. Is it ready ?

NavpreetDevpuri · 2020-07-21T12:10:10Z

I didn’t follow this PR at all. Is it ready ?

I think it will work.
But i didn't tested it by myself. I installed new copy of windows and manim's development environment is deleted. I will test it myself.

Aathish04 · 2020-08-01T16:14:47Z

I didn’t follow this PR at all. Is it ready ?

I think it will work.
But i didn't tested it by myself. I installed new copy of windows and manim's development environment is deleted. I will test it myself.

@NavpreetDevpuri I'm so sorry for taking way too much time to respond. There are two things that I think need to be done before this is ready to merge:

a) Format the code via black,
b) Fix merge conflicts between your branch and master.

Once these are resolved, I think we'll be ready to merge.

NavpreetDevpuri · 2020-08-03T10:25:52Z

I tested it and it works fine for me. But i am using 3b1b/manim
Here are some outputs

Code

class Test6(Scene):
    def construct(self):
        t = Paragraph('this is a awesome', 'paragraph', 'With \nNewlines', '\tWith Tabs', '  With Spaces',
                      'With Alignments',
                      'center', "left", "right", line_spacing=0.3, size=1, alignment="left", t2c={"Tabs": RED})
        self.play(t.shift, RIGHT)
        t.__len__()
        self.play(t.set_color, RED)
        t.set_line_alignment("left", 8)
        t.set_line_alignment("right", 9)
        self.play(t.set_all_lines_alignments, "right")
        t[0][5].set_color(GREEN)
        t[0][6].set_color(GREEN)
        t[1][0:4].set_color(YELLOW)
        rect = SurroundingRectangle(t)
        self.add(t, rect)
        self.wait()

Output

Code

class test15(Scene):
    def construct(self):
        helloworldc = Code(
            "helloworldc.c",
            tab_width=4,
            background_stroke_width=1,
            background_stroke_color=WHITE,
            insert_line_no=True,
            style=Code.styles_list[4],
            background="window",
        )
        helloworldcpp = Code(
            "helloworldcpp.cpp",
            tab_width=4,
            background_stroke_width=1,
            background_stroke_color=WHITE,
            insert_line_no=True,
            style=Code.styles_list[15],
            background="window",
        )
        helloworldc.move_to(np.array([-3.6, 0, 0]))
        helloworldcpp.move_to(np.array([3.1, 0, 0]))
        self.add(helloworldc)
        self.play(Transform(remove_invisible_chars(helloworldc),
                            remove_invisible_chars(helloworldcpp)))
        helloworldc[2][0:4].set_color(RED)
        self.play(Transform(helloworldc[0], helloworldcpp[0]),
                  Transform(helloworldc[1], helloworldcpp[1]),
                  Transform(helloworldc[2], helloworldcpp[2]))
        self.wait()

Output

NavpreetDevpuri · 2020-08-03T11:02:11Z

I am correcting some bugs so that it also works for manim-community.
In CodeMobject.py file, Should i check for file in assets\codes\ ? Or should i just need to ask user to specify a direct link to file ?

Is following correct ?

NavpreetDevpuri · 2020-08-03T11:12:14Z

You guys removed conts from Constants.py !
Let me correct text_mobject.py

Aathish04 · 2020-08-03T11:12:54Z

I am correcting some bugs so that it also works for manim-community.
In CodeMobject.py file, Should i check for file in assets\codes\ ? Or should i just need to ask user to specify a direct link to file ?

What asset is Code() looking for? In general, I think it's better to use the assets directory like you have done here, but others may have some other thoughts...

NavpreetDevpuri · 2020-08-03T11:15:10Z

What asset is Code() looking for? In general, I think it's better to use the assets directory like you have done here, but others may have some other thoughts...

Its looking for specified file helloworldc = Code("helloworldc.c",...etc. The way i did that so, we can specify a direct link to file or just a name of the file that we already copied in assets\codes

NavpreetDevpuri · 2020-08-03T11:34:55Z

Now tested with manim-community and it works fine 😃

leotrs · 2020-08-03T13:20:25Z

@NavpreetDevpuri thank you for the update. The tests are failing. Could you please check to see what's the problem?

NavpreetDevpuri · 2020-09-02T18:29:14Z

I reformated all files locally and when I run command git status it shows no differences!

NavpreetDevpuri · 2020-09-02T18:32:38Z

I tried to reformate this file with black in visual studio and it does not change according to what these checks suggesting
and I cross-checked it's black formatter

leotrs · 2020-09-02T18:37:49Z

I tried to reformate this file with black in visual studio and it does not change according to what these checks suggesting

Hi @NavpreetDevpuri thanks for looking into this again :) Have you made sure to update your version of black? It recently changed from version 19 to version 20. Also, don't worry too much about the black check, it has been failing for a few days now.

If you do find you have to update your black version PLEASE do not run black on the whole codebase and push those changes on this PR. If necessary, run black only on the files you are editing on this PR.

@Aathish04 @huguesdevimeux please merge this even without black check passing :)

huguesdevimeux · 2020-09-02T18:43:54Z

Yes, black tests failing are ok for now as this will be changed soon.

Let me know when you think you're done with this PR. We are just waiting @PgBiel aproval, and then we can merge !

NavpreetDevpuri · 2020-09-02T18:46:07Z

I did my best. I checked/tested/changed/rechecked/tested... until I feel That's almost perfect

Aathish04 · 2020-09-03T03:26:40Z

Marking as ready for review!

Review Outdated.

PgBiel

There's still a long way to go regarding docs. Please read the guidelines in our Wiki.

manim/mobject/svg/code_mobject.py

manim/mobject/svg/text_mobject.py

PgBiel · 2020-09-03T16:23:27Z

manim/mobject/svg/code_mobject.py

 from pygments.formatters.html import HtmlFormatter
+from pygments.styles import get_all_styles
+
+"""


Shouldn't this be in Code's documentation?

now I added it to the documentation but I did not, because this seems like Extra?

manim/mobject/svg/text_mobject.py

manim/mobject/svg/code_mobject.py

manim/mobject/svg/text_mobject.py

Co-authored-by: Pg Biel <[email protected]>

leotrs · 2020-09-15T00:48:49Z

This has been open for 2 months and the only thing that seems to be blocking the final merge is documentation. @NavpreetDevpuri do you think you have time to work on the documentation suggestions left by @PgBiel ?

Otherwise, we should just merge as is and worry about documenting this module later.

NavpreetDevpuri · 2020-09-15T12:21:14Z

@NavpreetDevpuri do you think you have time to work on the documentation suggestions left by @PgBiel ?

I was busy with something. I am a little weak in the documentation, I mean it takes more time for me to do simple documentations

let me try.

NavpreetDevpuri

This has been open for 2 months and the only thing that seems to be blocking the final merge is documentation. @NavpreetDevpuri do you think you have time to work on the documentation suggestions left by @PgBiel ?

Otherwise, we should just merge as-is and worry about documenting this module later.

I did almost what I can do. so, we should merge it after a little review. we can improve documentation in other PR. this PR created mainly for fixing very big bugs.

manim/mobject/svg/code_mobject.py

NavpreetDevpuri · 2020-09-15T13:06:39Z

manim/mobject/svg/code_mobject.py

 from pygments.formatters.html import HtmlFormatter
+from pygments.styles import get_all_styles
+
+"""


now I added it to the documentation but I did not, because this seems like Extra?

manim/mobject/svg/text_mobject.py

leotrs · 2020-09-15T15:34:07Z

Thanks @NavpreetDevpuri for doing what you can about the documentation. There is just one instance that I would like to have sorted out and then we can merge this. See my comments above.

leotrs · 2020-09-15T16:19:45Z

I see you removed that last thing - is there anything else you wish to do before we merge this? @NavpreetDevpuri

NavpreetDevpuri · 2020-09-15T16:23:40Z

@leotrs sir, all clear for now.

NavpreetDevpuri added 3 commits July 12, 2020 15:19

Update text_mobject.py

7bef92b

Update code_mobject.py

8511972

Update constants.py

280d0ca

This was referenced Jul 12, 2020

Fixed Some bugs of code_mobject.py and Text_mobject.py #90

Closed

Fixed Some bugs of code_mobject.py and Text_mobject.py 3b1b/manim#1071

Closed

Aathish04 requested changes Jul 12, 2020

View reviewed changes

NavpreetDevpuri added 3 commits July 12, 2020 15:50

Update constants.py

1102c71

Update text_mobject.py

aa4d6a8

Update code_mobject.py

9d8eaa5

safinsingh requested a review from Aathish04 July 13, 2020 20:37

Aathish04 added pr:bugfix Bug fix for use in PRs solving a specific issue:bug documentation Improvements or additions to documentation enhancement Additions and improvements in general labels Jul 18, 2020

Merge branch 'master' into Fixed-some-bugs

f675ec8

NavpreetDevpuri added 2 commits August 3, 2020 17:03

🤘 fixed for manim-community

3475557

🤘 fixed for manim-community

72942d5

NavpreetDevpuri added 3 commits August 3, 2020 19:20

🤘 fixed for manim-community

e9b9109

🤘 fixed for manim-community

c8af3cc

🤘 fixed for manim-community

729e9b0

Aathish04 marked this pull request as ready for review September 3, 2020 03:26

Aathish04 requested a review from huguesdevimeux September 3, 2020 03:26

PgBiel requested changes Sep 3, 2020

View reviewed changes

NavpreetDevpuri and others added 2 commits September 3, 2020 22:05

Update manim/mobject/svg/code_mobject.py

9752a92

Co-authored-by: Pg Biel <[email protected]>

Update manim/mobject/svg/code_mobject.py

a41b7ac

Co-authored-by: Pg Biel <[email protected]>

huguesdevimeux added Changes requested and not yet done and removed test requested Implementation of tests are requested labels Sep 9, 2020

NavpreetDevpuri added 4 commits September 15, 2020 18:31

Update code_mobject.py

311b507

🤘 fixed for manim-community

b32483c

🤘 fixed for manim-community

8a9f7e8

🤘 fixed for manim-community

3241479

NavpreetDevpuri commented Sep 15, 2020

View reviewed changes

NavpreetDevpuri added 5 commits September 15, 2020 21:21

🤘 fixed for manim-community

7594ee5

🤘 fixed for manim-community

41cf5db

🤘 fixed for manim-community

60ee9eb

🤘 fixed for manim-community

a97950d

🤘 fixed for manim-community

606fa1d

leotrs merged commit 1f02ae0 into ManimCommunity:master Sep 15, 2020

Fixed Some bugs of code_mobject.py and Text_mobject.py #198

Fixed Some bugs of code_mobject.py and Text_mobject.py #198

Uh oh!

Conversation

NavpreetDevpuri commented Jul 12, 2020

Uh oh!

Aathish04 left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

NavpreetDevpuri commented Jul 12, 2020

Uh oh!

huguesdevimeux commented Jul 20, 2020

Uh oh!

NavpreetDevpuri commented Jul 21, 2020

Uh oh!

Aathish04 commented Aug 1, 2020

Uh oh!

NavpreetDevpuri commented Aug 3, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Code

Output

Code

Output

Uh oh!

NavpreetDevpuri commented Aug 3, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

NavpreetDevpuri commented Aug 3, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Aathish04 commented Aug 3, 2020

Uh oh!

NavpreetDevpuri commented Aug 3, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

NavpreetDevpuri commented Aug 3, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

leotrs commented Aug 3, 2020

Uh oh!

NavpreetDevpuri commented Sep 2, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

NavpreetDevpuri commented Sep 2, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

leotrs commented Sep 2, 2020

Uh oh!

huguesdevimeux commented Sep 2, 2020

Uh oh!

NavpreetDevpuri commented Sep 2, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Aathish04 commented Sep 3, 2020

Uh oh!

PgBiel left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

PgBiel Sep 3, 2020

Choose a reason for hiding this comment

Uh oh!

NavpreetDevpuri Sep 15, 2020

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

leotrs commented Sep 15, 2020

Uh oh!

NavpreetDevpuri commented Sep 15, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

NavpreetDevpuri left a comment

Aathish04 left a comment •

edited

Loading

NavpreetDevpuri commented Aug 3, 2020 •

edited

Loading

NavpreetDevpuri commented Aug 3, 2020 •

edited

Loading

NavpreetDevpuri commented Aug 3, 2020 •

edited

Loading

NavpreetDevpuri commented Aug 3, 2020 •

edited

Loading

NavpreetDevpuri commented Aug 3, 2020 •

edited

Loading

NavpreetDevpuri commented Sep 2, 2020 •

edited

Loading

NavpreetDevpuri commented Sep 2, 2020 •

edited

Loading

NavpreetDevpuri commented Sep 2, 2020 •

edited

Loading

NavpreetDevpuri commented Sep 15, 2020 •

edited

Loading

leotrs commented Sep 15, 2020 •

edited

Loading