Commit graph

319 commits

Author SHA1 Message Date
Huy Pham
27131ef367 start on input validation 2019-12-09 10:07:21 -08:00
Huy Pham
11f771417e Merge branch 'coretk' into coretk-servicefix 2019-12-09 08:54:53 -08:00
Huy Pham
456e331870 loading xml set canvas state to select mode and display that on toolbar 2019-12-09 08:53:54 -08:00
Blake Harnden
0308a4c8d7 fixed temp issue for dealing with xml and node positions as floats, updated shape metadata to save bold/italic/underline options and read them back from xml 2019-12-06 22:33:21 -08:00
Blake Harnden
71df2a3b7f updated annotation text to be selectable/moveable, save annotation text with other shapes and reload from xml 2019-12-06 22:10:27 -08:00
Huy Pham
2add215704 fix configuring newly added services 2019-12-06 15:06:35 -08:00
Blake Harnden
2824ae09b0 updated sample1.xml to draw shapes using new metadata logic 2019-12-06 14:18:13 -08:00
Blake Harnden
bf710b9afc merged latest from coretk 2019-12-06 14:02:57 -08:00
Blake Harnden
742eb2bed6 cleanup for shapes and creating shapes and storing and restoring shapes from metadata 2019-12-06 14:01:03 -08:00
Huy Pham
6a08bff7de Merge branch 'coretk' of https://github.com/coreemu/core into coretk 2019-12-06 12:53:45 -08:00
Huy Pham
a7d9d588ae add display throughput back to the gui 2019-12-06 12:46:00 -08:00
Blake Harnden
c238b5dfc8 moved node context services option higher for better convenience, added check that context services only shown for container nodes 2019-12-06 11:17:05 -08:00
Blake Harnden
9ef5cdd70b added basic about dialog and created codetext widget for displaying text in terminal like colors using scrolledtext widget 2019-12-06 11:13:43 -08:00
Blake Harnden
0593d0c6a2 Merge branch 'coretk' of https://github.com/coreemu/core into coretk 2019-12-06 09:43:07 -08:00
Blake Harnden
45a23a6c14 updated usage of time.time to time.monotonic or time.perf_counter due to time.time possibly rolling backwards 2019-12-06 09:42:41 -08:00
Blake Harnden
b9bbf397c9 updated node context menu option for wireless to use nodeutils 2019-12-06 09:13:58 -08:00
Huy Pham
27ead56a15 remove redundant file 2019-12-06 09:11:21 -08:00
Blake Harnden
49acac026c updates to move node context logic to node class and added check to display options the same as old core 2019-12-06 09:10:50 -08:00
Huy Pham
e832787f1c fix merge conflict 2019-12-06 09:09:05 -08:00
Huy Pham
4a34aaa30d working on shapes and texts 2019-12-06 09:03:21 -08:00
Blake Harnden
6077e81bf4 moved node/edge delete logic into their own classes for helping make them managing their own data a bit easier 2019-12-05 17:01:48 -08:00
Blake Harnden
81eeac9ec6 merged drawing antenna code to graph node class 2019-12-05 16:37:48 -08:00
Huy Pham
7e2ebb4a2c delete some extra print statement 2019-12-05 13:43:12 -08:00
Huy Pham
6a43f73940 Merge branch 'coretk' of https://github.com/coreemu/core into coretk 2019-12-05 13:40:07 -08:00
Huy Pham
a44fc0b6f9 load shapes from xml 2019-12-05 13:39:09 -08:00
Blake Harnden
6425b08878 updated graph canvas width and height to use the id it already knows of 2019-12-05 13:17:12 -08:00
Blake Harnden
7c8f9dac0f removed nodedelete module and added logic to the graph canvas itself 2019-12-05 13:13:35 -08:00
Huy Pham
c82453b981 load shapes 2019-12-05 11:15:51 -08:00
Blake Harnden
d970d5ee85 separated out graph code into more file and its own sub package 2019-12-05 11:12:25 -08:00
Huy Pham
8c30ad6af5 commit before splitting files 2019-12-05 10:39:53 -08:00
Huy Pham
6d4c437d2d Merge branch 'coretk' into coretk-shapes 2019-12-05 10:17:24 -08:00
Huy Pham
59614fa8d3 try to load canvas config 2019-12-05 10:12:31 -08:00
Blake Harnden
1de3ac9d09 Merge branch 'coretk' of https://github.com/coreemu/core into coretk 2019-12-04 16:40:41 -08:00
Blake Harnden
c7b9c7bfb4 updated sample1 xml to store all metadata in json format 2019-12-04 16:40:33 -08:00
Huy Pham
d024bdf0b7 fix small logic 2019-12-04 15:12:31 -08:00
Huy Pham
b9a5c428cc Merge branch 'coretk' of https://github.com/coreemu/core into coretk 2019-12-04 15:09:14 -08:00
Huy Pham
96d273815d support moving multiple nodes and shape 2019-12-04 15:08:05 -08:00
Blake Harnden
5aa01d9bb5 simplify some join session logic to loop over nodes once 2019-12-04 14:44:43 -08:00
Blake Harnden
5a387537bb updates clean up setting wallpaper for graph canvas, updates to read metadata for canvas to display wallpaper from loaded xml file, update to allow reopening mobility player from node context 2019-12-04 13:40:35 -08:00
Huy Pham
bbb8be6655 shape configuration, replace tunntel tool image 2019-12-04 09:28:16 -08:00
Huy Pham
41a9b88189 working on shape config 2019-12-03 17:17:45 -08:00
Huy Pham
0a26a8f8e3 shape dialog, fix move shape 2019-12-03 16:18:00 -08:00
Huy Pham
ff473b9748 shape dialog 2019-12-02 16:05:10 -08:00
Huy Pham
a0caff6ca2 fix merge conflict 2019-11-27 16:44:42 -08:00
Huy Pham
5c04225cc4 working on shape 2019-11-27 16:39:48 -08:00
Blake Harnden
6a8e0c8360 fixed app quit when grpc fails, fixed quitting when not stopping the running session 2019-11-27 16:27:53 -08:00
Blake Harnden
b30b8ab83d updated status bar text to be centered 2019-11-27 16:14:14 -08:00
Blake Harnden
693d7beeb7 updated remove antenna logic to simplify, updated wireless edges to be objects 2019-11-27 15:40:54 -08:00
Blake Harnden
3c7bf57b5c simplified select logic to check against known nodes and modified get_selected to avoid returning the canvas id 2019-11-27 14:25:29 -08:00
Huy Pham
1a05571e50 shape 2019-11-27 14:04:49 -08:00
Huy Pham
2fc8782360 shape 2019-11-27 13:58:34 -08:00
Blake Harnden
804b95d486 consolidated node move logic to one function, used by both node events and node drag 2019-11-27 13:23:45 -08:00
Huy Pham
0f6cca1194 Merge branch 'coretk' into coretk-progress 2019-11-27 13:15:57 -08:00
Huy Pham
f3ca5682ac start on shape drawing 2019-11-27 13:15:04 -08:00
Blake Harnden
d1db5e4b4e added some data for node events to have a source field to help distinguish what originates from the gui or not 2019-11-27 12:55:39 -08:00
Blake Harnden
354d227cb3 removed old service config code 2019-11-27 12:20:00 -08:00
Blake Harnden
5708dbd083 fixed issue when deleting node without a link tuple 2019-11-27 12:16:56 -08:00
Blake Harnden
554028ad5c display mobility player context for mobility configured nodes during runtime 2019-11-27 12:11:11 -08:00
Blake Harnden
9a55ff4ca5 display mobility player on session start, change buttons and progress bar on session events 2019-11-27 11:41:54 -08:00
Huy Pham
8278641cf4 Merge branch 'coretk' into coretk-progress 2019-11-27 11:21:56 -08:00
Huy Pham
d51dc0e909 canvas size 2019-11-27 11:21:03 -08:00
Huy Pham
1ca9aec247 canvas size added to preferences and updated to dialog 2019-11-27 09:54:43 -08:00
Blake Harnden
af9915191d fixed wireless link events displaying over nodes 2019-11-27 08:52:20 -08:00
Huy Pham
15e484c8c2 Merge branch 'coretk' into coretk-progress 2019-11-27 08:51:02 -08:00
Huy Pham
a4ef585865 improve small logic in node deletion and wallpaper change 2019-11-27 08:49:58 -08:00
Blake Harnden
3cd48ec1ab added pause icon and icons to mobility player buttons 2019-11-27 08:48:21 -08:00
Blake Harnden
13ca85cf3f changes to support mobility actions for mobility player dialog 2019-11-26 17:00:55 -08:00
Blake Harnden
14b01e0325 Merge branch 'coretk' of https://github.com/coreemu/core into coretk 2019-11-26 16:50:40 -08:00
Blake Harnden
2a08c770d3 updates to handle node events for moving nodes and displaying mobility player dialog on session event with configured data 2019-11-26 16:50:23 -08:00
Huy Pham
b0ea6b2530 Merge branch 'coretk' into coretk-progress 2019-11-26 15:15:42 -08:00
Huy Pham
00e0da2990 improve wireless link logic when deleting nodes, stop session and join session 2019-11-26 15:12:04 -08:00
Blake Harnden
2586a5ad6f Merge branch 'coretk' of https://github.com/coreemu/core into coretk 2019-11-26 11:33:59 -08:00
Blake Harnden
bc026bb693 initial work for mobility player dialog, added default sample1.xml to created gui directory, fixed issue with non modal dialogs 2019-11-26 11:32:48 -08:00
Huy Pham
fa7e5e321b save service config, file config when join session, update progress bar to start, stop, join session, delete antennas, wirelesslink as well as other stuff that we had before when join session 2019-11-26 11:30:25 -08:00
Huy Pham
3493b05eb4 Merge branch 'coretk' into coretk-progress 2019-11-25 16:52:19 -08:00
Huy Pham
4238c14362 progress bar for start session 2019-11-25 16:50:44 -08:00
Blake Harnden
c1a8fada7a avoid querying state for node movement, check currently known state instead 2019-11-25 15:48:41 -08:00
Blake Harnden
ad4ee58ddd properly adding change for emane node links being wireless, fixed issue when sending emane model configs when there is no interface set 2019-11-25 15:46:32 -08:00
Blake Harnden
cdc48a765a ignoring control networks on join, fixed emane links on join being wireless, fixed setting emane model being set when configuring emane 2019-11-25 15:40:09 -08:00
Blake Harnden
6fd38c4195 Merge branch 'coretk' of https://github.com/coreemu/core into coretk 2019-11-25 15:05:24 -08:00
Blake Harnden
731b586df0 fixed issue with clearing out session location for created sessions 2019-11-25 15:05:07 -08:00
Blake Harnden
e3fc318a1b linkinfo cleanup, changed text distance to be proprotionate of line distance 2019-11-25 14:52:00 -08:00
Huy Pham
a13eb2f214 Merge branch 'coretk' into coretk-progress 2019-11-25 14:10:58 -08:00
Huy Pham
4d3bde7c31 deleting node also deletes antenna 2019-11-25 14:09:41 -08:00
Blake Harnden
3d2e372663 simplified next node id logic to avoid trying to over optimize 2019-11-25 12:59:32 -08:00
Blake Harnden
1290dae4f8 simplified logic for picking next subnet, avoiding trying to optimize too early 2019-11-25 11:31:40 -08:00
Huy Pham
89dfeae07c basic status bar, node deletion also remove antenna 2019-11-25 11:23:04 -08:00
Blake Harnden
27a37c77fc made preexisting nodes a local variable, renamed reuseable to delete_nodes for more clarity 2019-11-25 09:52:50 -08:00
bharnden
4e32c9c13c updates to add reuse of deleted subnets 2019-11-22 23:48:10 -08:00
bharnden
e8f8fa3bd5 cleaned up some of the logic for deleting nodes/edges 2019-11-22 16:30:25 -08:00
bharnden
46627aad11 renamed coreclient delete graph nodes func 2019-11-22 15:43:43 -08:00
bharnden
981be3b7ff small cleanup with stopping sessions 2019-11-22 14:58:41 -08:00
Huy Pham
8ffac10a1e status bar 2019-11-22 14:55:10 -08:00
Huy Pham
ad2d3d63f6 Merge branch 'coretk' into coretk-progress 2019-11-22 13:00:25 -08:00
Huy Pham
15e05ac580 work on status bar 2019-11-22 12:59:22 -08:00
bharnden
e20da62366 Merge branch 'coretk' of https://github.com/coreemu/core into coretk 2019-11-22 12:52:45 -08:00
bharnden
f2b37d32c8 added netaddr library, added logic to support dealing with creating new subnet when needed 2019-11-22 12:51:58 -08:00
Huy Pham
3e2cc80a80 finish service file config 2019-11-22 11:45:44 -08:00
Huy Pham
e39db4bd63 get rid of 2 unnecessary classes for service config 2019-11-22 10:32:25 -08:00
Huy Pham
3a73b10902 service file configs 2019-11-22 10:01:36 -08:00