Merge branch '2.9'

Author: hansu

src/hal/components/radiobutton.comp

@@ -0,0 +1,39 @@
+component radiobutton "Select one from several outputs with momentary switches";
+
+description """This component creates \\fBpersonality\\fR inputs to select
+one of several outputs. When \\fBsel-N\\fR is momentarily set high then the
+corresponding bit output \\fBout-N\\fR will be set high and other outputs will
+be set low. Simultaneously the value on the pin \\fBinput-N\\fR will be copied
+to the \\fBvalue\\fR pin.
+The \\fBselected\\fR pin will indicate which set of outputs is currently
+active.
+Note that channel-0 should be used to provide the default values.""";
+
+pin in bit sel-##[32:personality] "Inputs to select a channel";
+pin out bit out-##[32:personality] "output selected";
+pin out signed selected = 0 "indicates which output is currently active";
+pin in float input-##[32:personality] "Possible output values";
+pin out float value "currently-selected output value";
+
+function _;
+license "GPL 2+";
+author "Andy Pugh";
+
+;;
+
+FUNCTION(_){
+	int i;
+	for(i = 0; i < personality; i++){
+		if(sel(i) !=0){
+			selected = i;
+		}
+	}
+	for(i = 0; i < personality; i++){
+		if(i == selected){
+			out(i) = 1;
+			value = input(i);
+		} else {
+			out(i) = 0;
+		}
+	}
+}

src/hal/utils/scope_usr.h

@@ -93,6 +93,7 @@ typedef struct {
     hal_type_t data_type;	/* data type */
     int data_len;		/* data length */
     double vert_offset;		/* offset to be applied */
+    double saved_vert_offset;	/* saved offset when AC coupling is enabled */
     int ac_offset;              /* TRUE if the signal should be AC-coupled */
     int scale_index;		/* scaling (slider setting) */
     int max_index;		/* limits of scale slider */

src/hal/utils/scope_vert.c

@@ -276,6 +276,7 @@ int set_channel_source(int chan_num, int type, char *name)
     vert->data_offset[chan_num - 1] = -1;
     /* set scale and offset to nominal values */
     chan->vert_offset = 0.0;
+    chan->saved_vert_offset = 0.0;
     chan->scale_index = 0;
     /* return success */
     return 0;
@@ -390,6 +391,8 @@ int set_vert_offset(double setting, int ac_coupled)
     /* set the new offset */
     chan->vert_offset = setting;
     chan->ac_offset = ac_coupled;
+    /* copy the offset to restore when toggling AC coupling */
+    chan->saved_vert_offset = chan->vert_offset;
     /* update the offset display */
     if (chan->data_type == HAL_BIT) {
 	snprintf(buf1, BUFLEN, "----");
@@ -716,15 +719,23 @@ static gboolean dialog_set_offset(int chan_num)
             vert->offset_entry, FALSE, TRUE, 0);
 
     /* update elements */
-    snprintf(data.buf, BUFLEN, "%f", chan->vert_offset);
+    snprintf(data.buf, BUFLEN, "%f", chan->saved_vert_offset);
+    /* get AC coupling setting from channel */
+    data.ac_coupled = chan->ac_offset;
+    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(vert->offset_ac), data.ac_coupled);
+    gtk_widget_set_sensitive(GTK_WIDGET(vert->offset_entry), !data.ac_coupled);
+
     gtk_entry_set_text(GTK_ENTRY(vert->offset_entry), data.buf);
     gtk_entry_set_max_length(GTK_ENTRY(vert->offset_entry), BUFLEN-1);
-    /* point at first char */
-    gtk_editable_set_position(GTK_EDITABLE(vert->offset_entry), 0);
-    /* select all chars, so if the user types the original value goes away */
-    gtk_editable_select_region(GTK_EDITABLE(vert->offset_entry), 0, strlen(data.buf));
-    /* make it active so user doesn't have to click on it */
-    gtk_widget_grab_focus(GTK_WIDGET(vert->offset_entry));
+    
+    if (!data.ac_coupled) {
+        /* point at first char */
+        gtk_editable_set_position(GTK_EDITABLE(vert->offset_entry), 0);
+        /* select all chars, so if the user types the original value goes away */
+        gtk_editable_select_region(GTK_EDITABLE(vert->offset_entry), 0, strlen(data.buf));
+        /* make it active so user doesn't have to click on it */
+        gtk_widget_grab_focus(GTK_WIDGET(vert->offset_entry));
+    }
 
     /* signals */
     g_signal_connect(vert->offset_ac, "toggled",
@@ -758,6 +769,14 @@ static void offset_changed(GtkEditable * editable, struct offset_data *data)
       gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ctrl_usr->vert.offset_ac));
     gtk_widget_set_sensitive(ctrl_usr->vert.offset_entry, !data->ac_coupled);
 
+    if (!data->ac_coupled) {
+        /* select all chars, so if the user types the original value goes away */
+        gtk_editable_select_region(
+            GTK_EDITABLE(ctrl_usr->vert.offset_entry), 0, strlen(data->buf));
+        /* make it active so user doesn't have to click on it */
+        gtk_widget_grab_focus(GTK_WIDGET(ctrl_usr->vert.offset_entry));
+    }
+
     /* maybe user typed something, save it in the buffer */
     text = gtk_entry_get_text(GTK_ENTRY(ctrl_usr->vert.offset_entry));
     snprintf(data->buf, BUFLEN, "%s", text);