Commit graph

283 commits

Author SHA1 Message Date
Huy Pham
ea341cbe45 set the initial directory of executing python scripts to HOME_PATH/scripts 2020-03-02 14:08:11 -08:00
Huy Pham
9cd6166b9b use varaibles that represent smallest and largest allowed scale value to replace float numbers 2020-03-02 11:20:00 -08:00
Huy Pham
58cb5a1a1d add a scrollbar next to scale entry to allow scale adjustment in increments of a specific value (since the Scale Slider widget does not support this) 2020-03-02 11:02:54 -08:00
Huy Pham
933f409498 adjust node text and edge text to scale not as fast as other components 2020-03-02 10:18:37 -08:00
Huy Pham
b0a3c85f0e allow editable scale field for manually setting the app scale value 2020-03-02 09:56:57 -08:00
Huy Pham
a7fa0bf6d3 use a bigger size font for alert button text to see the scaling effect more easily 2020-03-02 09:17:35 -08:00
Huy Pham
dfc24e107f use grpc method to execute python script, redraw canvas and reset session data 2020-03-02 09:01:03 -08:00
Huy Pham
848cda03f7 design execute python file dialog 2020-02-27 15:24:36 -08:00
Huy Pham
1cba11d9e0 clean up more code, click defaults in service configuration correctly reset files tab as well as directories tab 2020-02-27 10:57:22 -08:00
Huy Pham
c36f060d44 fixed wrong variable used for configuring service in grpcutils, add/delete directories for node's service configuration, clean up some old code 2020-02-26 15:43:31 -08:00
Huy Pham
764a61e89e create layout for service config - directory tab 2020-02-26 10:43:01 -08:00
Huy Pham
696fda00ea add/delete custom service file to node 2020-02-26 08:31:28 -08:00
Huy Pham
41bb951531 Merge branch 'develop' into coretk-enhance/disable-editing-during-runtime 2020-02-25 11:39:50 -08:00
Huy Pham
014707580f allow custom service file to be created 2020-02-25 11:38:58 -08:00
Huy Pham
8a0257d130 disable copy/paste/delete shortcuts as well as commands during runtime state 2020-02-24 12:51:47 -08:00
Huy Pham
7a50f6ac25 replace hasattr with getattr for cleaner code 2020-02-24 11:24:59 -08:00
Huy Pham
1dca477e6d disable delete, copy, paste during runtime 2020-02-24 11:17:06 -08:00
Huy Pham
ddaba7c477 remove code for deleting wireless links and nodes during runtime 2020-02-24 10:58:01 -08:00
Huy Pham
04d7bb6265 Merge branch 'develop' into coretk-enhance/add-more-error-dialog 2020-02-24 10:33:37 -08:00
Huy Pham
3a2da0282f display error dialog when start session fails 2020-02-20 15:46:18 -08:00
Huy Pham
2a8f689ad5 remove extra code 2020-02-20 11:26:48 -08:00
Huy Pham
e90eff578e reset variable 2020-02-20 11:16:26 -08:00
Huy Pham
08d4bf98c7 fix merge conflict, add a logging error to temporarily solve issue removing a wireless link when multiple wireless links exist 2020-02-20 10:47:59 -08:00
Huy Pham
20be527add remove extra code 2020-02-20 10:02:13 -08:00
Huy Pham
23aeb40f54 display the range while configuring wlan node 2020-02-19 13:22:52 -08:00
Huy Pham
d8f586bd2b add wireless network variable to CanvasGraph that maps a wireless/EMANE node to all MDRs connected to it 2020-02-18 15:58:18 -08:00
Huy Pham
08e652633f support wireless link deletion during runtime 2020-02-18 13:59:23 -08:00
Huy Pham
b3dabbfe05 delete wireless links on canvas during runtime 2020-02-18 10:33:49 -08:00
Huy Pham
87c9492d32 scale antenna and mobility player buttons 2020-02-17 15:14:52 -08:00
Huy Pham
1d911a763f scale custom node icon and custom node drawn on canvas 2020-02-17 12:56:19 -08:00
Huy Pham
4fd1338cf1 save application scale to gui configuration, and draw everything to the correct saved scale when starting the application 2020-02-17 11:10:13 -08:00
Huy Pham
b7116c52ff Merge branch 'develop' into coretk-enhance/scaling 2020-02-17 09:27:37 -08:00
Blake Harnden
ebafa228ff added files/directories to grpc set_node_service 2020-02-14 13:40:10 -08:00
Huy Pham
0ea99ca809 scale edge text font (ipv4 and ipv6 address, scale edge, scale node when first drawn on canvas and when joining session 2020-02-14 13:34:00 -08:00
Huy Pham
55b6cbbd90 sacle toolbar button after choosing a node from node picker, scale canvas nodes and canvas node text 2020-02-13 12:15:56 -08:00
Huy Pham
9cd756f2dc fix merge conflict 2020-02-12 14:16:17 -08:00
Huy Pham
3a466fd463 remove custom size for custom style so that text can scale, scale the remaining node icons from the node picker, scale node's name 2020-02-12 14:13:28 -08:00
Huy Pham
b4bf3ee391 remove unecessary print statement and remove commented code 2020-02-12 08:39:10 -08:00
Huy Pham
7fbbfa8c63 scale font 2020-02-12 08:35:14 -08:00
Huy Pham
8734b9f22f attempt adding scaling function to the gui 2020-02-10 15:20:07 -08:00
Huy Pham
80f47a5d4c Merge branch 'develop' into coretk-enhance/error-dialog 2020-02-05 15:56:15 -08:00
Huy Pham
ee0c63e4a1 change some variable names to be more informative, add an image to error dialog 2020-02-05 15:53:14 -08:00
Huy Pham
0407645061 replace tkinter errormessage with custom create error dialog 2020-02-05 15:09:33 -08:00
Huy Pham
6bb1d5cba2 add a new data to track the most recently opened/saved files, and update recent files menu as the recent files change 2020-02-04 13:49:46 -08:00
Huy Pham
e2fba18ba5 fix merge conflict 2020-02-04 13:05:08 -08:00
Huy Pham
bdbf5fac61 add recent files to gui.yaml for keeping track of recent files 2020-02-04 13:00:00 -08:00
Blake Harnden
3846f2b5bd removed hard coded example recent files 2020-02-04 10:03:10 -08:00
bharnden
26a03cc758
Merge pull request #364 from coreemu/coretk-enhance/fix-bug
Coretk enhance/fix bug
2020-02-04 09:53:48 -08:00
Huy Pham
6140ebfb59 remove unnecessary loggings 2020-02-03 12:18:29 -08:00
Huy Pham
60dd7691bf remove unecessary loggings, change less important loggings to logging.debug 2020-02-03 12:01:10 -08:00
Huy Pham
034d126a2a remove unnecessary comment 2020-02-03 10:53:24 -08:00
Huy Pham
875739e748 track nodes whose services have been modified by the user to differentiate between newly created nodes and default type nodes with empty services 2020-02-03 10:35:25 -08:00
Huy Pham
ede9e93b52 add a menu option for opening recent files, hard code some example xml files for testing 2020-02-03 09:10:46 -08:00
Huy Pham
09397925e8 remove unnecessary loggings 2020-02-03 07:54:28 -08:00
Huy Pham
5dd379a2ee replace logging.info with logging.debug for unimportant loggings, change the functions inside type checking class into classmethods 2020-02-03 07:30:25 -08:00
Huy Pham
6c89ba1abb logging.info for more important loggings and logging.debug for less important loggings that user might not care about 2020-01-29 16:08:36 -08:00
Blake Harnden
6aa7d2175d added file logging for coretk, using a time rotating logger, added command line arg to choose coretk log level 2020-01-28 12:30:12 -08:00
bharnden
7cc52f13d6
Merge pull request #360 from coreemu/enhancement/coretk-global-ip6
updates for coretk to default to assigning global ip6 addresses
2020-01-28 11:30:33 -08:00
bharnden
c911ff4c0b
Merge pull request #359 from coreemu/coretk-fix
Coretk fix
2020-01-28 11:21:56 -08:00
Blake Harnden
cf77b3c06f updates for coretk to default to assigning global ip6 addresses 2020-01-28 10:46:40 -08:00
bharnden
c5666f9112
Merge pull request #357 from coreemu/feature/config-service
Feature/config service
2020-01-27 17:31:03 -08:00
Huy Pham
4c0254ec10 reload custom node image when open xml, if the gui doesn't know about the custom image, use a default one 2020-01-27 16:27:21 -08:00
Huy Pham
09cc65646f fix right click service on custom nodes with empty services, load services to custom node when drawn on canvas, show current services for custom node's service dialog 2020-01-27 13:20:31 -08:00
Blake Harnden
93ad6b588a updates to coretk to fix displaying boolean configs properly and updating config values for config services when changing mode 2020-01-24 12:51:57 -08:00
Blake Harnden
d7d0a55fd2 updates to support saving config services to xml, loading config services from xml, retrieving config services from coretk when joining a session 2020-01-21 17:32:12 -08:00
Blake Harnden
0ea2f73a80 added modes to config services that allows them to decide sets of configurations 2020-01-21 14:00:55 -08:00
Blake Harnden
1ca3b0e3f4 moved config values to simple service from default route, fixed coretk issue with config service config data 2020-01-21 12:04:22 -08:00
Blake Harnden
80a4955bd4 updated coretk to working order for configuring config services from coretk 2020-01-21 11:58:43 -08:00
Blake Harnden
da107cc1d9 updates to config services dialogs in coretk, initial working state for running config services from the coretk gui 2020-01-21 10:35:46 -08:00
Blake Harnden
83e7853821 fixed protobuf generation to avoid grpc generation for files with no definitions, added service config tab display to coretk 2020-01-20 16:25:56 -08:00
Huy Pham
b3463f1fb7 set SessionsDialog treeview's current selection again so that deleting multiple sessions is a bit more convenient 2020-01-20 16:17:27 -08:00
Huy Pham
b6f68e0b06 destroy any mobility player dialog before joinning a different session, pass in old_session_id to Menuaction.cleanup_old_session() so that the old session is deleted rather than the new one 2020-01-20 16:01:46 -08:00
Blake Harnden
a4f3abf27c updated config service grpc to return default templates and config, added logic to check for local custom templates 2020-01-20 15:54:47 -08:00
Blake Harnden
7b5df11dc7 added files to config services, added default logic for creating files from templates, added new method to provide extra data to templates, updated gui to display templates raw 2020-01-20 15:02:04 -08:00
Huy Pham
b0087bbde1 add nodeutils function to get node's image, add a function to get edge token 2020-01-20 14:04:31 -08:00
Blake Harnden
9447ddb94f initial changes to add config services to coretk gui 2020-01-20 12:17:11 -08:00
Huy Pham
510252c4a7 change terminal command 2020-01-20 12:04:10 -08:00
Huy Pham
cded9ef630 canvas wallpaper 2020-01-20 09:11:43 -08:00
Huy Pham
845198efc6 remove print statements 2020-01-17 16:05:34 -08:00
Huy Pham
88625ffad8 fix Ctrl-S issue and node context menu issue 2020-01-17 15:59:12 -08:00
bharnden
ea47217e94
Merge pull request #347 from coreemu/coretk-fix
Coretk fix
2020-01-16 11:08:39 -08:00
Blake Harnden
f4ddf310a8 removed rtype and param typing from doc strings to help avoid maintaining duplicate information provided by type hints 2020-01-16 11:00:57 -08:00
Huy Pham
5c087141bd fix merge conflict 2020-01-15 15:27:33 -08:00
Huy Pham
084b25779b differentiate sessions dialog's between start gui vs open from menu, add delete button to sessions dialog, remove fix width in TMenubutton for dark theme 2020-01-15 15:23:49 -08:00
Blake Harnden
d83fd2d035 update to place the terminal command in quotes 2020-01-15 14:02:59 -08:00
Huy Pham
6ecffc465b wrap up coretk type hinting 2020-01-15 12:59:54 -08:00
Huy Pham
c1c580cdc4 type hint for new small update 2020-01-15 10:55:29 -08:00
bharnden
41bf279f76
Merge pull request #342 from coreemu/enhancement/disable-grpc-client-proxy
Enhancement/disable grpc client proxy
2020-01-14 22:17:33 -08:00
Blake Harnden
d4bce0d25c updated grpc client to have a proxy flag, updated coretk script to have a flag to enable proxy, disabled by default 2020-01-14 22:15:00 -08:00
Huy Pham
948a33f201 edit some parts where pycharm gives warning on type hint 2020-01-14 14:30:08 -08:00
Huy Pham
8a4ad41a47 fix merge conflict 2020-01-14 14:08:41 -08:00
Huy Pham
a0c04c0809 type hinting 2020-01-14 14:02:37 -08:00
Huy Pham
c22f1680f7 more type hinting, remove some Optional type, and fix a small bug at dialogs.nodeconfig.mac_auto() 2020-01-14 11:59:44 -08:00
Huy Pham
6c8a2526d9 -m 2020-01-14 11:06:52 -08:00
Huy Pham
b9b8e3a5f1 more on python type hint 2020-01-13 15:31:41 -08:00
Huy Pham
eb5f2c5648 more on type hinting, remove unecessary function comments 2020-01-13 12:03:13 -08:00
Huy Pham
7bbd6aa353 type hint 2020-01-10 16:22:21 -08:00
Huy Pham
a8a0255624 type hint some files 2020-01-10 15:32:16 -08:00
Huy Pham
853d2828fe add temp service file path 2020-01-09 15:31:35 -08:00
Huy Pham
2a7a22c2ee change logging.warn to logging.warning 2020-01-09 13:10:45 -08:00
Huy Pham
3ef87a97d5 remove extra function 2020-01-09 10:12:00 -08:00
Huy Pham
41ae67b559 copy service config from other node 2020-01-09 08:54:15 -08:00
Huy Pham
55adce231e copy other nodes' custom service configuration 2020-01-08 16:48:04 -08:00
Huy Pham
c402ce5284 allow choosing local host machine interface for rj45 node 2020-01-08 09:32:39 -08:00
Huy Pham
1e6e3f0958 some clean up 2020-01-07 15:30:19 -08:00
Huy Pham
be0f170f89 add a button to more conveniently remove a node's service 2020-01-07 15:05:05 -08:00
Huy Pham
6105439ae4 color custom services green 2020-01-07 13:36:04 -08:00
Huy Pham
3ad1af8d1d enable default button in service configuration 2020-01-07 12:32:45 -08:00
Huy Pham
9369bd27b4 copy link config 2020-01-06 14:20:20 -08:00
Blake Harnden
3e87737ee6 updates to use tk after for backgrounded tasks, also added background task convenience class for running something in the background and running a callback using tk.after when done 2019-12-30 16:34:44 -08:00
Blake Harnden
dd43fae62a updated icons and added icon attribution to about dialog 2019-12-30 00:00:36 -08:00
Blake Harnden
ff7909e97a removed old icons 2019-12-29 23:23:35 -08:00
Blake Harnden
2be0713ed1 updated so that throughputs will update link color/width based on threshold 2019-12-27 00:32:10 -08:00
Blake Harnden
5dd08c283a updated throughput dialog to load and set values from graph class 2019-12-26 21:32:30 -08:00
Blake Harnden
3512eedc60 small tweaks to throughput config dialog 2019-12-26 14:00:22 -08:00
Blake Harnden
6d68034177 updated start proto to return exception strings, updated grpc start session to exist early when a failure is found, updated coretk ui to not switch ui to running when start fails and display error dialog 2019-12-20 15:11:34 -08:00
Blake Harnden
5639aeab75 Merge branch 'develop' of https://github.com/coreemu/core into develop 2019-12-20 13:31:32 -08:00
Huy Pham
684cb26c5c Merge branch 'develop' of https://github.com/coreemu/core into develop 2019-12-20 11:57:04 -08:00
Huy Pham
e4b44d08c1 create a rough layout for throughput config dialog 2019-12-20 11:56:51 -08:00
Blake Harnden
9f3a3cef28 update coretk gui to allow proper cancel when there is an attempt to exit a running session 2019-12-20 11:56:48 -08:00
Blake Harnden
513eaf2b76 improved coretk gui alerts to display alert text when selected, fixed merged code for adding a check to cleanup interfaces, updated session.exceptions to use enums directly 2019-12-20 10:51:52 -08:00
Huy Pham
086e3316eb copy over wlan config, emane, mobility config, service config, service file config 2019-12-20 09:55:30 -08:00
Blake Harnden
a7e243ae53 update coretk-gui to use configured terminal when double clicking nodes 2019-12-19 21:28:48 -08:00
Huy Pham
9a506fc35f Merge branch 'develop' into coredev-painttool 2019-12-19 16:16:18 -08:00
Huy Pham
c1755afb2f copy node and links 2019-12-19 16:15:29 -08:00
Blake Harnden
793d340668 removed mock from setup.py.in as its not needed in python3, added formal script to run coretk gui and remove main line from core/gui/app.py 2019-12-19 11:32:59 -08:00
Huy Pham
395f8134dc adjust alert table size 2019-12-19 11:30:27 -08:00
Huy Pham
5f9a227fac Merge branch 'develop' into coredev-painttool 2019-12-19 11:14:44 -08:00
Huy Pham
f6c02973c1 fix merge conflict 2019-12-19 11:12:45 -08:00
Blake Harnden
105825808d fixed edge refactoring issue when finding next subnet 2019-12-19 11:10:08 -08:00
Huy Pham
5a81adc653 some fix one paint tool 2019-12-19 10:58:22 -08:00
Blake Harnden
05d3b58c5f updating dialog based classes to have dialog in name 2019-12-19 09:50:58 -08:00
Blake Harnden
0b5c94778c moved coretk under daemon/core/gui 2019-12-19 09:30:21 -08:00