Skip to content

Commit

Permalink
Osc: Add "Peak" markers to the Cross-Correlation transform
Browse files Browse the repository at this point in the history
  • Loading branch information
@dNechita
dNechita committed Apr 22, 2014
1 parent 8ee841c commit 6b863a9
Show file tree
Hide file tree
Showing 3 changed files with 109 additions and 12 deletions.
2 changes: 2 additions & 0 deletions datatypes.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,8 @@ struct _cross_correlation_settings {
fftw_complex *signal_a;
fftw_complex *signal_b;
fftw_complex *xcorr_data;
struct marker_type *markers;
enum marker_types *marker_type;
};

Transform* Transform_new(int tr_type);
Expand Down
58 changes: 57 additions & 1 deletion osc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -471,8 +471,64 @@ void cross_correlation_transform_function(Transform *tr, gboolean init_transform
settings->signal_b[i] = q_1[i] + I * i_1[i];
}
xcorr(settings->signal_a, settings->signal_b, settings->xcorr_data, axis_length);
for (i = 0; i < 2 * axis_length - 1; i++)

gfloat *out_data = tr->y_axis;
gfloat *X = tr->x_axis;
struct marker_type *markers = settings->markers;
enum marker_types marker_type = MARKER_OFF;
unsigned int maxx[MAX_MARKERS + 1];
gfloat maxY[MAX_MARKERS + 1];
int j, k;

if (settings->marker_type)
marker_type = *((enum marker_types *)settings->marker_type);

for (j = 0; j <= MAX_MARKERS; j++) {
maxx[j] = 0;
maxY[j] = -100.0f;
}

for (i = 0; i < 2 * axis_length - 1; i++) {
tr->y_axis[i] = creal(settings->xcorr_data[i]);
if (!tr->has_the_marker)
continue;

if (MAX_MARKERS && marker_type == MARKER_PEAK) {
if (i == 0) {
maxx[0] = 0;
maxY[0] = out_data[0];
} else {
for (j = 0; j <= MAX_MARKERS && markers[j].active; j++) {
if ((out_data[i - 1] > maxY[j]) &&
((!((out_data[i - 2] > out_data[i - 1]) &&
(out_data[i - 1] > out_data[i]))) &&
(!((out_data[i - 2] < out_data[i - 1]) &&
(out_data[i - 1] < out_data[i]))))) {
if (marker_type == MARKER_PEAK) {
for (k = MAX_MARKERS; k > j; k--) {
maxY[k] = maxY[k - 1];
maxx[k] = maxx[k - 1];
}
}
maxY[j] = out_data[i - 1];
maxx[j] = i - 1;
break;
}
}
}
}
}

if (!tr->has_the_marker)
return;

if (MAX_MARKERS && marker_type != MARKER_OFF)
for (j = 0; j <= MAX_MARKERS && markers[j].active; j++)
if (marker_type == MARKER_PEAK) {
markers[j].x = (gfloat)X[maxx[j]];
markers[j].y = (gfloat)out_data[maxx[j]];
markers[j].bin = maxx[j];
}

}

Expand Down
61 changes: 50 additions & 11 deletions oscplot.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -705,6 +705,8 @@ static void update_transform_settings(OscPlot *plot, Transform *transform,
XCORR_SETTINGS(transform)->signal_a = NULL;
XCORR_SETTINGS(transform)->signal_b = NULL;
XCORR_SETTINGS(transform)->xcorr_data = NULL;
XCORR_SETTINGS(transform)->markers = NULL;
XCORR_SETTINGS(transform)->marker_type = NULL;
}
}

Expand Down Expand Up @@ -773,6 +775,7 @@ static Transform* add_transform_to_list(OscPlot *plot, struct iio_channel *ch0,
ch_info->shadow_of_enabled++;
ch_info = iio_channel_get_data(ch3);
ch_info->shadow_of_enabled++;
priv->active_transform_type = CROSS_CORRELATION_TRANSFORM;
break;
default:
printf("Invalid transform\n");
Expand All @@ -796,6 +799,13 @@ static void remove_transform_from_list(OscPlot *plot, Transform *tr)
tr->type_id == COMPLEX_FFT_TRANSFORM) {
ch_info = iio_channel_get_data(tr->channel_parent2);
ch_info->shadow_of_enabled--;
} else if (tr->type_id == CROSS_CORRELATION_TRANSFORM) {
ch_info = iio_channel_get_data(tr->channel_parent2);
ch_info->shadow_of_enabled--;
ch_info = iio_channel_get_data(tr->channel_parent3);
ch_info->shadow_of_enabled--;
ch_info = iio_channel_get_data(tr->channel_parent4);
ch_info->shadow_of_enabled--;
}
if (tr->has_the_marker)
priv->tr_with_marker = NULL;
Expand Down Expand Up @@ -835,10 +845,15 @@ static void add_markers(OscPlot *plot, Transform *transform)

transform->has_the_marker = true;
priv->tr_with_marker = transform;
FFT_SETTINGS(transform)->markers = priv->markers;
FFT_SETTINGS(transform)->markers_copy = priv->markers_copy;
FFT_SETTINGS(transform)->marker_type = &priv->marker_type;
FFT_SETTINGS(transform)->marker_lock = &priv->g_marker_copy_lock;
if (priv->active_transform_type == FFT_TRANSFORM || priv->active_transform_type == COMPLEX_FFT_TRANSFORM) {
FFT_SETTINGS(transform)->markers = priv->markers;
FFT_SETTINGS(transform)->markers_copy = priv->markers_copy;
FFT_SETTINGS(transform)->marker_type = &priv->marker_type;
FFT_SETTINGS(transform)->marker_lock = &priv->g_marker_copy_lock;
} else if (priv->active_transform_type == CROSS_CORRELATION_TRANSFORM) {
XCORR_SETTINGS(transform)->markers = priv->markers;
XCORR_SETTINGS(transform)->marker_type = &priv->marker_type;
}
}

static unsigned int plot_sample_count_get(OscPlot *plot)
Expand Down Expand Up @@ -903,24 +918,39 @@ static void dispose_parameters_from_plot(OscPlot *plot)

static void draw_marker_values(OscPlotPrivate *priv, Transform *tr)
{
struct _fft_settings *settings = tr->settings;
struct extra_info *ch_info = iio_channel_get_data(tr->channel_parent);
struct extra_dev_info *dev_info = iio_device_get_data(ch_info->dev);
struct marker_type *markers = settings->markers;
struct extra_info *ch_info;
struct extra_dev_info *dev_info;
struct marker_type *markers;
GtkTextIter iter;
char text[256];
int m;

if (tr->type_id == CROSS_CORRELATION_TRANSFORM)
markers = XCORR_SETTINGS(tr)->markers;
else if(tr->type_id == FFT_TRANSFORM)
markers = FFT_SETTINGS(tr)->markers;
else if(tr->type_id == COMPLEX_FFT_TRANSFORM)
markers = FFT_SETTINGS(tr)->markers;
else
return;

if (priv->tbuf == NULL) {
priv->tbuf = gtk_text_buffer_new(NULL);
gtk_text_view_set_buffer(GTK_TEXT_VIEW(priv->marker_label), priv->tbuf);
}
ch_info = iio_channel_get_data(tr->channel_parent);
dev_info = iio_device_get_data(ch_info->dev);
if (MAX_MARKERS && priv->marker_type != MARKER_OFF) {
for (m = 0; m <= MAX_MARKERS && markers[m].active; m++) {
sprintf(text, "M%i: %2.2f dBFS @ %2.3f %cHz%c",
if (tr->type_id == FFT_TRANSFORM || tr->type_id == COMPLEX_FFT_TRANSFORM) {
sprintf(text, "M%i: %2.2f dBFS @ %2.3f %cHz%c",
m, markers[m].y, dev_info->lo_freq + markers[m].x,
dev_info->adc_scale,
m != MAX_MARKERS ? '\n' : '\0');
} else if (tr->type_id == CROSS_CORRELATION_TRANSFORM) {
sprintf(text, "M%i: %2.2f @ %2.3f%c", m, markers[m].y, markers[m].x,
m != MAX_MARKERS ? '\n' : '\0');
}

if (m == 0) {
gtk_text_buffer_set_text(priv->tbuf, text, -1);
Expand Down Expand Up @@ -1173,7 +1203,9 @@ static void plot_setup(OscPlot *plot)
if (dev_info->adc_freq > max_adc_freq)
max_adc_freq = dev_info->adc_freq;

if (priv->active_transform_type == FFT_TRANSFORM || priv->active_transform_type == COMPLEX_FFT_TRANSFORM)
if (priv->active_transform_type == FFT_TRANSFORM ||
priv->active_transform_type == COMPLEX_FFT_TRANSFORM ||
priv->active_transform_type == CROSS_CORRELATION_TRANSFORM)
add_markers(plot, transform);

gtk_databox_graph_add(GTK_DATABOX(priv->databox), graph);
Expand Down Expand Up @@ -2987,7 +3019,8 @@ static gint marker_button(GtkDatabox *box, GdkEventButton *event, gpointer data)

/* FFT? */
if (priv->active_transform_type != FFT_TRANSFORM &&
priv->active_transform_type != COMPLEX_FFT_TRANSFORM)
priv->active_transform_type != COMPLEX_FFT_TRANSFORM &&
priv->active_transform_type != CROSS_CORRELATION_TRANSFORM)
return FALSE;

/* Right button */
Expand Down Expand Up @@ -3070,6 +3103,9 @@ static gint marker_button(GtkDatabox *box, GdkEventButton *event, gpointer data)
gtk_widget_show(menuitem);
i++;

if (priv->active_transform_type == CROSS_CORRELATION_TRANSFORM)
goto skip_no_peak_markers;

menuitem = gtk_check_menu_item_new_with_label(FIX_MRK);
gtk_menu_attach(GTK_MENU(popupmenu), menuitem, 0, 1, i, i + 1);
gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem),
Expand Down Expand Up @@ -3110,6 +3146,8 @@ static gint marker_button(GtkDatabox *box, GdkEventButton *event, gpointer data)
i++;
}

skip_no_peak_markers:

if (priv->marker_type != MARKER_OFF) {
menuitem = gtk_check_menu_item_new_with_label(OFF_MRK);
gtk_menu_attach(GTK_MENU(popupmenu), menuitem, 0, 1, i, i + 1);
Expand Down Expand Up @@ -3152,6 +3190,7 @@ static void plot_domain_changed_cb(GtkComboBox *box, OscPlot *plot)
{
gboolean force_sensitive = true;

plot->priv->marker_type = MARKER_OFF;
check_valid_setup(plot);

foreach_device_iter(GTK_TREE_VIEW(plot->priv->channel_list_view),
Expand Down

0 comments on commit 6b863a9

Please sign in to comment.