Systemtap: Adding option to select grid lines for X and Y axis.

6 files changed, 24 insertions, 10 deletions

diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/src/org/eclipse/linuxtools/internal/systemtap/ui/graphingapi/ui/localization.properties b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/src/org/eclipse/linuxtools/internal/systemtap/ui/graphingapi/ui/localization.properties
index 5424e20feb..696bc0073c 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/src/org/eclipse/linuxtools/internal/systemtap/ui/graphingapi/ui/localization.properties
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/src/org/eclipse/linuxtools/internal/systemtap/ui/graphingapi/ui/localization.properties
@@ -19,7 +19,8 @@ AGraph.SeriesAxis=series axis
 GraphingAPIPreferencePage.GraphDisplayPreferences=GraphingAPI Details
 
 GraphPreferencePage.GraphDisplayPreferences=Basic preferences for graph display.
-GraphPreferencePage.ShowGridLines=&Show grid lines:
+GraphPreferencePage.ShowXGridLines=&Show X grid lines:
+GraphPreferencePage.ShowYGridLines=&Show Y grid lines:
 GraphPreferencePage.MaxDataItems=&Max data items:
 GraphPreferencePage.ViewableDataItems=&Viewable data items:
 GraphPreferencePage.XSeriesTicks=&X series ticks:
@@ -144,4 +145,4 @@ SelectSeriesWizardPage.KeyFilter=Key filter:
 SelectSeriesWizardPage.KeyNotSet=Key not set
 SelectSeriesWizardPage.NA=NA
 SelectSeriesWizardPage.UseHistoricalData=Use historical data?
-SelectSeriesWizardPage.SeriesNotSelected=Series not selected, or share the same selection
\ No newline at end of file
+SelectSeriesWizardPage.SeriesNotSelected=Series not selected, or share the same selection
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/src/org/eclipse/linuxtools/systemtap/ui/graphingapi/ui/charts/AbstractChartWithAxisBuilder.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/src/org/eclipse/linuxtools/systemtap/ui/graphingapi/ui/charts/AbstractChartWithAxisBuilder.java
index 3dd0d077a4..cdc2dbf81a 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/src/org/eclipse/linuxtools/systemtap/ui/graphingapi/ui/charts/AbstractChartWithAxisBuilder.java
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/src/org/eclipse/linuxtools/systemtap/ui/graphingapi/ui/charts/AbstractChartWithAxisBuilder.java
@@ -36,8 +36,8 @@ public abstract class AbstractChartWithAxisBuilder extends AbstractChartBuilder
     public AbstractChartWithAxisBuilder(IAdapter adapter, Composite parent, int style, String title) {
     	 super(adapter, parent, style, title);
 		IPreferenceStore store = GraphingAPIUIPlugin.getDefault().getPreferenceStore();
-		xLineGrid = store.getBoolean(GraphingAPIPreferenceConstants.P_SHOW_GRID_LINES);
-		yLineGrid = store.getBoolean(GraphingAPIPreferenceConstants.P_SHOW_GRID_LINES);
+		xLineGrid = store.getBoolean(GraphingAPIPreferenceConstants.P_SHOW_X_GRID_LINES);
+		yLineGrid = store.getBoolean(GraphingAPIPreferenceConstants.P_SHOW_Y_GRID_LINES);
 	}
 
 	/**
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/src/org/eclipse/linuxtools/systemtap/ui/graphingapi/ui/graphs/AGraph.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/src/org/eclipse/linuxtools/systemtap/ui/graphingapi/ui/graphs/AGraph.java
index b5e4ad2968..bc4edd3669 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/src/org/eclipse/linuxtools/systemtap/ui/graphingapi/ui/graphs/AGraph.java
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/src/org/eclipse/linuxtools/systemtap/ui/graphingapi/ui/graphs/AGraph.java
@@ -201,8 +201,13 @@ public abstract class AGraph extends AChart implements IGraph {
 					if(GraphAxis.VERTICAL == a.getType())
 						a.setTickCount(ySeriesTicks);
 				}
-			} else if(event.getProperty().equals(GraphingAPIPreferenceConstants.P_SHOW_GRID_LINES))
-				showGrid = store.getBoolean(GraphingAPIPreferenceConstants.P_SHOW_GRID_LINES);
+			} else if(event.getProperty().equals(GraphingAPIPreferenceConstants.P_SHOW_X_GRID_LINES)) {
+				showXGrid = store.getBoolean(GraphingAPIPreferenceConstants.P_SHOW_X_GRID_LINES);
+				showGrid = showXGrid || showYGrid;
+			} else if(event.getProperty().equals(GraphingAPIPreferenceConstants.P_SHOW_X_GRID_LINES)) {
+				showYGrid = store.getBoolean(GraphingAPIPreferenceConstants.P_SHOW_X_GRID_LINES);
+				showGrid = showXGrid || showYGrid;
+			}
 
 			repaint();
 		}
@@ -228,6 +233,7 @@ public abstract class AGraph extends AChart implements IGraph {
 	protected LinkedList<GraphAxis> axes;
 	
 	private IAdapter adapter;
+	private boolean showYGrid, showXGrid;
 	
 	protected static int xSeriesTicks;
 	protected static int ySeriesTicks;
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/src/org/eclipse/linuxtools/systemtap/ui/graphingapi/ui/preferences/GraphPreferencePage.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/src/org/eclipse/linuxtools/systemtap/ui/graphingapi/ui/preferences/GraphPreferencePage.java
index 3f5fe7e510..791397b2f2 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/src/org/eclipse/linuxtools/systemtap/ui/graphingapi/ui/preferences/GraphPreferencePage.java
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/src/org/eclipse/linuxtools/systemtap/ui/graphingapi/ui/preferences/GraphPreferencePage.java
@@ -31,8 +31,13 @@ public class GraphPreferencePage extends FieldEditorPreferencePage implements IW
 	
 	public void createFieldEditors() {
 		addField(new BooleanFieldEditor(
-				GraphingAPIPreferenceConstants.P_SHOW_GRID_LINES, 
-				Localization.getString("GraphPreferencePage.ShowGridLines"),
+				GraphingAPIPreferenceConstants.P_SHOW_X_GRID_LINES, 
+				Localization.getString("GraphPreferencePage.ShowXGridLines"),
+				getFieldEditorParent()));
+
+		addField(new BooleanFieldEditor(
+				GraphingAPIPreferenceConstants.P_SHOW_Y_GRID_LINES, 
+				Localization.getString("GraphPreferencePage.ShowYGridLines"),
 				getFieldEditorParent()));
 
 		addField(
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/src/org/eclipse/linuxtools/systemtap/ui/graphingapi/ui/preferences/GraphingAPIPreferenceConstants.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/src/org/eclipse/linuxtools/systemtap/ui/graphingapi/ui/preferences/GraphingAPIPreferenceConstants.java
index 0f7af298ae..1fdce76a9a 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/src/org/eclipse/linuxtools/systemtap/ui/graphingapi/ui/preferences/GraphingAPIPreferenceConstants.java
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/src/org/eclipse/linuxtools/systemtap/ui/graphingapi/ui/preferences/GraphingAPIPreferenceConstants.java
@@ -17,7 +17,8 @@ public class GraphingAPIPreferenceConstants {
 	public static final String P_AUTO_RESIZE = "AutoResizeColumns";
 
 	//graphing.graph
-	public static final String P_SHOW_GRID_LINES = "ShowGridLines";
+	public static final String P_SHOW_X_GRID_LINES = "ShowXGridLines";
+	public static final String P_SHOW_Y_GRID_LINES = "ShowYGridLines";
 	public static final String P_MAX_DATA_ITEMS = "MaxDataItems";
 	public static final String P_VIEWABLE_DATA_ITEMS = "ViewableDataItems";
 	public static final String P_X_SERIES_TICKS = "XSeriesTicks";
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/src/org/eclipse/linuxtools/systemtap/ui/graphingapi/ui/preferences/PreferenceInitializer.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/src/org/eclipse/linuxtools/systemtap/ui/graphingapi/ui/preferences/PreferenceInitializer.java
index 615091a582..f72e17d73d 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/src/org/eclipse/linuxtools/systemtap/ui/graphingapi/ui/preferences/PreferenceInitializer.java
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/src/org/eclipse/linuxtools/systemtap/ui/graphingapi/ui/preferences/PreferenceInitializer.java
@@ -21,7 +21,8 @@ public class PreferenceInitializer extends AbstractPreferenceInitializer {
 	public void initializeDefaultPreferences() {
 		IPreferenceStore store = GraphingAPIUIPlugin.getDefault().getPreferenceStore();
 
-		store.setDefault(GraphingAPIPreferenceConstants.P_SHOW_GRID_LINES, true);
+		store.setDefault(GraphingAPIPreferenceConstants.P_SHOW_X_GRID_LINES, true);
+		store.setDefault(GraphingAPIPreferenceConstants.P_SHOW_Y_GRID_LINES, true);
 		store.setDefault(GraphingAPIPreferenceConstants.P_AUTO_RESIZE, true);
 		store.setDefault(GraphingAPIPreferenceConstants.P_JUMP_NEW_TABLE_ENTRY, false);
 		store.setDefault(GraphingAPIPreferenceConstants.P_VIEWABLE_DATA_ITEMS, 100);