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

Journal Entry Zac #37

Open
Zachary-Ronayne opened this issue Sep 8, 2020 · 12 comments
Open

Journal Entry Zac #37

Zachary-Ronayne opened this issue Sep 8, 2020 · 12 comments

Comments

@Zachary-Ronayne
Copy link
Collaborator

Week of September 7, 2020
• Made use cases for interacting with the simulation
• Looked into, and experimented with Two.js and using .svg images for the graphics component of the simulation
• In a similar vain as Two.js, looked into P5.js, and decided it would work better for our purposes
• Created a demo in P5.js, which was two beakers of differing sizes, loaded from an image file, which could be clicked and dragged around the screen
Issues:
#36
#34
#31
#29
#25
#22
#21
#19
#7
#6

@Zachary-Ronayne
Copy link
Collaborator Author

Week of September 14, 2020
• Worked on creating UML diagram and revising it, I created the UML diagram while, as a group, we discussed what would be added
• Set up the initial files for displaying graphics for the simulation
• Created the base files for the system of abstraction for experiment objects

@Zachary-Ronayne
Copy link
Collaborator Author

Week of September 21, 2020
• Set up unit testing for Javascript code
• Created test cases for all existing Javascript code
• Added mouse input for moving objects around in the simulation

@Zachary-Ronayne
Copy link
Collaborator Author

Zachary-Ronayne commented Sep 29, 2020

Week of September 28, 2020
• Created system for mixing chemicals in beakers
• Chemicals can be transferred between beakers, combine colors, and leave residue #7
• Create system to automatically run instructions for the simulation
• Added and refined unit tests for all code
• Chemicals accurately display their contents graphically
• Commits:
c438e26
e472681
4f224b7
fbd63a9
aaa187b
e154a5b
9f40b96
845c4ea
b04bacb
34b8d54
d9e199d
2463015
7cd3bd1
8a176ff
99ccec2
24d5ec6
63e0217
836a667
a7eb6a5
9436479
eb6dff5
299e601
479bbc0
75e41bf
366c1ba
0ba9dbf
bd24079
8c26f7c
6fe204e

@Zachary-Ronayne
Copy link
Collaborator Author

Zachary-Ronayne commented Oct 6, 2020

Week of October 5, 2020
• Planned out formatting for backend sending data to front end to create objects for the experiment simulator
• Set up simulator for general interaction, rather than just a beaker demo
#25 (comment)
#19 (comment)
• Equipment is now listed at the bottom of the simulator, and can be clicked and dragged into the simulator, as well as clicked and dragged around while in the simulator
• Created test cases for all new and modified code
• Commits:
86d4ec0
d8a4eb8
b8ef0a9
e8a578a
5803712
6f9f8fa
48d7564
275af4b
d2018da
f2e4147
efada87
9ba564d
0208f8b
32496db

@Zachary-Ronayne
Copy link
Collaborator Author

Zachary-Ronayne commented Oct 13, 2020

Week of October 12, 2020
• Linked simulator to the home page, and home page to simulator
• Allowed custom Experiments to be loaded into the simulator through JSON files, rather than only having one hard coded simulation
• Created parser to convert Experiments into JSON files, allowing the front end to send files to the backend which could be parsed and saved to the database
• Improved abstraction of simulator objects, instanceID is now handled automatically
• Reworked test cases to use a beforeAll method, allowing for more efficient testing
• Commits:
f2834b1
52a15ca
f2f98fd
cd2d4a6
15d46b5
1a18dd5
734f17e
288aa17
ac0c471
46b50f8
de1df0a
a803cfd
e53f6b2
95c7bae
455ca6f
7e97b1b
61fdd55
f6c346e
2ea090f

@Zachary-Ronayne
Copy link
Collaborator Author

Week of October 19, 2020
• Added chemicals which can be displayed and selected to be added to beakers
6ae11dc
2f7be1b
ef6e74e
• Added multiple sizes of beakers, and made them more practical to create
3b19cfd
• Added camera panning
c3ed1d6
a776a16
a9be4eb
f370f86
• Equipment now can be updated each frame
4156afd
• Refined mouse and key input methods
f1924c0
2ab7b42

@Zachary-Ronayne
Copy link
Collaborator Author

Week of October 26, 2020
• Reworked containers so that they can hold a variable amount of chemicals
1d29718
• Added trashcan which can dispose of chemicals
54d12a7
87f0b98
e63a741
• Reworked actors acting on receivers, allowing any object to perform any interaction with any object. If the interaction cannot take place, nothing happens.
180d6ef
91f5a06
fe0caa8
5937544
92adfad
• Fixed scale class to add to the simulation correctly, and display the mass of a container placed on the scale
094a18a
19c0c43
3a04889
• Fixed Erlenmeyer flask and graduated cylinder classes, making them work with the simulation
812c771
• Fixed rendering images to work with variable sizes, and added proper graphics for each new piece of equipment
c1ed51a
8decc4d
f159eb2
62f17a5
• Added base code for system to handle chemical interactions
bb38370
8084d08
3b7ff26

@Zachary-Ronayne
Copy link
Collaborator Author

Week of November 1, 2020
• Made chemicals use the new system for handling chemical interactions
1c90204
24a1be8
9c31689
7379e0d
• Added various elements and compounds to the simulation
f51b253
49ff02b
• Updated graphics, enabling multiple chemicals for display
bcfb520
b4e3682
bb7cd8f
• Fixed functionality and rendering of Erlenmeyer flask graduated cylinder
57da16d
cc47148
5e55715
• Added stir rod
483ad67
fbd0efd
52a70a1
• Added proper scale functionality, zeroing out, removing equipment from scale
bb78930
dab4f44
• Created lab 3A from the gen chem book
27dbc93
• When equipment is needed via an instruction, it is now automatically added to the simulation
af89358
• Forced equipment to stay inside experiment bounds
25b1292
• Allowed equipment to function without a receiver
9be5ceb
• Added percent error to adding chemicals to containers
ce36c6a

@Zachary-Ronayne
Copy link
Collaborator Author

Week of November 8, 2020
• Improved chemical properties storage for setting them up for use in the database
e70ffe1
• Created chemical equations simulating actual chemistry actions
3982f88
a02ac14
d3ffd52
14eb6ff
de8aec1
• Containers now correctly use volume
1d4a49f
• Added missing test cases
9af6f2a

@Zachary-Ronayne
Copy link
Collaborator Author

Week of November 15
• Updated containers to fully use volume
b28d6dc
23e5518
• Chemicals can be removed in small increments, equipment now has variance in its mass
647a6a8
• Added temperature system
3ee8e35
79c8746
• Updated chemical properties to work with database formatting
ea7d943
• Added eyedropper
5ab6438
2b0052d
• Added refractometer
7fca781
b8894d4

@Zachary-Ronayne
Copy link
Collaborator Author

Week of November 22
• Added chemical solutions, i.e. salt water
db0cc32
3980705
01fc0aa
adeb20e
7a6db17
7c3726d
4f0251b
b11b71e
• Fixed issues with eye dropper and containers filling up each other
eda6202
3985eab
• Created a test file for new data sent to the database
5361afc

@Zachary-Ronayne
Copy link
Collaborator Author

Week of November 29
• Scale objects can now be removed by clicking and dragging it off of the scale, same goes for refractometer lenses
e6012f2
01b8492
• Created lab 3 part B
9e9b8f7
• Fixed bugs with containers
d9c099c
• Minor changes to rendering
4c768b7
• Game option to remove equipment placed in experiment
ee3876a
• Added a loading screen
9cf797b
• The selected actor and receiver can be swapped
7417094

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

No branches or pull requests

2 participants