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

Jump to bottom

more Fixes #26

Merged
merged 13 commits into from Aug 21, 2020
Merged

more Fixes #26

merged 13 commits into from Aug 21, 2020

Conversation

JuiP
Copy link
Member

@JuiP JuiP commented May 12, 2020

Tested till commit 369f664.
Will work on more improvements

@quozl
Copy link
Contributor

quozl commented May 14, 2020

Looks right. Not tested.

@JuiP
Fixed errors in elements.py
6851220 
- variables (like tuple,etc) were defined as callable
- Fix attribute errors
@Hrishi1999
Copy link

Tested. Fixes #24. I think the activity shouldn't log costs, feels cluttered. What do you say?

@JuiP
Copy link
Member Author

JuiP commented May 15, 2020

Thanks for testing @Hrishi1999 :)

I think the activity shouldn't log costs, feels cluttered. What do you say?

Yes I agree, I think it was added in the intitial versions for debugging. Also I was looking at Saving and resuming from Journal, it is a lot of work. I had started working, you can have a look at commit 8e32650 . In the commit description I had mentioned few known bugs not fixed in the commit. I would continue working on it, but I was wondering since there are a lot of changes to the activity already, we can include saving data to Journal changes in another release. What do you think @Hrishi1999 @quozl @chimosky ?

@JuiP JuiP marked this pull request as ready for review May 15, 2020 09:29
@Hrishi1999
Copy link

Not sure, we could wait for you to complete save to journal feature for the next release. @quozl @chimosky what do you suggest?

@chimosky
Copy link
Member

What do you think @Hrishi1999 @quozl @chimosky ?

I agree with @Hrishi1999, we'll wait for you to finish with it.

@JuiP JuiP mentioned this pull request May 18, 2020
Open
@quozl
Copy link
Contributor

quozl commented May 20, 2020

Costs were added for competition in classroom learning environments. It is so that a teacher can choose the cheapest winning design. http://wiki.laptop.org/go/Bridge says "Joints and girders have associated costs. The cost of your bridge is shown in the top right of the display. Try and build the cheapest bridge that you can."

For saving and resuming, the Physics activity is the most relevant code example. As an alternative, an obvious screenshot to journal button could be added. Sugar already has this as alt+1.

srevinsaju and others added 11 commits August 20, 2020 19:54
@srevinsaju @JuiP
Merge physics/myelements to bridge/myelements
d4d7253
@srevinsaju @JuiP
Rename input to input_unit (upstream/physics)
b689df4 
Merge necessary changess from physics/elements/add_object

get_color -> private function (upstream/physics)

Rewrite read and write world data parser function

Add a conditional to serialize json output if asked for
@srevinsaju @JuiP
Provide the self activity as args
d0c618d
@srevinsaju @JuiP
Add some imports
4d449a3
@srevinsaju @JuiP
Select appropriate lines of physics (upstream) __init__
8583a93 
Copied to Bridge/physics __init__
@srevinsaju @JuiP
Rewrite the opening queue function to parse written data shapes
4cf4378
@srevinsaju @JuiP
Re-add the read_file() and write_file() methods to match the position…
0056108 
… on physics (upstream)

Add method to set box2d fps (physics/upstream)

Reorder joystick object definition

Reorder toollist initialization
@srevinsaju @JuiP
Reorder imports
4e0b73c
@JuiP
Fix Import error
346b705
@JuiP
Save to Journal
fef11d8 
- Add support for saving cost to journal

- Saves Shapes to Journal
@JuiP
Fix Stress Ratio after resuming from journal
5417448
@JuiP
Copy link
Member Author

JuiP commented Aug 20, 2020

Fixes #23 : This issue is blocking release and this activity has a lot of changes since the last release.
@quozl @chimosky @srevinsaju Please review and merge 😄

@quozl
Copy link
Contributor

quozl commented Aug 21, 2020

Thanks. Reviewed. Tested.

@quozl quozl merged commit cc6147c into sugarlabs:master Aug 21, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@JuiP @quozl @Hrishi1999 @chimosky @srevinsaju