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.

Sign up for GitHub

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

Sprint 2 Release #146

Merged
merged 225 commits into from Mar 11, 2024
Merged

Sprint 2 Release #146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
225 commits
Select commit Hold shift + click to select a range
8d2fb3c
Update README.md
pwfreedm Feb 13, 2024
2612571
Merge pull request #66 from mucsci-students/readme-updates
AdamG-L Feb 13, 2024
931be47
DO NOT MERGE
pwfreedm Feb 16, 2024
1409da6
DO NOT MERGE
pwfreedm Feb 16, 2024
f331823
Setup Tools Build Structure, first implementation.
timbmoser Feb 18, 2024
2b575d7
Basic updates:
pwfreedm Feb 18, 2024
396e5e3
new folder for generated text files
pwfreedm Feb 18, 2024
42f28be
moved tests into src
pwfreedm Feb 18, 2024
2b494c9
Merge pull request #101 from mucsci-students/Build_Package
almostTaklu Feb 18, 2024
da9eece
Minor test updates. Most passing as is.
timbmoser Feb 20, 2024
d43a763
Merge pull request #102 from mucsci-students/Old_Test_Formatting
pwfreedm Feb 20, 2024
225d6a8
Progress towards Methods and Fields.
timbmoser Feb 21, 2024
f609884
DO NOT COMMIT
pwfreedm Feb 21, 2024
337018b
Parser and Lexer are Split
pwfreedm Feb 21, 2024
a577c6b
Test updates
pwfreedm Feb 21, 2024
0767f4a
Merge pull request #103 from mucsci-students/parser
timbmoser Feb 21, 2024
224660a
Bugfixes
pwfreedm Feb 21, 2024
bc6b7e1
Merge branch 'develop' into bugfixes
pwfreedm Feb 21, 2024
6e78612
Merge pull request #104 from mucsci-students/bugfixes
timbmoser Feb 21, 2024
d1e44b2
Merge branch 'develop' into Method_and_Field
pwfreedm Feb 21, 2024
31c2121
Method and Field implemented
timbmoser Feb 22, 2024
ecefe01
Merge pull request #106 from mucsci-students/Method_and_Field
AdamG-L Feb 22, 2024
7fa3554
Added relationship type
almostTaklu Feb 22, 2024
e2bfebd
Add Exceptions for parameter operations
DierF Feb 22, 2024
435dab3
Add add/remove/change operations for parameter
DierF Feb 22, 2024
ee26560
Change method documentation
DierF Feb 22, 2024
5dd5e57
Optimized restore process to preserve order if change operation should
DierF Feb 22, 2024
2a738d6
Merge pull request #107 from mucsci-students/parameter
pwfreedm Feb 22, 2024
41b0c33
Parser and Lexer updates
pwfreedm Feb 23, 2024
57e0fb1
Merge branch 'develop' into parser
pwfreedm Feb 23, 2024
f6361b1
Merge pull request #108 from mucsci-students/parser
AdamG-L Feb 23, 2024
05785e7
Moving GUI to main project
AdamG-L Feb 23, 2024
86035a3
Merge branch 'develop' of https://github.com/mucsci-students/2024sp-4…
AdamG-L Feb 23, 2024
e65e6ef
removing init issue
AdamG-L Feb 23, 2024
de1b576
remove potato
AdamG-L Feb 23, 2024
474d12e
Update main.py
pwfreedm Feb 23, 2024
5bfced6
Merge pull request #109 from mucsci-students/gui
pwfreedm Feb 23, 2024
99990e2
Test for basic functionality of existing things.
timbmoser Feb 23, 2024
9cea474
Merge branch 'develop' into Building_Tests
timbmoser Feb 23, 2024
4cc1833
Refactors
pwfreedm Feb 23, 2024
66d5f61
Merge branch 'develop' into refactoring
pwfreedm Feb 23, 2024
9ef86f3
Merge pull request #110 from mucsci-students/Building_Tests
pwfreedm Feb 23, 2024
c4837ce
Adding multi lists within class card
AdamG-L Feb 23, 2024
024aa88
Commented out gui start
AdamG-L Feb 23, 2024
fccc9cd
Merge pull request #111 from mucsci-students/refactoring
AdamG-L Feb 23, 2024
85262ea
Merge branch 'develop' into gui
AdamG-L Feb 23, 2024
0e22407
Merge pull request #112 from mucsci-students/gui
pwfreedm Feb 23, 2024
6a99b00
Name Changes and GUI Controller Update
pwfreedm Feb 23, 2024
a542790
Merge pull request #113 from mucsci-students/refactoring
AdamG-L Feb 23, 2024
e7b18e2
Finished relationType
almostTaklu Feb 23, 2024
228faf1
Update CLI lexer command and function maps
almostTaklu Feb 23, 2024
f327c98
Resolved conflicts
almostTaklu Feb 23, 2024
a3f851e
Fixed test_imports, added test_help
pwfreedm Feb 23, 2024
55d739c
Fixing style of cards
AdamG-L Feb 23, 2024
5bfd505
Class Card add fields funct.
AdamG-L Feb 23, 2024
07f5c4b
Passing a widget through the signal
AdamG-L Feb 23, 2024
9184427
Add comments to gui_controller
AdamG-L Feb 24, 2024
538b218
Documented view_gui
AdamG-L Feb 24, 2024
6bc416b
Documented class_card
AdamG-L Feb 24, 2024
39db203
List functionality working based on current implementations.
timbmoser Feb 24, 2024
fb85a7a
Fixed two failing tests. Added additional tests for new files.
timbmoser Feb 24, 2024
e4e09e2
Merge pull request #117 from mucsci-students/Fixing_Tests
pwfreedm Feb 25, 2024
e0aca1b
Merge pull request #116 from mucsci-students/List_Updates
pwfreedm Feb 25, 2024
8fbe50b
Merge branch 'develop' into relationType
almostTaklu Feb 25, 2024
16f7c70
Merge pull request #115 from mucsci-students/gui
pwfreedm Feb 25, 2024
2f5504a
Made some request changes
almostTaklu Feb 25, 2024
5f159e4
Merge branch 'develop' into relationType
almostTaklu Feb 25, 2024
1ad4a26
fixed requested changes
almostTaklu Feb 25, 2024
e72d64d
Merge pull request #114 from mucsci-students/relationType
pwfreedm Feb 25, 2024
1610d42
Bugfixes
pwfreedm Feb 25, 2024
2964dd3
removed two parens
pwfreedm Feb 25, 2024
401cc47
Merge branch 'develop' into tests
pwfreedm Feb 25, 2024
559aa06
Merge pull request #119 from mucsci-students/tests
AdamG-L Feb 25, 2024
e608fdf
Merge branch 'develop' into bugfixes
AdamG-L Feb 25, 2024
e30004b
Merge pull request #118 from mucsci-students/bugfixes
AdamG-L Feb 25, 2024
22a249b
Generalized click method
AdamG-L Feb 25, 2024
f71bcf5
Method Functionality (TODO Commented out)
AdamG-L Feb 25, 2024
7178652
Commented relation impl.
AdamG-L Feb 25, 2024
e9e67ea
Redirect save/load folder to the root directory of the project
DierF Feb 25, 2024
ec00a04
Not sure why the lib64 folder is never ignored by git, ignore .venv
DierF Feb 25, 2024
a446021
Help Menu Updates
timbmoser Feb 25, 2024
ba487ce
Merge pull request #120 from mucsci-students/Updating_Help
AdamG-L Feb 25, 2024
60b8174
Refactor serialize function
DierF Feb 26, 2024
943c8e5
Refactor deserializer
DierF Feb 26, 2024
19e1136
Remove debug code
DierF Feb 26, 2024
fb25e94
Add _example.json as a save file example
DierF Feb 26, 2024
6ff8838
Fix bugs of deserializer loading source/destination as str instead of
DierF Feb 26, 2024
67f8066
Build Script
pwfreedm Feb 26, 2024
35f6b7d
Merge branch 'develop' into build_sys
pwfreedm Feb 26, 2024
94acd21
Merge branch 'develop' into save/load
pwfreedm Feb 26, 2024
06ed73e
Merge pull request #121 from mucsci-students/save/load
pwfreedm Feb 26, 2024
8609777
Merge pull request #122 from mucsci-students/build_sys
almostTaklu Feb 26, 2024
e361f37
obligatory DO NOT COMMIT
pwfreedm Feb 26, 2024
58c639b
Adding edit functionality to individual text rows
AdamG-L Feb 26, 2024
750cf3c
Enabling itterative menu management
AdamG-L Feb 26, 2024
8051645
STILL NOT WORKING
pwfreedm Feb 26, 2024
cd8282c
Added edit detection of selected object
AdamG-L Feb 26, 2024
c3c70cd
List updates
pwfreedm Feb 26, 2024
9804c5d
Updated pytest for relationship
almostTaklu Feb 27, 2024
e3ca371
Delete src/test/test_relation.py
pwfreedm Feb 27, 2024
a616412
Partial work towards Param hookup, and fixing parsing issues.
timbmoser Feb 27, 2024
03a07a4
Fully functioning Add Field and Edit Field
AdamG-L Feb 27, 2024
8c49c25
Added delete functionality
AdamG-L Feb 27, 2024
04e1aee
Commented out main
AdamG-L Feb 27, 2024
3fe799d
Merge branch 'develop' into gui
AdamG-L Feb 27, 2024
51a0b83
Removed Duplicate Method
pwfreedm Feb 27, 2024
a0502d2
Merge pull request #123 from mucsci-students/refactoring_again
timbmoser Feb 27, 2024
6c8c65e
Merge branch 'develop' into relationPytest
pwfreedm Feb 27, 2024
1997fba
Updated contains tests
pwfreedm Feb 27, 2024
761eda9
Merge pull request #124 from mucsci-students/relationPytest
pwfreedm Feb 27, 2024
3ac3e23
Merge branch 'develop' into gui
pwfreedm Feb 27, 2024
1c35532
Merge branch 'develop' into Param_Hookup
pwfreedm Feb 27, 2024
aa5ace4
NOT WORKING
pwfreedm Feb 27, 2024
08997fc
Removed edit_field (and related files) / Extended functionality on re…
AdamG-L Feb 27, 2024
ff5be56
Merge branch 'gui' of https://github.com/mucsci-students/2024sp-420-C…
AdamG-L Feb 27, 2024
1322b36
Merge pull request #125 from mucsci-students/gui
pwfreedm Feb 27, 2024
7070c6c
Removing most debugging prints
AdamG-L Feb 27, 2024
1471076
Updated help menu to include Params and updated phrasings.
timbmoser Feb 27, 2024
7f66b9b
Add relation functionality
AdamG-L Feb 27, 2024
9d46b71
Fixed Issue with relation allowing more than one type at a time
AdamG-L Feb 27, 2024
428abff
Working edit command for relations
AdamG-L Feb 28, 2024
d1078c4
Escape key now deletes active row
AdamG-L Feb 28, 2024
45f40b8
Adding specialized deleting
AdamG-L Feb 28, 2024
355eba3
Working add and edit relation
AdamG-L Feb 28, 2024
c91b685
Merge pull request #126 from mucsci-students/param_help
pwfreedm Feb 28, 2024
c68d0ff
Escape functionality Debugged
AdamG-L Feb 28, 2024
5c2c9a5
Commented out mainGUI()
AdamG-L Feb 28, 2024
c898fb1
Added comments to methods
AdamG-L Feb 28, 2024
837e11a
Merge branch 'develop' into gui
AdamG-L Feb 28, 2024
b1baa58
Merge pull request #127 from mucsci-students/gui
almostTaklu Feb 28, 2024
5c95e67
Restructured Escape functionality to either delete a new row or retur…
AdamG-L Feb 28, 2024
c569b84
Making add method menu
AdamG-L Feb 28, 2024
ffeac15
Working widow dimensions, class card spawning, and max size
AdamG-L Feb 29, 2024
ab7d33f
comment out main
AdamG-L Feb 29, 2024
79deb4c
Merge branch 'develop' into gui
AdamG-L Feb 29, 2024
b689e15
NOT WORKING
pwfreedm Feb 29, 2024
da9d7dc
WORKING
pwfreedm Feb 29, 2024
86e2ec9
Merge branch 'develop' into Param_Hookup
pwfreedm Feb 29, 2024
2b48a2a
Merge pull request #128 from mucsci-students/gui
pwfreedm Feb 29, 2024
e56e15f
Bugfixes
pwfreedm Feb 29, 2024
2509a24
Merge branch 'develop' into Param_Hookup
pwfreedm Feb 29, 2024
fffcb12
Update help param change to reflect the |
timbmoser Feb 29, 2024
5ef0bfd
Test Updates
pwfreedm Feb 29, 2024
f0e7df1
Merge pull request #129 from mucsci-students/Param_Hookup
AdamG-L Feb 29, 2024
75c33ad
Merge pull request #130 from mucsci-students/param_help
AdamG-L Feb 29, 2024
7ba4444
Merge branch 'develop' into tests
pwfreedm Feb 29, 2024
0d2528e
Oops
pwfreedm Feb 29, 2024
37365ef
Reworked some of the tests in test_diagram to have them run with Pytest.
timbmoser Mar 1, 2024
f61195f
Merge pull request #131 from mucsci-students/tests
AdamG-L Mar 1, 2024
029bef0
Added entity equals test, and added an extra assert to test_set_name …
timbmoser Mar 1, 2024
c6c7591
Reworked some of the tests in test_diagram to have them run with Pytest.
timbmoser Mar 1, 2024
6ac80f3
Added entity equals test, and added an extra assert to test_set_name …
timbmoser Mar 1, 2024
dda2b61
Mostly reorganized so I could see if things were missing.
timbmoser Mar 1, 2024
a4bf2f7
Merge branch 'Building_Tests' of https://github.com/mucsci-students/2…
timbmoser Mar 1, 2024
e61fb12
Merge branch 'develop' into Building_Tests
timbmoser Mar 1, 2024
1b636b6
Merge branch 'Building_Tests' of https://github.com/mucsci-students/2…
timbmoser Mar 1, 2024
83196bb
Add equals for method test and param tests
timbmoser Mar 1, 2024
a4003b4
Fix self-relation error in Diagram class
almostTaklu Mar 1, 2024
d820c10
Merge branch 'develop' into classGUI
almostTaklu Mar 1, 2024
512ec30
Update help_command.py
almostTaklu Mar 1, 2024
0433400
Merge pull request #134 from mucsci-students/classGUI
timbmoser Mar 1, 2024
b055079
Main Chooses between GUI, debug, CLI correctly
pwfreedm Mar 1, 2024
f1eefe0
Merge pull request #133 from mucsci-students/Building_Tests
pwfreedm Mar 1, 2024
82a2ff0
Fixed the y/N prompt in the build system
pwfreedm Mar 1, 2024
c20d6cd
Build script no longer prompts y/N on rebuild
pwfreedm Mar 1, 2024
cea925e
Deleting legacy test infrastructure
pwfreedm Mar 1, 2024
7a07bb2
Merge branch 'develop' into build_sys
pwfreedm Mar 1, 2024
258010b
Partially Redone Readme
pwfreedm Mar 1, 2024
744e851
Readme updates
pwfreedm Mar 1, 2024
6f70bb3
final readme changes
pwfreedm Mar 1, 2024
b9392e3
probably final help menu updates
pwfreedm Mar 1, 2024
d50f6a9
Merge pull request #136 from mucsci-students/tests
timbmoser Mar 1, 2024
53345f0
Merge branch 'develop' into main_updates
timbmoser Mar 1, 2024
ed445e1
Merge pull request #135 from mucsci-students/main_updates
timbmoser Mar 1, 2024
619466f
stupid hyperlinks in lists
pwfreedm Mar 1, 2024
d2153a0
minor format improvements
pwfreedm Mar 1, 2024
8acb41c
be on separate lines pls
pwfreedm Mar 1, 2024
84fbffb
hi
pwfreedm Mar 1, 2024
ffa2d9b
Merge branch 'develop' into readme
pwfreedm Mar 1, 2024
c6131c6
removed unnecessary asset
pwfreedm Mar 1, 2024
fa78ab1
added line about testing
pwfreedm Mar 1, 2024
883b84a
Merge branch 'develop' into build_sys
timbmoser Mar 1, 2024
a6fe72f
Merge pull request #137 from mucsci-students/build_sys
timbmoser Mar 1, 2024
ecaca01
Merge pull request #138 from mucsci-students/readme
almostTaklu Mar 1, 2024
3d1bbf0
Add delete functionality to GUI controller and view
almostTaklu Mar 1, 2024
36a4b91
Merge pull request #139 from mucsci-students/deleteClass
AdamG-L Mar 1, 2024
9dd37b6
Added method and param functionality
AdamG-L Mar 1, 2024
e2e6f72
Debugging method/params
AdamG-L Mar 1, 2024
976ae0c
Fix issues of add_method_and_params taking any # of params
DierF Mar 1, 2024
f9a2d11
Added delete method functionality
AdamG-L Mar 1, 2024
44230b9
Working edit/add method
AdamG-L Mar 1, 2024
59452fd
Fix save/load due to change of entities(dict to list)
DierF Mar 1, 2024
fcb60db
Fix save(not saving relations correctly) and add gui save support
DierF Mar 1, 2024
a85713f
Add gui load feature
DierF Mar 1, 2024
4c7cab3
delete uneeded test files
DierF Mar 1, 2024
f79ce35
Add gui exit feature
DierF Mar 1, 2024
4d3c7c6
Add gui display help information feature
DierF Mar 1, 2024
1e2b7a2
Merge pull request #140 from mucsci-students/gui_save/load/exit
AdamG-L Mar 1, 2024
1f7564c
Added rename functionality
AdamG-L Mar 2, 2024
6535396
Merge pull request #141 from mucsci-students/gui
DierF Mar 2, 2024
bebe68e
Adding Tests
timbmoser Mar 3, 2024
da23ee7
Test_imports Model test updates
timbmoser Mar 3, 2024
bec0678
Finished rounding out test_imports.
timbmoser Mar 3, 2024
90c57d2
Updated Test_diagram
timbmoser Mar 3, 2024
ff5be34
Merge pull request #142 from mucsci-students/Building_Tests
DierF Mar 3, 2024
3f2d451
Simplify loading relation's source/destination
DierF Mar 3, 2024
581b9a3
Update __eq__ of Relation to check if types are equal
DierF Mar 3, 2024
06a465f
Remove uneeded import
DierF Mar 3, 2024
28ac0ae
Fix bugs of storing all parameters as one list instead of list of
DierF Mar 3, 2024
ea452d8
Add tests for serializer
DierF Mar 3, 2024
b64a014
Add more tests for serializer
DierF Mar 3, 2024
d7fcb1d
cleanup serialize function
DierF Mar 3, 2024
7e19c20
Cleanup deserialize function(can't make it as clean as serialize
DierF Mar 3, 2024
aad36be
Fix Relations equivalence check in add_relation
DierF Mar 3, 2024
94a05e9
Merge pull request #143 from mucsci-students/save/load
AdamG-L Mar 3, 2024
d810e59
Fix bugs of add_paramter change state of diagram even if failed
DierF Mar 3, 2024
08be775
Merge branch 'develop' into parameter
DierF Mar 3, 2024
f63d8d7
Add duplicate checks for parameter operations
DierF Mar 3, 2024
b42c13a
Merge pull request #144 from mucsci-students/parameter
pwfreedm Mar 3, 2024
0f9ccc3
Cleanup main.py and update readme
DierF Mar 4, 2024
22f740c
Merge branch 'develop' into cleanup
DierF Mar 4, 2024
c6177ba
Update operation option constrains
DierF Mar 4, 2024
539da3f
Merge branch 'develop' into cleanup
DierF Mar 4, 2024
3c2e8e3
Merge branch 'cleanup' of https://github.com/mucsci-students/2024sp-4…
DierF Mar 4, 2024
f9d43d0
Merge pull request #145 from mucsci-students/cleanup
pwfreedm Mar 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
30 changes: 29 additions & 1 deletion .gitignore
View file
Open in desktop
@@ -1,2 +1,30 @@
#generic excludes
__pycache__
*.test
*.test
*.egg-info
*.vscode

#Venv directories and files
Lib/
Scripts/
Include/
venv.cfg
pyvenv.cfg

#Linux venv directories
.venv/
bin/
include/
lib/
lib64/

#Build directories and files
build/
dist/
main.spec

#pytest
.pytest_cache

#Macos specifics
.DS_Store
255 changes: 0 additions & 255 deletions Controller.py
View file
Open in desktop

This file was deleted.