Changeset 65

Timestamp:

10/30/2008 11:08:08 PM (14 years ago)

Author:

marcus

Message:

r50 | svn | 2008-10-16 15:31:16 +0200 (Do, 16 Okt 2008) | 1 line

fix problem with but-bp autofilter; ReadAgain? didnt remember filter

Location:

SH_SHM/trunk

Files:

• inputs/filter_lookup.txt (modified) (1 diff)
• inputs/sensitivities.txt (modified) (2 diffs)
• source/motif/mfexec.c (modified) (3 diffs)
• source/motif/shm.c (modified) (2 diffs)

SH_SHM/trunk/inputs/filter_lookup.txt

@@ -353 +353 @@
 NKC-BH-N GRSN
 NKC-BH-E GRSN
+NKC-HH-Z GRSN
+NKC-HH-N GRSN
+NKC-HH-E GRSN
 OKC-BH-Z GRSN
 OKC-BH-N GRSN

SH_SHM/trunk/inputs/sensitivities.txt

@@ -2 +2 @@
 !      =================
 !
-! $Revision: 41 $, $Date: 2008-10-13 10:41:39 +0200 (Mo, 13 Okt 2008) $
+! $Revision: 50 $, $Date: 2008-10-16 15:31:16 +0200 (Do, 16 Okt 2008) $
 !
 ! Sensitivity file for data streams
@@ -541 +541 @@
 nkc-bh-?    16-may-1997         9-sep-2003         0.749
 nkc-bh-?    10-sep-2003        ...                 1.67
+nkc-hh-?    16-may-1997         9-sep-2003         0.749
+nkc-hh-?    10-sep-2003        ...                 1.67
 
 ojc-bh-?     1-jan-1991        ...                 0.198

SH_SHM/trunk/source/motif/mfexec.c

@@ -3 +3 @@
  *      ========
  *
- * $Revision: 49 $, $Date: 2008-10-14 22:36:40 +0200 (Di, 14 Okt 2008) $
+ * $Revision: 50 $, $Date: 2008-10-16 15:31:16 +0200 (Do, 16 Okt 2008) $
  *
  * execution of SH commands
@@ -1190 +1190 @@
         XtSetValues( w[k_widget_filter_autocut_option], al, 1 );
 
-        for  (i=k_widget_filter_none; i<=k_widget_filter_sro_lp; i++)
+        for  (i=k_widget_filter_none; i<=k_widget_filter_displace; i++)
                 if  (i != k_widget_filter_lrsm_lp)
                         XmToggleButtonSetState( w[i], FALSE, FALSE );
@@ -1209 +1209 @@
         else if  (strcmp(fil->name,"SRO_LP") == 0)
                 XmToggleButtonSetState( w[k_widget_filter_sro_lp], TRUE, FALSE );
+        else if  (strcmp(fil->name,"BUT_BP") == 0)
+                XmToggleButtonSetState( w[k_widget_filter_but_bp], TRUE, FALSE );
+        else if  (strcmp(fil->name,"BUT_HP") == 0)
+                XmToggleButtonSetState( w[k_widget_filter_but_hp], TRUE, FALSE );
+        else if  (strcmp(fil->name,"BUT_LP") == 0)
+                XmToggleButtonSetState( w[k_widget_filter_but_lp], TRUE, FALSE );
+        else if  (strcmp(fil->name,"DISPLACEMENT") == 0)
+                XmToggleButtonSetState( w[k_widget_filter_displace], TRUE, FALSE );
 
         cu_set_string( w[k_widget_filter_edit_text], fil->name );

SH_SHM/trunk/source/motif/shm.c

@@ -3 +3 @@
  *      =====
  *
- * $Revision: 49 $, $Date: 2008-10-14 22:36:40 +0200 (Di, 14 Okt 2008) $
+ * $Revision: 50 $, $Date: 2008-10-16 15:31:16 +0200 (Do, 16 Okt 2008) $
  *
  * main module of shm
@@ -1501 +1501 @@
                 } /*endif*/
                 if  (strcmp(GpGetString(cGpS_default_filter),"BUT_BP") == 0)  {
+                        strcpy( xmv_cmd_filter.name, cu_get_string(
+                                xmv_w[k_widget_filter_edit_text]) );
                         cl_create_filter( xmv_w, CLC_CREFIL_BUT_BP, &status );
+                        cu_set_string( xmv_w[k_widget_filter_edit_text], xmv_cmd_filter.name );
                         if  (Severe(&status))  {
                                 cl2_display_busy( xmv_w, FALSE );
                                 break;
                         } /*endif*/
-                        strcpy( xmv_cmd_filter.name, cu_get_string(
-                                xmv_w[k_widget_filter_edit_text]) );
                 } /*endif*/
                 if  (xmv_cmd_filter.name[0] != '\0')  {