mirror/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-09-28 17:11:11 -09:00
Code Issues Packages Projects Releases Wiki Activity

GP-757 - Function Graph - review fixes

Browse Source
This commit is contained in:
dragonmacher
2021-03-09 08:19:37 -05:00
parent 9e785c25ec
commit 859e09e4bc
3 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Ghidra/Features/FunctionGraph/src/main/java/ghidra/app/plugin/core/functiongraph/graph/FGComponent.java
View File

@@ -224,8 +224,10 @@ public class FGComponent extends GraphComponent<FGVertex, FGEdge, FunctionGraph>
Color bgColor = options.getGraphBackgroundColor(); Color bgColor = options.getGraphBackgroundColor();
if (bgColor.equals(VisualGraphOptions.DEFAULT_GRAPH_BACKGROUND_COLOR)) { if (bgColor.equals(VisualGraphOptions.DEFAULT_GRAPH_BACKGROUND_COLOR)) {
// Give user notice when seeing the graph for a non-function. Don't do this if the // Give user notice when seeing the graph for a non-function (such as an undefined
// user has manually set the background color (this would require another option). // function), as this is typical for Ghidra UI widgets.
// Don't do this if the user has manually set the background color (this would require
// another option).
Function function = functionGraphData.getFunction(); Function function = functionGraphData.getFunction();
if (function instanceof UndefinedFunction) { if (function instanceof UndefinedFunction) {
viewer.setBackground(UNDEFINED_FUNCTION_COLOR); viewer.setBackground(UNDEFINED_FUNCTION_COLOR);

12
Ghidra/Features/FunctionGraph/src/main/java/ghidra/app/plugin/core/functiongraph/graph/vertex/FGVertex.java
View File

@@ -93,15 +93,17 @@ public interface FGVertex extends VisualVertex {
public void clearColor(); public void clearColor();
/** /**
* Signals to this vertex that it is associated with a group. False implies that this vertex * Signals to this vertex that it is associated with a group
* is not and has not been part of a group. True signals that this vertex is not currently
* grouped, but that it has been part of a group and can be put back into its group form
* again.
* *
* @param groupInfo True if this vertex is a associate with a group * @param groupInfo the new group info for this vertex; null if the vertex is no longer part
* of a group
*/ */
public void updateGroupAssociationStatus(GroupHistoryInfo groupInfo); public void updateGroupAssociationStatus(GroupHistoryInfo groupInfo);
/**
* The group info for this vertex if it is in a group; null if not in a group
* @return the group info or null
*/
public GroupHistoryInfo getGroupInfo(); public GroupHistoryInfo getGroupInfo();
/** /**

7
Ghidra/Framework/Graph/src/main/java/ghidra/graph/viewer/SatelliteGraphViewer.java
View File

@@ -75,11 +75,18 @@ public class SatelliteGraphViewer<V extends VisualVertex, E extends VisualEdge<V
return new VisualVertexSatelliteRenderer<>(); return new VisualVertexSatelliteRenderer<>();
} }
/**
* The options for this viewer
* @param options the options
*/
public void setGraphOptions(VisualGraphOptions options) { public void setGraphOptions(VisualGraphOptions options) {
this.options = options; this.options = options;
optionsChanged(); optionsChanged();
} }
/**
* Called to signal that the options used by this viewer have changed
*/
public void optionsChanged() { public void optionsChanged() {
setBackground(options.getGraphBackgroundColor()); setBackground(options.getGraphBackgroundColor());
} }