Commit Graph

243 Commits

Author SHA1 Message Date
John M. Penn
60097a3931 Fix rendering of conditional equations in SIM_aircraft. 2023-04-18 12:43:54 -05:00
Mrockwell2
aed99ab1fd
SIM_aircraft Waypoint Update (#1466)
* Set up a waypoint system that reads waypoints from an input file.

On branch aircraftUpdate
Changes to be committed:
    new file:   trick_sims/SIM_aircraft/Modified_data/default.waypoints
	modified:   trick_sims/SIM_aircraft/RUN_test/input.py
	modified:   trick_sims/SIM_aircraft/models/Aircraft/include/Aircraft.hh
	modified:   trick_sims/SIM_aircraft/models/Aircraft/src/Aircraft.cpp
	modified:   trick_sims/SIM_aircraft/models/graphics/src/trick/AircraftDisplay.java

* Fixed the Segmentation Fault and completed the waypoint configuration.

On branch aircraftUpdate
Changes to be committed:
	modified:   trick_sims/SIM_aircraft/RUN_test/input.py
	modified:   trick_sims/SIM_aircraft/models/Aircraft/include/Aircraft.hh
	modified:   trick_sims/SIM_aircraft/models/Aircraft/src/Aircraft.cpp

* Created README.md to document recent changes

* Adding in ability to set icons for waypoints.
  On branch aircraftUpdate_WaypointIcons
  Changes to be committed:
	modified:   trick_sims/SIM_aircraft/Modified_data/default.waypoints
	new file:   trick_sims/SIM_aircraft/images/CompassRose.png
	new file:   trick_sims/SIM_aircraft/images/Figure1.png
	new file:   trick_sims/SIM_aircraft/images/Figure2.png
	new file:   trick_sims/SIM_aircraft/images/cheese_64x64.png
	new file:   trick_sims/SIM_aircraft/images/mouse_128x128.png
	new file:   trick_sims/SIM_aircraft/images/strawberry_64x64.png
	new file:   trick_sims/SIM_aircraft/images/twoWheelRover.png
	new file:   trick_sims/SIM_aircraft/images/wp0.png
	new file:   trick_sims/SIM_aircraft/images/wp1.png
	new file:   trick_sims/SIM_aircraft/images/wp10.png
	new file:   trick_sims/SIM_aircraft/images/wp11.png
	new file:   trick_sims/SIM_aircraft/images/wp2.png
	new file:   trick_sims/SIM_aircraft/images/wp3.png
	new file:   trick_sims/SIM_aircraft/images/wp4.png
	new file:   trick_sims/SIM_aircraft/images/wp5.png
	new file:   trick_sims/SIM_aircraft/images/wp6.png
	new file:   trick_sims/SIM_aircraft/images/wp7.png
	new file:   trick_sims/SIM_aircraft/images/wp8.png
	new file:   trick_sims/SIM_aircraft/images/wp9.png
	modified:   trick_sims/SIM_aircraft/models/graphics/src/trick/AircraftDisplay.java

* Reformatted the README file

* Updating the build process to use Maven

* Updating the README file

* Finalized the implementation for adding icons for each waypoint.

* Removed commented code that will not be used.

* Updated the SIM_aircraft documentation to include the waypoint icon implementation.

* Created a menu bar for the GUI

* Minor README fix and file cleanup

* Implemented a view menu to hide and show the info on the map

* Cleared out commented code.

* Last minute code cleanup and update of the documentation.

* Updated the View menu with more options and updated documentation.

* Testing basic Variable Server Client usage.

* Waypoints shared from sim to graphics client.
Need to use list and fix some formatting.

* Refactored and simplified Waypoint implementation

* Documentation and comment updates

* Simplified waypoint structure
Implemented file support in graphics client

* Updated Documentation

* Created a default waypoint icon when unspecified

* Fixed privacy issues in the WaypointList class

* Cleaned up unnecessary file and added comments
2023-04-13 10:50:36 -05:00
John M. Penn
539989469c Fix sprintf problem in SIM_sun. #1464 2023-03-01 14:45:23 -06:00
Mrockwell2
29fb20c2eb
SIM_aircraft Graphics Client View Menu (#1457)
* Set up a waypoint system that reads waypoints from an input file.

On branch aircraftUpdate
Changes to be committed:
    new file:   trick_sims/SIM_aircraft/Modified_data/default.waypoints
	modified:   trick_sims/SIM_aircraft/RUN_test/input.py
	modified:   trick_sims/SIM_aircraft/models/Aircraft/include/Aircraft.hh
	modified:   trick_sims/SIM_aircraft/models/Aircraft/src/Aircraft.cpp
	modified:   trick_sims/SIM_aircraft/models/graphics/src/trick/AircraftDisplay.java

* Fixed the Segmentation Fault and completed the waypoint configuration.

On branch aircraftUpdate
Changes to be committed:
	modified:   trick_sims/SIM_aircraft/RUN_test/input.py
	modified:   trick_sims/SIM_aircraft/models/Aircraft/include/Aircraft.hh
	modified:   trick_sims/SIM_aircraft/models/Aircraft/src/Aircraft.cpp

* Created README.md to document recent changes

* Adding in ability to set icons for waypoints.
  On branch aircraftUpdate_WaypointIcons
  Changes to be committed:
	modified:   trick_sims/SIM_aircraft/Modified_data/default.waypoints
	new file:   trick_sims/SIM_aircraft/images/CompassRose.png
	new file:   trick_sims/SIM_aircraft/images/Figure1.png
	new file:   trick_sims/SIM_aircraft/images/Figure2.png
	new file:   trick_sims/SIM_aircraft/images/cheese_64x64.png
	new file:   trick_sims/SIM_aircraft/images/mouse_128x128.png
	new file:   trick_sims/SIM_aircraft/images/strawberry_64x64.png
	new file:   trick_sims/SIM_aircraft/images/twoWheelRover.png
	new file:   trick_sims/SIM_aircraft/images/wp0.png
	new file:   trick_sims/SIM_aircraft/images/wp1.png
	new file:   trick_sims/SIM_aircraft/images/wp10.png
	new file:   trick_sims/SIM_aircraft/images/wp11.png
	new file:   trick_sims/SIM_aircraft/images/wp2.png
	new file:   trick_sims/SIM_aircraft/images/wp3.png
	new file:   trick_sims/SIM_aircraft/images/wp4.png
	new file:   trick_sims/SIM_aircraft/images/wp5.png
	new file:   trick_sims/SIM_aircraft/images/wp6.png
	new file:   trick_sims/SIM_aircraft/images/wp7.png
	new file:   trick_sims/SIM_aircraft/images/wp8.png
	new file:   trick_sims/SIM_aircraft/images/wp9.png
	modified:   trick_sims/SIM_aircraft/models/graphics/src/trick/AircraftDisplay.java

* Reformatted the README file

* Updating the build process to use Maven

* Updating the README file

* Finalized the implementation for adding icons for each waypoint.

* Removed commented code that will not be used.

* Updated the SIM_aircraft documentation to include the waypoint icon implementation.

* Created a menu bar for the GUI

* Minor README fix and file cleanup

* Implemented a view menu to hide and show the info on the map

* Cleared out commented code.

* Last minute code cleanup and update of the documentation.

* Updated the View menu with more options and updated documentation.
2023-02-21 10:49:00 -06:00
Mrockwell2
28d5ecfa84
SIM_aircraft Waypoint Update (#1453)
* Set up a waypoint system that reads waypoints from an input file.

On branch aircraftUpdate
Changes to be committed:
    new file:   trick_sims/SIM_aircraft/Modified_data/default.waypoints
	modified:   trick_sims/SIM_aircraft/RUN_test/input.py
	modified:   trick_sims/SIM_aircraft/models/Aircraft/include/Aircraft.hh
	modified:   trick_sims/SIM_aircraft/models/Aircraft/src/Aircraft.cpp
	modified:   trick_sims/SIM_aircraft/models/graphics/src/trick/AircraftDisplay.java

* Fixed the Segmentation Fault and completed the waypoint configuration.

On branch aircraftUpdate
Changes to be committed:
	modified:   trick_sims/SIM_aircraft/RUN_test/input.py
	modified:   trick_sims/SIM_aircraft/models/Aircraft/include/Aircraft.hh
	modified:   trick_sims/SIM_aircraft/models/Aircraft/src/Aircraft.cpp

* Created README.md to document recent changes

* Adding in ability to set icons for waypoints.
  On branch aircraftUpdate_WaypointIcons
  Changes to be committed:
	modified:   trick_sims/SIM_aircraft/Modified_data/default.waypoints
	new file:   trick_sims/SIM_aircraft/images/CompassRose.png
	new file:   trick_sims/SIM_aircraft/images/Figure1.png
	new file:   trick_sims/SIM_aircraft/images/Figure2.png
	new file:   trick_sims/SIM_aircraft/images/cheese_64x64.png
	new file:   trick_sims/SIM_aircraft/images/mouse_128x128.png
	new file:   trick_sims/SIM_aircraft/images/strawberry_64x64.png
	new file:   trick_sims/SIM_aircraft/images/twoWheelRover.png
	new file:   trick_sims/SIM_aircraft/images/wp0.png
	new file:   trick_sims/SIM_aircraft/images/wp1.png
	new file:   trick_sims/SIM_aircraft/images/wp10.png
	new file:   trick_sims/SIM_aircraft/images/wp11.png
	new file:   trick_sims/SIM_aircraft/images/wp2.png
	new file:   trick_sims/SIM_aircraft/images/wp3.png
	new file:   trick_sims/SIM_aircraft/images/wp4.png
	new file:   trick_sims/SIM_aircraft/images/wp5.png
	new file:   trick_sims/SIM_aircraft/images/wp6.png
	new file:   trick_sims/SIM_aircraft/images/wp7.png
	new file:   trick_sims/SIM_aircraft/images/wp8.png
	new file:   trick_sims/SIM_aircraft/images/wp9.png
	modified:   trick_sims/SIM_aircraft/models/graphics/src/trick/AircraftDisplay.java

* Reformatted the README file

* Updating the build process to use Maven

* Updating the README file

* Finalized the implementation for adding icons for each waypoint.

* Removed commented code that will not be used.

* Updated the SIM_aircraft documentation to include the waypoint icon implementation.

* Minor README fix and file cleanup
2023-02-13 16:45:15 -06:00
John M. Penn
917cd84dfc Merge branch 'master' of https://github.com/nasa/trick 2023-02-01 14:46:42 -06:00
John M. Penn
2b308bd89c Add README to SIM_aircraft. 2023-02-01 14:46:14 -06:00
jmpenn
4879bcfc51
Use Maven to build AircraftDisplay.jar instead of directly from Makefile. (#1435) 2023-01-24 17:19:19 -06:00
jmpenn
1b2203b867
Merge Sim aircraft into master (#1429)
* Initial commit of SIM_aircraft

* Add SIM_aircraft variable server client  (#1394)

* Add control panel

* Remove comments

* Add Makefile

Co-authored-by: Zero Nelson <zeronelson13@gmail.com>

Co-authored-by: zeronelson <95947013+zeronelson@users.noreply.github.com>
Co-authored-by: Zero Nelson <zeronelson13@gmail.com>
2023-01-18 11:49:09 -06:00
Cody Martin
3870dc73b6
Improve tutorial documentation (#1408) 2022-12-02 14:55:40 -06:00
Jacqueline Deans
d9e7ac250d
Refactored sim tests to run through TrickOps (#1390) 2022-11-17 15:43:29 -06:00
Jacqueline Deans
f84c744a65
Add .class files to sim directory gitignore [no ci] 2022-11-17 08:42:47 -06:00
jmpenn
2a03ff5cf4
Replace sprintf with snprintf in all of Trick source. #1384 (#1392)
* Replace sprintf with snprintf in all of Trick source. #1384

* Don't add -Werror for MacOS because of deprecated sprintf warnings which we cant get rid of because SWIG. #1384

* Fixed an unbalanced parenthesis in S_overrides.mk. #1384
2022-11-15 15:00:05 -06:00
Jacqueline Deans
9c8799610f
Variable Server - var_send_once and integration test (#1330)
* Adds the send_once command and message type, which allows a user to request a variable to be sent immediately and only once (intended to replace the var_add, var_send, var_clear idiom that is commonly used for this purpose)
* Minor refactoring of variable server internals to reduce repeated code
* Adds SIM_test_varserv to integration test to test basic variable server functionality
* Changes graphics client for SIM_billiards to use var_send_once as an example of intended use
* Add documentation for var_send_once in docs and tutorial
* Set exit_code_enabled in trick unit tests to be true by default
* Patch for failing bookworm build
2022-08-18 10:47:07 -05:00
John M. Penn
36416c1973 Refactoring of CrewModule Graphics client in SIM_splashdown #1322 2022-07-27 16:07:50 -05:00
Scott Fennell
2dd12fcbb6
#1315 parse websocket msg len for correct data (#1316)
closes #1315
2022-07-27 08:40:40 -05:00
Jacqueline Deans
b69475175d Minor improvement to SIM_billiards 2022-07-20 15:56:02 -05:00
Jacqueline Deans
790ec56816
Merge pull request #1306 from nasa/1299-sim-pool
Trick Billiards Simulation (#1299)
2022-07-20 11:37:13 -05:00
Jacqueline Deans
ff18faf6dc Refactor graphics client to run in a single thread; remove extraneous files 2022-07-14 16:07:14 -05:00
Deans
ad5be89c4a Adding fully function simulation 2022-07-14 11:05:56 -05:00
Deans
8537601ccb Saving working state 2022-07-14 09:17:00 -05:00
Jacqueline Deans
b869f851f5 Add progress on SIM_pool 2022-07-01 09:40:37 -05:00
Scott Fennell
866c21d5a5
include freeze time tics in calculation for websocket data intervals (#1296) 2022-06-28 17:20:50 -05:00
John M. Penn
54b86cfb74 Stop ignoring makefile inside SIM_balloon/models/graphics directory. 2022-06-23 16:48:10 -05:00
John M. Penn
2b5735328f Add gitignore to stop ignoring makefiles. 2022-06-23 16:36:34 -05:00
John M. Penn
b962f692ef fix BalloonDisplay pom file, and SIM_balloon input file. 2022-06-23 15:45:36 -05:00
John M. Penn
e8d40d4f07 Build BalloonDisplay with Maven. 2022-06-22 18:18:23 -05:00
John M. Penn
76e94c6dcb Fix broken links in SIM_splashdown README.md. #1289 2022-06-17 10:53:36 -05:00
John M. Penn
4dcae748c8 Improvements to SIM_splashdown code while writing documentation. #1289 2022-06-16 18:44:49 -05:00
John M. Penn
dc4c91d69f Add documentation to example simulation: SIM_splashdown #1289 2022-06-16 18:27:20 -05:00
John M. Penn
ae55e7f5ab Update input files to be happy with Python 3. #1280 #706 2022-06-02 15:46:38 -05:00
John M. Penn
9e0be47b46 Tidy up the SIM_splashdown graphics client. #1266 2022-05-24 16:16:58 -05:00
John M. Penn
03dd6bd313 Tidy up dynamics code and GUI client. #1266 2022-05-21 23:56:25 -05:00
John M. Penn
3171c71cb7 Change graphics client build message. #1266 2022-05-20 15:31:07 -05:00
John M. Penn
7747b53ea1 Initial commit of SIM_splashdown. #1266 2022-05-20 15:20:45 -05:00
Alex Lin
496de8c7a9
Disambiguate python use #1250 (#1251)
* Disambiguate python use #1250

Changed all calls to /usr/bin/python to /usr/bin/env python3.  Removed execute permissions on a lot of files that are not executable.

closes #1250
2022-03-22 15:15:40 -05:00
jmpenn
2d32abf047
Update README.md 2022-02-28 15:41:28 -06:00
John M. Penn
273ffcfd87 SIM_fibonacci_time demonstrates how to schedule an automatic job. #1235 2022-02-28 15:39:32 -06:00
John M. Penn
f073142066 Update SIM_balloon free body diagram. #1213 2022-01-13 10:21:22 -06:00
John M. Penn
62355d54f4 Update SIM_balloon with Wind. #1213 2022-01-12 13:41:04 -06:00
John M. Penn
4418fe034c Update pictures for SIM-ballopn. #1210 2022-01-05 12:25:35 -06:00
John M. Penn
2ea49268d7 Fix subscript on coeff of drag in Balloon sim README. #1210 2021-12-21 12:22:33 -06:00
John M. Penn
b162862e6b Edits to SIM_balloon README. #1210 2021-12-19 23:46:05 -06:00
John M. Penn
ed43069e66 Updates to SIM_balloon README. #1210 2021-12-18 17:01:59 -06:00
John M. Penn
cc2419d81e Update SIM_balloon README. #1210 2021-12-18 00:37:00 -06:00
John M. Penn
4b3379130e Add README to Balloon sim. #1210 2021-12-17 22:39:05 -06:00
John M. Penn
b643296fd8 Hot-air balloon simulation. #1210 2021-12-17 16:03:43 -06:00
Penn, John M 047828115
8657acb3dc Fix inclusion of CivetServer.h. #1188 2021-10-19 13:41:42 -05:00
Penn, John M 047828115
5b3770d15a Fix civetweb header inclusion problem. #1188 2021-10-18 11:32:33 -05:00
Penn, John M 047828115
e487e5609f Initial excision of DMTCP from Trick. #28 2021-08-27 19:38:56 -05:00