Changeset 67

Timestamp:

10/30/2008 11:09:03 PM (15 years ago)

Author:

marcus

Message:

r52 | svn | 2008-10-17 12:57:15 +0200 (Fr, 17 Okt 2008) | 1 line

fixed problems with defalt filter

Location:

SH_SHM/trunk/source/motif

Files:

• mfexec.c (modified) (2 diffs)
• shm.c (modified) (3 diffs)

SH_SHM/trunk/source/motif/mfexec.c

@@ -3 +3 @@
  *      ========
  *
- * $Revision: 50 $, $Date: 2008-10-16 15:31:16 +0200 (Do, 16 Okt 2008) $
+ * $Revision: 52 $, $Date: 2008-10-17 12:57:15 +0200 (Fr, 17 Okt 2008) $
  *
  * execution of SH commands
@@ -486 +486 @@
                 strcpy( filtername, GpGetString(cGpS_autofilter_tele) );
         } /*endif*/
+        if  (GpGetInt(cGpI_debug_level) > 2)
+                printf( "SHM-dbg3: :LOC filter selected %s\n", filtername );
 
 } /* end of mx_filter_from_autoevt */

SH_SHM/trunk/source/motif/shm.c

@@ -3 +3 @@
  *      =====
  *
- * $Revision: 51 $, $Date: 2008-10-17 11:20:26 +0200 (Fr, 17 Okt 2008) $
+ * $Revision: 52 $, $Date: 2008-10-17 12:57:15 +0200 (Fr, 17 Okt 2008) $
  *
  * main module of shm
@@ -1444 +1444 @@
                 strcpy( xmv_phase.name, GpGetString(cGpS_auto_phase) );
                 cu_phase_box_defaults( xmv_w, &xmv_phase );
-                if  (TRUE)  {
-                        mx_filter_from_autoevt( autoevt, xmv_cmd_filter.name,
-                                &xmv_cmd_filter.autocut );
-                        if  (*xmv_cmd_filter.name == '\0')  {
-                                xmv_cmd_filter.autocut = 5.0;  /* shv_globals not yet implemented */
-                                strcpy( xmv_cmd_filter.name, GpGetString(cGpS_default_filter) );
-                        } /*endif*/
-                } else {
-                        xmv_cmd_filter.autocut = 5.0;  /* shv_globals not yet implemented */
-                        strcpy( xmv_cmd_filter.name, GpGetString(cGpS_default_filter) );
-                } /*endif*/
+                xmv_cmd_filter.autocut = 5.0;  /* shv_globals not yet implemented */
+                strcpy( xmv_cmd_filter.name, GpGetString(cGpS_default_filter) );
                 mx_filter_box_defaults( xmv_w, &xmv_cmd_filter );
                 xmv_dspctrl.zoom = 1.0;
@@ -1500 +1491 @@
                         break;
                 } /*endif*/
-                if  (strcmp(GpGetString(cGpS_default_filter),"BUT_BP") == 0
-                        && *tag == k_button_read_grsn_readnew)  {
-                        cl_create_filter( xmv_w, CLC_CREFIL_BUT_BP, &status );
-                        if  (Severe(&status))  {
-                                cl2_display_busy( xmv_w, FALSE );
-                                break;
+                if  (*tag == k_button_read_grsn_readnew)  {
+                        if  (GpGetBoolean(cGpB_autofilter_by_distance))  {
+                                mx_filter_from_autoevt( autoevt, xmv_cmd_filter.name,
+                                        &xmv_cmd_filter.autocut );
+                                if  (*xmv_cmd_filter.name == '\0')  {
+                                        xmv_cmd_filter.autocut = 5.0;  /* shv_globals not yet implemented */
+                                        strcpy( xmv_cmd_filter.name, GpGetString(cGpS_default_filter) );
+                                } /*endif*/
+                                if  (strcmp(xmv_cmd_filter.name,"BUT_BP") == 0)  {
+                                        cl_create_filter( xmv_w, CLC_CREFIL_BUT_BP, &status );
+                                        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*/
+                        } else {
+                                if  (strcmp(GpGetString(cGpS_default_filter),"BUT_BP") == 0
+                                        && *tag == k_button_read_grsn_readnew)  {
+                                        cl_create_filter( xmv_w, CLC_CREFIL_BUT_BP, &status );
+                                        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]) );
+                                } else {
+                                        xmv_cmd_filter.autocut = 5.0;  /* shv_globals not yet implemented */
+                                        strcpy( xmv_cmd_filter.name, GpGetString(cGpS_default_filter) );
+                                } /*endif*/
                         } /*endif*/
-                        strcpy( xmv_cmd_filter.name, cu_get_string(
-                                xmv_w[k_widget_filter_edit_text]) );
                 } /*endif*/
                 if  (xmv_cmd_filter.name[0] != '\0')  {