Added option to set first line as header in Scatterplot

Author: sylvainhalle

Source/Charts/src/ca/uqac/lif/spreadsheet/chart/Scatterplot.java

@@ -1,19 +1,19 @@
 /*
-  MTNP: Manipulate Tables N'Plots
-  Copyright (C) 2017 Sylvain Hallé
+    A provenance-aware spreadsheet library
+    Copyright (C) 2021-2023 Sylvain Hallé
 
-  This program is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
 
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-  GNU General Public License for more details.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+    GNU General Public License for more details.
 
-  You should have received a copy of the GNU General Public License
-  along with this program. If not, see <http://www.gnu.org/licenses/>.
+    You should have received a copy of the GNU Lesser General Public License
+    along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 package ca.uqac.lif.spreadsheet.chart;
 
@@ -54,4 +54,19 @@ public interface Scatterplot extends Chart
 	 * @return This plot
 	 */
 	public Scatterplot withLines();
+	
+	/**
+	 * Tells the plot whether the first line of the spreadsheet contains the name
+	 * of each data series, and is not a line of numerical data.
+	 * @param b True if first line is a header, false otherwise
+	 * @return This plot
+	 */
+	public Scatterplot hasHeaders(boolean b);
+	
+	/**
+	 * Tells the plot that the first line of the spreadsheet contains the name
+	 * of each data series, and is not a line of numerical data.
+	 * @return This plot
+	 */
+	public Scatterplot hasHeaders();
 }

Source/Charts/src/ca/uqac/lif/spreadsheet/chart/UnsupportedPlotFormatException.java

@@ -1,3 +1,20 @@
+/*
+    A provenance-aware spreadsheet library
+    Copyright (C) 2021-2022 Sylvain Hallé
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
 package ca.uqac.lif.spreadsheet.chart;
 
 /**

Source/Gnuplot/src/ca/uqac/lif/spreadsheet/chart/gnuplot/GnuplotScatterplot.java

@@ -63,6 +63,11 @@ public class GnuplotScatterplot extends Gnuplot implements Scatterplot
 	 * Whether to draw each data series with marks for each data point
 	 */
 	protected boolean m_withPoints = true;
+	
+	/**
+	 * Whether the first line of the spreadsheet is a header
+	 */
+	protected boolean m_hasHeaders = true;
 
 	/**
 	 * Creates an empty scatterplot
@@ -97,6 +102,19 @@ public GnuplotScatterplot withPoints(boolean b)
 		m_withPoints = b;
 		return this;
 	}
+	
+	@Override
+	public GnuplotScatterplot hasHeaders(boolean b)
+	{
+		m_hasHeaders = b;
+		return this;
+	}
+	
+	@Override
+	public GnuplotScatterplot hasHeaders()
+	{
+		return hasHeaders(true);
+	}
 
 	@Override
 	public GnuplotScatterplot setTitle(String title)
@@ -137,6 +155,10 @@ public void toGnuplot(PrintStream out, Spreadsheet table, ChartFormat term, Stri
 		PrintStream p_baos = new PrintStream(baos);
 		s_printer.print(table, p_baos);
 		String csv_values = baos.toString();
+		if (m_hasHeaders)
+		{
+			csv_values = csv_values.substring(csv_values.indexOf(System.getProperty("line.separator")));
+		}
 		String point_string = " with points";
 		if (m_withLines)
 		{

Source/Gral/src/ca/uqac/lif/spreadsheet/chart/gral/GralScatterplot.java

@@ -52,6 +52,11 @@ public class GralScatterplot extends GralPlot implements Scatterplot
 	 * Whether to draw each data series with marks for each data point
 	 */
 	protected boolean m_withPoints = true;
+	
+	/**
+	 * Whether the first line of the spreadsheet is a header
+	 */
+	protected boolean m_hasHeaders = false;
 
 	/**
 	 * Creates an empty scatterplot with default settings
@@ -89,6 +94,19 @@ public GralScatterplot withPoints()
 		return this;
 	}
 
+	@Override
+	public GralScatterplot hasHeaders(boolean b)
+	{
+		m_hasHeaders = b;
+		return this;
+	}
+	
+	@Override
+	public GralScatterplot hasHeaders()
+	{
+		return hasHeaders(true);
+	}
+	
 	@Override
 	public GralScatterplot setTitle(String title)
 	{