Changeset 43

Timestamp:

10/30/2008 10:47:14 PM (15 years ago)

Author:

marcus

Message:

r28 | svn | 2008-02-20 19:55:17 +0100 (Mi, 20 Feb 2008) | 1 line

fixed apparent bug in cu_alert; XmSTRING_DEFAULT_CHARSET instead of blank prevents blocked SHM by insensitivity of menu

Location:

SH_SHM/trunk

Files:

• inputs/filter_lookup.txt (modified) (1 diff)
• inputs/sensitivities.txt (modified) (2 diffs)
• source/motif/cblib2.c (modified) (1 diff)
• source/motif/cbutil.c (modified) (2 diffs)
• source/motif/shm.c (modified) (4 diffs)

SH_SHM/trunk/inputs/filter_lookup.txt

@@ -6 +6 @@
 ! external filter lookup table (built-in table takes preference)
 ! K. Stammler, 18-Dec-95
+ASSE-BH-Z GRSN
+ASSE-BH-N GRSN
+ASSE-BH-E GRSN
+ASSE-HH-Z GRSN
+ASSE-HH-N GRSN
+ASSE-HH-E GRSN
 GRA5-BH-Z GRSN
 GRA5-BH-N GRSN

SH_SHM/trunk/inputs/sensitivities.txt

@@ -2 +2 @@
 !      =================
 !
-! $Revision: 20 $, $Date: 2008-02-01 17:54:31 +0100 (Fr, 01 Feb 2008) $
+! $Revision: 28 $, $Date: 2008-02-20 19:55:17 +0100 (Mi, 20 Feb 2008) $
 !
 ! Sensitivity file for data streams
@@ -19 +19 @@
 
 arsa-bh-?   ...                ...                 1.67
+
+asse-bh-?   01-jul-2007_00:00  ...                 1.58946
+asse-hh-?   01-jul-2007_00:00  ...                 1.58946
 
 bfo-bh-?    ...                ...                 1.67

SH_SHM/trunk/source/motif/cblib2.c

@@ -1247 +1247 @@
 {
         /* executable code */
+
+        if  (GpGetInt(cGpI_debug_level) > 3)
+                printf( "SHM-dbg4: now set sensitivity: %d\n", !on );
 
         XtSetSensitive( w[k_widget_menu_main], !on );

SH_SHM/trunk/source/motif/cbutil.c

@@ -1623 +1623 @@
         if  (XtIsManaged(w))  XtUnmanageChild( w );
 
-        /*if  (xstr_init)  XtFree( (char *)xstr );*/
-        xstr = XmStringLtoRCreate( text, "" );
+        /*if  (xstr_init)  XmStringFree( (char *)xstr );*/
+        xstr = XmStringLtoRCreate( text, XmSTRING_DEFAULT_CHARSET );
         xstr_init = TRUE;
 
@@ -1670 +1670 @@
                 return;
         } /*endif*/
+
+        if  (GpGetInt(cGpI_debug_level) > 3)
+                printf( "SHM-dbg4: want to create error message: %s\n", str );
 
         cu_alert_message( cuv_alert_widget, str );

SH_SHM/trunk/source/motif/shm.c

@@ -3 +3 @@
  *      =====
  *
- * $Revision: 25 $, $Date: 2008-02-06 20:01:11 +0100 (Mi, 06 Feb 2008) $
+ * $Revision: 28 $, $Date: 2008-02-20 19:55:17 +0100 (Mi, 20 Feb 2008) $
  *
  * main module of shm
@@ -1480 +1480 @@
                 if  (Severe(&status))  {
                         cl2_display_busy( xmv_w, FALSE );
+                        if  (GpGetInt(cGpI_debug_level) > 3)
+                                printf( "SHM-dbg4: read aborted, status %d\n", status );
                         break;
                 } else if  (mg_dsptrcs() == 0)  {
                         status = CUE_NO_TRACES;
                         cl2_display_busy( xmv_w, FALSE );
+                        if  (GpGetInt(cGpI_debug_level) > 3)
+                                printf( "SHM-dbg4: no traces read, status %d\n", status );
                         break;
                 } /*endif*/
@@ -2006 +2010 @@
                 cu_get_param_values( xmv_w, xmv_cpar );
                 cl3_set_theo_phases( xmv_w, &status );
-                if  (Severe(&status))  break;
+                if  (Severe(&status))  {
+                        XtSetSensitive( xmv_w[k_widget_menu_main], TRUE );
+                        break;
+                } /*endif*/
                 cu_theo_arrivals( xmv_w[k_widget_draw], xmv_w[k_widget_single_draw],
                         xmv_cpar, &status );
@@ -2787 +2794 @@
         /* XtSetSensitive( xmv_w[k_widget_main], TRUE ); */
 
+        if  (GpGetInt(cGpI_debug_level) > 3)
+                printf( "SHM-dbg4: end of xm_call_activate, status %d\n", status );
+
         if  (Severe(&status))  {
+                if  (GpGetInt(cGpI_debug_level) > 3)
+                        printf( "SHM-dbg4: call cu_alert\n" );
                 cu_alert( status );
                 /* printf( "*SHM: xm_call_activate: status %d\n", status ); */