Changeset 67
- Timestamp:
- 10/30/2008 11:09:03 PM (15 years ago)
- Location:
- SH_SHM/trunk/source/motif
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
SH_SHM/trunk/source/motif/mfexec.c
r65 r67 3 3 * ======== 4 4 * 5 * $Revision: 5 0 $, $Date: 2008-10-16 15:31:16 +0200 (Do, 16Okt 2008) $5 * $Revision: 52 $, $Date: 2008-10-17 12:57:15 +0200 (Fr, 17 Okt 2008) $ 6 6 * 7 7 * execution of SH commands … … 486 486 strcpy( filtername, GpGetString(cGpS_autofilter_tele) ); 487 487 } /*endif*/ 488 if (GpGetInt(cGpI_debug_level) > 2) 489 printf( "SHM-dbg3: :LOC filter selected %s\n", filtername ); 488 490 489 491 } /* end of mx_filter_from_autoevt */ -
SH_SHM/trunk/source/motif/shm.c
r66 r67 3 3 * ===== 4 4 * 5 * $Revision: 5 1 $, $Date: 2008-10-17 11:20:26+0200 (Fr, 17 Okt 2008) $5 * $Revision: 52 $, $Date: 2008-10-17 12:57:15 +0200 (Fr, 17 Okt 2008) $ 6 6 * 7 7 * main module of shm … … 1444 1444 strcpy( xmv_phase.name, GpGetString(cGpS_auto_phase) ); 1445 1445 cu_phase_box_defaults( xmv_w, &xmv_phase ); 1446 if (TRUE) { 1447 mx_filter_from_autoevt( autoevt, xmv_cmd_filter.name, 1448 &xmv_cmd_filter.autocut ); 1449 if (*xmv_cmd_filter.name == '\0') { 1450 xmv_cmd_filter.autocut = 5.0; /* shv_globals not yet implemented */ 1451 strcpy( xmv_cmd_filter.name, GpGetString(cGpS_default_filter) ); 1452 } /*endif*/ 1453 } else { 1454 xmv_cmd_filter.autocut = 5.0; /* shv_globals not yet implemented */ 1455 strcpy( xmv_cmd_filter.name, GpGetString(cGpS_default_filter) ); 1456 } /*endif*/ 1446 xmv_cmd_filter.autocut = 5.0; /* shv_globals not yet implemented */ 1447 strcpy( xmv_cmd_filter.name, GpGetString(cGpS_default_filter) ); 1457 1448 mx_filter_box_defaults( xmv_w, &xmv_cmd_filter ); 1458 1449 xmv_dspctrl.zoom = 1.0; … … 1500 1491 break; 1501 1492 } /*endif*/ 1502 if (strcmp(GpGetString(cGpS_default_filter),"BUT_BP") == 0 1503 && *tag == k_button_read_grsn_readnew) { 1504 cl_create_filter( xmv_w, CLC_CREFIL_BUT_BP, &status ); 1505 if (Severe(&status)) { 1506 cl2_display_busy( xmv_w, FALSE ); 1507 break; 1493 if (*tag == k_button_read_grsn_readnew) { 1494 if (GpGetBoolean(cGpB_autofilter_by_distance)) { 1495 mx_filter_from_autoevt( autoevt, xmv_cmd_filter.name, 1496 &xmv_cmd_filter.autocut ); 1497 if (*xmv_cmd_filter.name == '\0') { 1498 xmv_cmd_filter.autocut = 5.0; /* shv_globals not yet implemented */ 1499 strcpy( xmv_cmd_filter.name, GpGetString(cGpS_default_filter) ); 1500 } /*endif*/ 1501 if (strcmp(xmv_cmd_filter.name,"BUT_BP") == 0) { 1502 cl_create_filter( xmv_w, CLC_CREFIL_BUT_BP, &status ); 1503 if (Severe(&status)) { 1504 cl2_display_busy( xmv_w, FALSE ); 1505 break; 1506 } /*endif*/ 1507 strcpy( xmv_cmd_filter.name, cu_get_string( 1508 xmv_w[k_widget_filter_edit_text]) ); 1509 } /*endif*/ 1510 } else { 1511 if (strcmp(GpGetString(cGpS_default_filter),"BUT_BP") == 0 1512 && *tag == k_button_read_grsn_readnew) { 1513 cl_create_filter( xmv_w, CLC_CREFIL_BUT_BP, &status ); 1514 if (Severe(&status)) { 1515 cl2_display_busy( xmv_w, FALSE ); 1516 break; 1517 } /*endif*/ 1518 strcpy( xmv_cmd_filter.name, cu_get_string( 1519 xmv_w[k_widget_filter_edit_text]) ); 1520 } else { 1521 xmv_cmd_filter.autocut = 5.0; /* shv_globals not yet implemented */ 1522 strcpy( xmv_cmd_filter.name, GpGetString(cGpS_default_filter) ); 1523 } /*endif*/ 1508 1524 } /*endif*/ 1509 strcpy( xmv_cmd_filter.name, cu_get_string(1510 xmv_w[k_widget_filter_edit_text]) );1511 1525 } /*endif*/ 1512 1526 if (xmv_cmd_filter.name[0] != '\0') {
Note: See TracChangeset
for help on using the changeset viewer.