Commit Graph

137 Commits

Author SHA1 Message Date
ghidra007
bdcf82e3e1 GP-737 new graph layout branch - added hack to get help working right
for algs with subitems.
2021-05-07 17:09:17 +00:00
Tom Nelson
ccaf1fea59 update layout names and help text. 2021-04-20 08:57:30 -04:00
tom
0d0f7ccaca add vertex and edge attributes to export 2021-04-19 15:38:59 -04:00
ghidra1
d377d90e14 Merge remote-tracking branch 'origin/patch'
Conflicts:
	Ghidra/Features/GraphServices/certification.manifest
2021-03-17 19:38:50 -04:00
ghidra1
162f203395 Updated certification headers 2021-03-17 18:22:50 -04:00
ghidra1
0f4026c682 Merge remote-tracking branch
'origin/GP-625-tomnelson-full-fix-1.2-SNAPSHOT...'
2021-03-03 13:07:32 -05:00
dragonmacher
76b66e2a53 added javadoc and improved root predicate for loop vertices. changed CIRCLE symbol name
GP-625 updated module IP for jungrapht 1.2
missing comma
changed jungrapht version to 1.2
changed favored edge and comparator
rename for updates to exp layouts
updates for graph display api generalization
renamed exp layout
added placeholders for exp layouts
removed problematic changes to layouts
allow edge selection to be enabled. Begin to organize default graph api symbols in GraphDisplay
updates
full fix for GP-625
2021-03-03 09:22:36 -05:00
dragonmacher
b0769bd805 GP-672 - fixed 'wait forever' bug 2021-02-17 19:01:18 -05:00
ghidra1
21ddf20061 Corercted GraphServices IP issue 2021-02-08 10:08:40 -05:00
ghidra1
9c37d1ffd9 Corrected missing IP for Graph Service module 2021-02-05 16:06:18 -05:00
dragonmacher
2074cf12b3 Merge remote-tracking branch 'origin/GP-625-tomnelson-partial-fix'
Conflicts:
	Ghidra/Features/GraphServices/src/main/java/ghidra/graph/visualization/DefaultGraphDisplay.java
2021-02-05 11:21:28 -05:00
dragonmacher
e983784753 Graphing - (various fixes; see below)
-fixed bug that prevented actions being added to sub graphs
-subgraph gets bad tab text
-properties documentation
-fixed incorrect vertex shape function applied to lightweight renderer
-dispose actions on close
2021-02-04 14:04:39 -05:00
Tom Nelson
f4defc4a95 Partial fix for GP-625 2021-02-04 14:37:08 +00:00
dragonmacher
37ab855e1d GP-377 - Graphing - temporary fixes to mouse handling code until they
are fixed in jungrapht
2021-02-02 15:45:12 -05:00
dragonmacher
8493c333c8 GP-377 - Graphing - A few small refactorings 2021-02-02 15:45:10 -05:00
ghidra1
9f2090d71c GP-377 exclude transitive dependency for slf4j 1.7.30 which conflicts
with other uses of 1.7.25
2021-02-02 15:45:09 -05:00
Tom Nelson
a3b4c1fc9a put back older version of slf4j 2021-02-02 15:45:08 -05:00
Tom Nelson
6609b4aa67 added javadoc and removed some cruft 2021-02-02 15:45:06 -05:00
Tom Nelson
a4dbc30047 Fixes for GP-377, GP-554, GP-551, GP-552, GP-553.
This commit removes previous hacks for overlapping vertices, integrates a configurable graph mouse model, puts back the RTree spatial data structures.
2021-02-02 15:45:05 -05:00
ghidra1
cc483f08ab Merge remote-tracking branch 'origin/patch' 2021-01-11 18:50:07 -05:00
Tom Nelson
b9129348fc GP-557 - satellite honors edge filters 2020-12-30 14:58:53 +00:00
ghidra1
65eecfb970 Merge remote-tracking branch 'origin/patch' 2020-12-17 09:59:25 -05:00
Tom Nelson
8adc49d34c replace repaint that was carelessly removed 2020-12-16 20:42:24 +00:00
ghidra1
998f1c651f Merge remote-tracking branch 'origin/patch' 2020-12-14 13:01:12 -05:00
Tom Nelson
19b582e3c9 GP-514 - fixes 'hidden vertices are not also hidden in satellite view' 2020-12-14 11:40:08 -05:00
ghidra1
ddbfbfe198 Merge remote-tracking branch 'origin/patch'
Conflicts:
	Ghidra/Features/GraphServices/src/main/java/ghidra/graph/visualization/DefaultGraphDisplay.java
2020-12-11 19:13:08 -05:00
ghidravore
e32276b5bd Merge remote-tracking branch 'origin/GP-492_graphException_reusing_graph_with_new_graph_too_big' into patch 2020-12-11 12:13:47 -05:00
ghidravore
bdd9868482 GP-492 fixing stack trace when re-using a graph display and the new
graph excees the vertex limit
2020-12-10 12:35:43 -05:00
ghidra1
5555566e59 Merge remote-tracking branch 'origin/patch' 2020-12-10 10:12:40 -05:00
ghidra1
fb4380155e Corrected jgrapht IP issue 2020-12-09 18:40:22 -05:00
ghidra1
11314f126d Corrected conflicting jgrapht-core version dependency 2020-12-09 17:18:49 -05:00
ghidra1
066a7d0305 Merge remote-tracking branch 'origin/patch'
Conflicts:
	Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pe/cli/blobs/CliAbstractSig.java
	Ghidra/Framework/DB/src/main/java/db/DBHandle.java
2020-12-09 15:05:16 -05:00
Tom Nelson
4c782b693e scale sat viewer when it is shown 2020-12-09 01:28:09 +00:00
ghidravore
688e262345 Merge remote-tracking branch
'origin/GP-440_ghidravore_fixing_graph_exporters_to_be_more_extensible--SQUASHED'

Conflicts:
	Ghidra/Features/GraphServices/src/test/java/ghidra/graph/export/GraphExportTest.java
2020-12-08 17:25:20 -05:00
ghidravore
6dc9b3387d GP-440 Refactored graph exporters to be more extensible and easy to use in scripts 2020-12-08 17:04:30 -05:00
Tom Nelson
54ceb189bf GP-469 Graph Satellite View is sometimes truncated 2020-12-08 15:09:11 +00:00
ghidravore
1af95c9d2a Merge remote-tracking branch 'origin/patch' 2020-12-03 16:58:47 -05:00
ghidravore
a30431d47b GT-0 fixing junit test 2020-12-03 16:09:56 -05:00
ghidravore
b23c8ca435 Merge remote-tracking branch 'origin/patch' 2020-11-30 16:52:08 -05:00
ghidravore
7758c069b7 GP-280 fixed issue preventing exporting a graph to DOT format. 2020-11-30 16:30:53 -05:00
ghidravore
1259632113 fixed stack trace when exporting 2020-11-25 13:11:16 -05:00
ghidravore
bc6613141d added dialog for user to change name of group vertices as they are created 2020-11-24 10:40:28 -05:00
Tom Nelson
ade97ea258 fix case where expansion of GroupVertex sends focusedVertex arrow highlight to the origin 2020-11-23 13:34:47 +00:00
ghidravore
e6fe576b87 Merge remote-tracking branch
'origin/GP_371_ghidravore_vertex_collapse--SQUASHED'

Conflicts:
	Ghidra/Features/GraphServices/src/main/java/ghidra/graph/visualization/DefaultGraphDisplay.java
2020-11-20 16:52:32 -05:00
ghidravore
724ab5a950 removed dead code
Incorporates the Jungrapht 'collapse nodes' feature into ghidra graphing.
2020-11-20 16:48:12 -05:00
dragonmacher
90c1ce5d59 Fix test failing to recent change 2020-11-18 09:09:56 -05:00
ghidravore
acf3792307 fixed issue with graph mouse controls not working if no listener is set. 2020-11-17 16:37:14 -05:00
ghidravore
d3217c96b8 added post process function for vertex overlap in tree layouts that are used with graphs that are not trees. 2020-11-09 12:27:45 -05:00
ghidravore
96b0fd984d Changed "Fit to Window" action to use new icon instead for refresh icon 2020-11-05 14:27:53 -05:00
ghidravore
649a3639e5 updating satellite icon again. Can't seem to please anyone. 2020-11-04 17:23:43 -05:00
ghidravore
5fb459cbba updated satellite icon in Default Graph Display 2020-11-04 14:20:56 -05:00
ghidravore
5b8be18b40 removed duplicate jungrapht property 2020-11-02 16:18:43 -05:00
ghidravore
d9a1c8906f GP-310 - Graphing - Updated mouse handling to be consistent with other graph widgets. 2020-11-02 14:15:01 -05:00
ghidravore
e1a186ea7f Updated jungraphT to use version 1.0 2020-10-30 15:51:25 -04:00
ghidravore
0fd6a99f51 Merge remote-tracking branch 'origin/GP-256-dragonmacher-ast-graph-exceptions' into Ghidra_9.2 2020-10-29 16:28:22 -04:00
ghidravore
858a27a30e Merge remote-tracking branch 'origin/GP-307-dragonmacher-graph-tooltips--SQUASHED' into Ghidra_9.2 2020-10-29 16:24:26 -04:00
dragonmacher
c5087c7ef0 GP-307 - Graph - Add ability to disable tootlips; better tooltip behavior 2020-10-29 16:00:30 -04:00
ghidravore
490bc9ffa9 GT-308 preserved graph satellite state between graph instantiations.
(also changed the timing for when preferences are loaded into the tool
so that they happen before plugins get initialized)
2020-10-29 15:13:43 -04:00
dragonmacher
edc8efdbf6 GP-256 - Graphing - fixed AST graph exceptions 2020-10-28 17:52:12 -04:00
ghidravore
afd5baa914 changed the gradle file for jungrapht to point to RC9. 2020-10-28 14:32:09 -04:00
ghidravore
7764f965be using the jugrapht snapshot jar. 2020-10-27 18:42:41 -04:00
ghidravore
d2e0b350f4 GP-306 fixing graph titles 2020-10-23 18:09:29 -04:00
ghidravore
1c145dd781 Moved setLayout into a task to fix a race condition when popping up the
cancel dialog
2020-10-22 14:59:06 -04:00
ghidravore
66d052ce24 fixing duplicate graph actions when re-using a graph. Also fixed problem with actions being added on non-swing thread. 2020-10-21 11:49:29 -04:00
ghidravore
592b8a3cfc Changed graph api to use vertex and edge object instead of ids. 2020-10-09 14:27:29 -04:00
ghidravore
532a1d4fd0 Adding capbility to add DockingActions to GraphDisplay. Also, wired in the help for existing actions. 2020-10-07 17:58:48 -04:00
ghidravore
b647c6cd5b Miscellanious bug fixes and code clean up. 2020-10-01 12:02:08 -04:00
ghidra1
608e74f873 Corrected GraphServices jheaps dependency 2020-10-01 10:51:18 -04:00
ghidravore
e1efbe228e Merge remote-tracking branch 'origin/GD-110_popup_for_edges--SQUASHED' 2020-08-31 13:24:13 -04:00
ghidravore
f9542551d5 popup for edge selection 2020-08-31 13:21:28 -04:00
ghidravore
c6e13a776f Merge remote-tracking branch 'origin/GP-125_edge_arrows' 2020-08-31 11:55:19 -04:00
Tom Nelson
68afd5f51d update versions in Module.manifest 2020-08-31 10:55:32 +00:00
Tom Nelson
4aba67cfb0 arrow color 2020-08-28 21:53:09 +00:00
ghidravore
f92c5a53bd removed unused file 2020-08-25 13:47:24 -04:00
ghidravore
d439ff20f5 fixed compile error 2020-08-25 13:41:43 -04:00
Tom Nelson
2f447ae0d0 added javadoc and updated jungrapht versions to 1.0-RC9
fixed vertex naming to create labels if no label at address.
removed local vertex renaming
vertex-only selection enabled and grow selection
made yellow edges darker
fix initial layout scaling for subgraph display
address warnings and increase stroke size for vertices
comments and adjusting initial layout area size calculation
multiselection strategy
moved buttons out of function so they can be re-enabled in popup menu
cleaned up and documented selection menus
improve selection following by sending only one event, filtering hidden elements, and disabliing the butten when selection is complete
improve grow selection to grow from all selected vertices
better generics, simplified root predicate. added flag so multiaction does not have to fire an action on the first item
support renaming from the graph view
added rename popup. corrected some errors
use function to control mincross work based on graph size
fixed LayoutWorkingDialog close issue a better way.
use toggle button for magnifier and connect with Lens kill switch
html escape the attributes in case they include things like < and >
changed thread stop and added initial dimension function
2020-08-25 15:21:57 +00:00
ghidravore
3ec58674f5 Merge remote-tracking branch 'origin/GT-3624-dragonmacher-datatypes-preview' 2020-08-04 16:57:12 -04:00
dragonmacher
2e6e3d1a96 GT-3624 - Datatypes Provider - fixed preview window issues: odd font
size for structures; Copy of preview text was missing newlines; enum
rendering of negative values used too many digits
2020-08-04 10:26:41 -04:00
ghidra1
f0832a6e9d Removed slf4j-nop runtime dependency from Graph Services module 2020-08-04 09:59:13 -04:00
ghidra1
17ada5ae9d Moved slf4j-nop runtime dependency to Base module 2020-08-04 09:58:18 -04:00
ghidravore
63d9a6a822 fixed graph window placement issues. 2020-07-16 18:32:03 -04:00
ghidravore
7a36786eb5 updated allowed ip in certification files 2020-05-26 15:55:43 -04:00
ghidra1
1675f226b3 Merge branch 'GT-0_ghidra1_PR-1878_astrelsky_IPBuildIssue' 2020-05-20 12:56:51 -04:00
tom
c999cfc308 Change reuse/append display to choose a display that is currently visible. This will be the one in the open tab. 2020-05-19 07:40:01 -04:00
astrelsky
e551c62ecf
Corrected ip 2020-05-18 19:27:42 -04:00
tom
5575cce937 updated jungrapht-visualization to 1.0-RC8. Includes fixes noted in functional review. Adds additional layering algorithms to mincross layout algorithm. Fix Module.manifest versions 2020-05-15 07:57:25 -04:00
ghidravore
410af5a272 GT-3317
moved generic graph interfaces to features graph module
created graph service broker

first commit of program graph module adapted to new graph api

GT-3317 connected listeners, documented and prettied up code
changed GhidraGraph to preserve order of created graph. Removed edge
filtering from initial program graph display

GT-3317 added exporters for supported formats

GT-3317 fixed GhidraGraph bug where it lost edges

updates

changed to new action builder
removed icons, improved AttributeFilters

removed DialogComponentProviderBuilder
fixed generic alphabet soup

added vertex name updating.

GT-3317 added threading to sugiyama
adapted to take advantage of multi-threaded edge crossing reduction in
circle layout
eliminated parallel edges, improved sizing, updated jungrapht version

GT-3317 fixing AST graph and moving modules and packages
started help
GT-3317 updated min-cross and color selections
uses min-cross that optimizes for graph size

GT-3317 help, javadocs

changes from review comments and cleaning up warnings and simplifying
exporter code
fixing warnings, simplifying unnecessarily complicated code
more changes from review
more changes from review, simplifications. removed unnecessary
threading, renamed vertex, edge, etc
GT-3317 squashed many commits to make rebase easier. Mostly changes from
first code review.
2020-05-13 15:58:03 -04:00