oscplot: fix math feature

ensures that channels whose names end _i and _q are properly read and
added when creating math channels

Signed-off-by: Cristina Suteu <[email protected]>

Author: cristina-suteu

oscplot.c

@@ -5361,7 +5361,7 @@ int osc_plot_ini_read_handler (OscPlot *plot, int line, const char *section,
 					gtk_widget_hide(GTK_WIDGET(gtk_builder_get_object(priv->builder, "labelYMax")));
 					gtk_widget_hide(priv->y_axis_min);
 					gtk_widget_hide(GTK_WIDGET(gtk_builder_get_object(priv->builder, "labelYMin")));
-				} 
+				}
 			} else if (MATCH_NAME("user_y_axis_max"))
 				gtk_spin_button_set_value(GTK_SPIN_BUTTON(priv->y_axis_max), atof(value));
 			else if (MATCH_NAME("user_y_axis_min"))
@@ -6109,18 +6109,31 @@ static gint channel_compare(gconstpointer a, gconstpointer b)
 static GSList * math_expression_get_iio_channel_list(const char *expression, struct iio_context *ctx, const char *device, bool *has_invalid_ch)
 {
 	GSList *chn_list = NULL;
-	GRegex *regex;
+	GRegex *regex, *regex_i, *regex_q;
 	GMatchInfo *info;
 	gchar *chn_name;
 	struct iio_device *iio_dev;
 	struct iio_channel *iio_chn;
-	gboolean invalid_list = false, is_match;
+	gboolean invalid_list = false, is_match = true, match_q, match_i, match;
 
 	if (!device || !(iio_dev = iio_context_find_device(ctx, device)))
 		return NULL;
 
 	regex = g_regex_new("voltage[0-9]+", 0, 0, NULL);
-	is_match = g_regex_match(regex, expression, 0, &info);
+	regex_i = g_regex_new("voltage[0-9]+_i", 0, 0 , NULL);
+	regex_q = g_regex_new("voltage[0-9]+_q", 0, 0 , NULL);
+
+	match_i = g_regex_match(regex_i, expression, 0, &info);
+
+	if (!match_i) {
+		match_q = g_regex_match(regex_q, expression, 0, &info);
+		if (!match_q) {
+			match = g_regex_match(regex, expression, 0, &info);
+			if (!match)
+				is_match = false;
+		}
+	}
+
 	if (!is_match) {
 		invalid_list = true;
 	} else {
@@ -6138,6 +6151,8 @@ static GSList * math_expression_get_iio_channel_list(const char *expression, str
 	}
 	g_match_info_free(info);
 	g_regex_unref(regex);
+	g_regex_unref(regex_i);
+	g_regex_unref(regex_q);
 
 	if (invalid_list) {
 		if (chn_list)
@@ -7039,7 +7054,7 @@ static void create_plot(OscPlot *plot)
 		g_error_free(err);
 		gtk_css_provider_load_from_path(GTK_CSS_PROVIDER(plot->priv->provider),OSC_STYLE_FILE_PATH"styles.css",NULL);
 	}
-	
+
 	//gtk_css_provider_load_from_path(GTK_CSS_PROVIDER(plot->priv->provider),"styles.css",NULL);
 	gtk_style_context_add_provider_for_screen (screen, GTK_STYLE_PROVIDER(plot->priv->provider), GTK_STYLE_PROVIDER_PRIORITY_USER);
 	style_context = gtk_widget_get_style_context(GTK_WIDGET(priv->databox));