Some fixes to the new color implementation.

- Polygons got accidentally switched to the wrong plot type
- Invert the meaning of alpha to match the commonly used meaning (rather
  than the weird one used by gnuplot)
- Unconditionally show the border for various plot elements
- Some minor stylistic changes

Author: SiegeLordEx

gnuplot/examples/box_and_whisker.rs

@@ -10,14 +10,6 @@ fn example(c: Common)
 
 	fg.axes2d()
 		.set_title("Box and whisker", &[])
-		.box_and_whisker(
-			[0.0f32, 1.0, 2.0].iter(),
-			[-1.0f32, 0.0, 1.0].iter(),
-			[-2.0f32, -1.0, 0.0].iter(),
-			[2.0f32, 3.0, 4.0].iter(),
-			[1.0f32, 2.0, 3.0].iter(),
-			&[],
-		)
 		.box_and_whisker_set_width(
 			[-0.6f32, 1.5, 2.5].iter(),
 			[-1.0f32, 0.0, 1.0].iter(),
@@ -33,6 +25,14 @@ fn example(c: Common)
 				FillAlpha(0.5),
 			],
 		)
+		.box_and_whisker(
+			[0.0f32, 1.0, 2.0].iter(),
+			[-1.0f32, 0.0, 1.0].iter(),
+			[-2.0f32, -1.0, 0.0].iter(),
+			[2.0f32, 3.0, 4.0].iter(),
+			[1.0f32, 2.0, 3.0].iter(),
+			&[],
+		)
 		.set_x_range(Fix(-1.0), Fix(3.0))
 		.set_y_range(Fix(-3.0), Fix(5.0));
 

gnuplot/examples/color.rs

@@ -23,17 +23,17 @@ fn example(c: Common)
 		Color("black".into()),                    // Conversion to RGBString is implicit
 		Color(ColorType::RGBString("black")),     // Explicit use of RGBString
 		Color("red".into()),                      // Conversion to RGBString is implicit
-		Color(RGBString("#ff0000")),              // red using Hex coded RRGGBB
-		Color(RGBString("#00ff0000")),            // red using Hex coded AARRGGBB
-		Color("#ff8888".into()), // pink using Hex coded RRGGBB. Conversion to RGBString is implict
-		Color("#88ff0000".into()), // pink using Hex coded AARRGGBB. Conversion to RGBString is implict
-		Color(ColorType::RGBString("#ffff0000")), // transparent using Hex coded AARRGGBB
-		Color((128, 0, 255).into()), // purple using implict RGBInteger
-		Color(RGBInteger(128, 0, 255)), // purple using explict RGBInteger
-		Color((0.5, 0.0, 1.0).try_into().unwrap()), // purple using implict float to int conversion
-		Color((128, 128, 0, 255).into()), // pale purple using implict ARGBInteger
-		Color(ARGBInteger(128, 128, 0, 255)), // pale purple using explict ARGBInteger
-		Color((0.5, 0.5, 0.0, 1.0).try_into().unwrap()), // pale purple using implict float to int conversion
+		Color(RGBString("#ff0000")),              // Red using Hex coded RRGGBB
+		Color(RGBString("#ffff0000")),            // Red using Hex coded AARRGGBB
+		Color("#ff8888".into()), // Pink using Hex coded RRGGBB. Conversion to RGBString is implict
+		Color("#77ff0000".into()), // Pink using Hex coded AARRGGBB. Conversion to RGBString is implict
+		Color(ColorType::RGBString("#ffff0000")), // Transparent using Hex coded AARRGGBB
+		Color((128, 0, 255).into()), // Purple using implict RGBInteger
+		Color(RGBInteger(128, 0, 255)), // Purple using explict RGBInteger
+		Color((0.5, 0.0, 1.0).try_into().unwrap()), // Purple using implict float to int conversion
+		Color((64, 128, 0, 255).into()), // Pale purple using implict ARGBInteger
+		Color(ARGBInteger(64, 128, 0, 255)), // Pale purple using explict ARGBInteger
+		Color((0.25, 0.5, 0.0, 1.0).try_into().unwrap()), // Pale purple using implict float to int conversion
 	];
 
 	let mut fg = Figure::new();
@@ -43,7 +43,7 @@ fn example(c: Common)
 		&[],
 	)
 	.set_x_range(Fix(-9.0), Auto)
-	.set_legend(Graph(0.5), Graph(0.9), &[], &[Font("", 14.0)]);
+	.set_legend(Graph(0.5), Graph(0.9), &[], &[Font("", 12.0)]);
 
 	let n_colors = colors.len();
 	for (i, color) in colors.into_iter().enumerate()
@@ -85,7 +85,7 @@ fn example(c: Common)
 
 	// any of the forms used for Color can also be used with TextColor and BorderColor
 	ax.set_x_label(
-		"Labels can be colored using the TextColor function",
+		"Labels can be colored using TextColor",
 		&[TextColor((128, 0, 255).into())],
 	);
 
@@ -97,7 +97,7 @@ fn example(c: Common)
 	let ax = fg.axes2d();
 	let max_cb = 10.0;
 	ax.set_cb_range(Fix(0.0), Fix(max_cb));
-	for color_value in 0..=10
+	for color_value in (0..=10).into_iter().step_by(2)
 	{
 		let color_float = color_value as f64;
 		let frac_color = Color(PaletteFracColor(color_float / max_cb));
@@ -130,7 +130,7 @@ fn example(c: Common)
 	}
 	ax.set_x_range(Fix(-10.0), Fix(11.0))
 		.set_y_range(Fix(-0.5), Fix(1.5))
-		.set_legend(Graph(0.45), Graph(0.9), &[], &[Font("", 14.0)]);
+		.set_legend(Graph(0.45), Graph(0.9), &[], &[Font("", 12.0)]);
 	c.show(&mut fg, "palette_colors");
 }
 

gnuplot/examples/inverse_api.rs

@@ -177,8 +177,7 @@ fn example(c: Common)
 	//~ lines(z.clone(), y.clone()).show();
 
 	let mut axes = (lines(z.clone(), y.clone()), lines(z.clone(), x.clone())).to_axes2d();
-	axes.title("Test");
-	axes.x(axis().log_scale(Some(10.)));
+	axes.title("Test").x(axis().log_scale(Some(10.)));
 
 	if !c.no_show
 	{

gnuplot/examples/variable_color.rs

@@ -7,7 +7,9 @@ use gnuplot::{palettes::MAGMA, *};
 mod common;
 
 // https://github.com/gnuplot/gnuplot/blob/master/demo/candlesticks.dat
-static CANDLESTICKS_STR: &str = "1	1.5	2 	2.4	4	6.
+#[rustfmt::skip]
+static CANDLESTICKS_STR: &str =
+"1	1.5	2 	2.4	4	6.
 2	1.5	3 	3.5	4	5.5
 3	4.5	5 	5.5	6	6.5
 4	3.7	4.5 	5.0	5.5	6.1
@@ -32,16 +34,14 @@ fn example(c: Common)
 
 	let d1 = extract_col(0);
 	let d2 = extract_col(1);
-	// let d3 = extract_col(2);
-	// let d4 = extract_col(3);
 	let d5 = extract_col(4);
 	let d6 = extract_col(5);
 	let row_index: Vec<_> = (1..=d1.len() as u8).collect();
 	let by3 = |x| (((x % 3.0) + 1.0) / 6.0);
 	let by4 = |x| (((x % 4.0) + 1.0) / 7.0);
 
 	let argb_formula = |x: &f64| {
-		let a = 255.0 * (x - 5.5).abs() / 5.5;
+		let a = 255.0 - 255.0 * (x - 5.5).abs() / 5.5;
 		let r = x * 51.0 / 2.0;
 		let g = (11.0 - x) * 51.0 / 2.0;
 		let b = ((5.5 - x).abs() * 2.0 * 510.0 / 9.0).round();
@@ -63,10 +63,10 @@ fn example(c: Common)
 	// input value for each data point. The palette is scaled to the maximum value in the `Vec<f64>` passed
 	// to the `VariablePaletteColor`.
 	//
-	// The third color loop uses an (implicit) `VariableARGBString`. The `Vec<(u8, u8, u8, u8)>` needed to construct the color
-	// is calculated in this case by the `argb_formula()` closure. An explicit `VariableARGBString` could also be constructed using
-	// `Color(ColorType::VariableARGBString(data)`.
-	// As an alternative, `VariableRGBString` is also defined that takes a 3-tuple of u8, rather than
+	// The third color loop uses an (implicit) `VariableARGBInteger`. The `Vec<(u8, u8, u8, u8)>` needed to construct the color
+	// is calculated in this case by the `argb_formula()` closure. An explicit `VariableARGBInteger` could also be constructed using
+	// `Color(ColorType::VariableARGBInteger(data)`.
+	// As an alternative, `VariableRGBInteger` is also defined that takes a 3-tuple of u8, rather than
 	// a 4 tuple.
 	for (color, label) in [
 		(Color(row_index.clone().into()), "VariableIndexColor"),
@@ -78,7 +78,7 @@ fn example(c: Common)
 		),
 		(
 			Color(d1.iter().map(argb_formula).collect::<Vec<_>>().into()),
-			"VariableARGBString",
+			"VariableARGBInteger",
 		),
 	]
 	{

gnuplot/src/axes2d.rs

@@ -662,7 +662,7 @@ impl Axes2D
 	{
 		let (data, num_rows, num_cols) = generate_data!(options, x, y);
 		self.common.elems.push(PlotElement::new_plot(
-			FillBetween,
+			Polygons,
 			data,
 			num_rows,
 			num_cols,

gnuplot/src/axes_common.rs

@@ -232,10 +232,12 @@ impl PlotElement
 
 			if self.plot_type.is_line()
 			{
+				// Write this unconditionally so the write_line_options work below.
+				writer.write_str(" border ");
 				first_opt! {self.options,
 					BorderColor(ref s) =>
 					{
-						write!(writer, " border {}", s.command());
+						writer.write_str(&s.command());
 					}
 				}
 			}
@@ -491,7 +493,7 @@ pub fn write_out_label_options(
 			first_opt! {options,
 				MarkerColor(ref s) =>
 				{
-					write!(w, r#" lc "{}""#, s.command());
+					write!(w, r#" lc {}"#, s.command());
 				}
 			}
 
@@ -1264,22 +1266,16 @@ impl AxesCommonData
 			}
 		}
 		self.margins.write_out_commands(w);
-		self.palette.write_out_commands(w);
 
 		if !self.colormaps.is_empty()
 		{
-			// save previous palette
-			writeln!(w, "set colormap new __ORIGINAL_COLORMAP__");
 			for (name, map) in &self.colormaps
 			{
-				// set palette to the requested map
 				map.write_out_commands(w);
-				// save current palette to colormap with the requested name
 				writeln!(w, "set colormap new {name}");
 			}
-			// reload previous palette from saved colormap
-			writeln!(w, "set palette colormap __ORIGINAL_COLORMAP__");
 		}
+		self.palette.write_out_commands(w);
 
 		self.x_axis.write_out_commands(w, version);
 		self.y_axis.write_out_commands(w, version);

gnuplot/src/color.rs

@@ -17,10 +17,14 @@ pub type ARGBInts = (
 /// color formats. The gnuplot [colorspec reference](http://gnuplot.info/docs_6.0/loc3640.html)
 /// also explains these.
 ///
+/// **NOTE**: Gnuplot interprets the alpha channel in an unusual way, where 0 is fully opaque and
+/// 255 is fully transparent. This wrapper inverts the meaning (as described below) to match the
+/// more common interpretation.
+///
 /// There are many equivalent ways of specifying colors, and this allows the user to chose the most convenient.
 /// For example, all the following will produce the same blue color:
-/// `RGBColor("blue".into())`, `RGBColor("0x0000ff".into())`, `RGBColor("#0000ff".into())`, `RGBColor("0x000000ff".into())`,
-/// `RGBColor("#000000ff".into())`, `RGBIntegerColor(0, 0, 255)`, `ARGBColor(0, 0, 0, 255)`,
+/// `RGBColor("blue".into())`, `RGBColor("0x0000ff".into())`, `RGBColor("#0000ff".into())`, `RGBColor("0xff0000ff".into())`,
+/// `RGBColor("#ff0000ff".into())`, `RGBIntegerColor(0, 0, 255)`, `ARGBColor(255, 0, 0, 255)`,
 ///
 /// See example usages of these colors in `color.rs` and `variable_color.rs` in the
 /// [Examples folder](https://github.com/SiegeLord/RustGnuplot/tree/master/gnuplot/examples) on Github
@@ -35,15 +39,15 @@ pub enum ColorType<T = String>
 	/// - #RRGGBB     --- string containing hexadecimal in x11 format
 	/// - #AARRGGBB   --- string containing hexadecimal in x11 format
 	///
-	/// "#AARRGGBB" represents an RGB color with an alpha channel (transparency) value in the high bits.
-	/// An alpha value of 0 represents a fully opaque color; i.e., "#00RRGGBB" is the same as "#RRGGBB".
-	/// An alpha value of 255 (FF) represents full transparency.
+	/// "#AARRGGBB" represents an RGB color with an alpha channel value in the high bits.
+	/// An alpha value of 255 (FF) represents a fully opaque color; i.e., "#FFRRGGBB" is the same as "#RRGGBB".
+	/// An alpha value of 0 represents full transparency.
 	RGBString(T),
 	/// tuple of u8 representing red, green and blue values as 0-255
 	RGBInteger(ColorComponent, ColorComponent, ColorComponent),
 	/// tuple of u8 representing alpha, red, green and blue values as 0-255.
-	/// As with `RGBColor`, an alpha value of 0 represents a fully opaque color;
-	/// an alpha value of 255 (FF) represents full transparency.
+	/// As with `RGBColor`, an alpha value of 255 (FF) represents a fully opaque color;
+	/// an alpha value of 0 represents full transparency.
 	ARGBInteger(
 		ColorComponent,
 		ColorComponent,
@@ -102,7 +106,7 @@ pub enum ColorType<T = String>
 	VariablePaletteColor(Vec<f64>),
 	/// Similar to `VariablePaletteColor` in that it takes a `Vec<f64>` to set the indexes into the
 	/// color map for each data point, but in addition to the color data it takes a string hold the name
-	/// of the color map to use. This should have been previously created in the workspace using the
+	/// of the colormap to use. This should have been previously created in the workspace using the
 	/// [create_colormap()](crate::AxesCommon::create_colormap) function.
 	SavedColorMap(T, Vec<f64>),
 	/// Set the color of all elements of the plot to the `n`th color in the current gnuplot color cycle.
@@ -127,8 +131,8 @@ impl<T: Display + Debug> ColorType<T>
 	{
 		match self
 		{
-			RGBString(s) => format!(r#"rgb "{}""#, s),
-			RGBInteger(r, g, b) => format!(r#"rgb {}"#, from_argb(0, *r, *g, *b)),
+			RGBString(s) => format!(r#"rgb "{}""#, from_string(s.to_string())),
+			RGBInteger(r, g, b) => format!(r#"rgb {}"#, from_argb(255, *r, *g, *b)),
 			ARGBInteger(a, r, g, b) => format!(r#"rgb {}"#, from_argb(*a, *r, *g, *b)),
 			VariableRGBInteger(_) => "rgb variable".into(),
 			VariableARGBInteger(_) => "rgb variable".into(),
@@ -149,7 +153,7 @@ impl<T: Display + Debug> ColorType<T>
 		{
 			VariableRGBInteger(items) => items
 				.iter()
-				.map(|(r, g, b)| from_argb(0, *r, *g, *b) as f64)
+				.map(|(r, g, b)| from_argb(255, *r, *g, *b) as f64)
 				.collect(),
 			VariableARGBInteger(items) => items
 				.iter()
@@ -192,7 +196,39 @@ impl<T: Display + Debug> ColorType<T>
 fn from_argb(a: ColorComponent, r: ColorComponent, g: ColorComponent, b: ColorComponent)
 	-> ColorInt
 {
-	((a as ColorInt) << 24) + ((r as ColorInt) << 16) + ((g as ColorInt) << 8) + (b as ColorInt)
+	((255 - a as ColorInt) << 24)
+		+ ((r as ColorInt) << 16)
+		+ ((g as ColorInt) << 8)
+		+ (b as ColorInt)
+}
+
+fn from_string(argb: String) -> String
+{
+	if let Some(trimmed_argb) = argb.strip_prefix("0x").or_else(|| argb.strip_prefix("#"))
+	{
+		if trimmed_argb.len() == 8
+		{
+			if let Ok(argb_int) = ColorInt::from_str_radix(trimmed_argb, 16)
+			{
+				let a = 255 - ((argb_int >> 24) & 0xff);
+				let argb_int = (a << 24) + (argb_int & 0xffffff);
+				format!("#{:08x}", argb_int)
+			}
+			else
+			{
+				// Let gnuplot sort it out.
+				argb
+			}
+		}
+		else
+		{
+			argb
+		}
+	}
+	else
+	{
+		argb
+	}
 }
 
 fn float_color_to_int(v: f64) -> Result<u8, String>