Changeset 66 for SH_SHM/trunk

Timestamp:

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

Author:

marcus

Message:

r51 | svn | 2008-10-17 11:20:26 +0200 (Fr, 17 Okt 2008) | 1 line

changed version number of SHM; fixed unwanted string output --redraw--

Location:

SH_SHM/trunk/source/motif

Files:

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

SH_SHM/trunk/source/motif/motifgraph.c

@@ -3499 +3499 @@
 
         if  (ypos < 0)  {
-                int x, y, xw, xh, bw, dp;   /* window parameters */
-                unsigned root_ret;
+                Window   root_ret;   /* root window */
+                int      x, y;       /* position within root window */
+                unsigned bw, dp;     /* border width & depth */
+                unsigned xw, xh;
                 /* not yet initialised */
                 XGetGeometry( XtDisplay(w), XtWindow(w), &root_ret,
@@ -3507 +3509 @@
         } /*endif*/
 
-        if  (strcmp(detecinfo,"--redraw--") == 0 && *oldstr != '\0')  {
-                strcpy( str, oldstr );
-                pix_DrawString( XtDisplay(w), XtWindow(w), mgv_over_gc,
-                        TEXT_X_DETEC, mgv_wdwsetup.margin_t+ypos,
-                        str, (int)strlen(str) );
-                XFlush( XtDisplay(w) );
+        if  (strcmp(detecinfo,"--redraw--") == 0)  {
+                if  (*oldstr != '\0')  {
+                        strcpy( str, oldstr );
+                        pix_DrawString( XtDisplay(w), XtWindow(w), mgv_over_gc,
+                                TEXT_X_DETEC, mgv_wdwsetup.margin_t+ypos,
+                                str, (int)strlen(str) );
+                        XFlush( XtDisplay(w) );
+                } /*endif*/
                 return;
         } /*endif*/

SH_SHM/trunk/source/motif/shm.c

@@ -3 +3 @@
  *      =====
  *
- * $Revision: 50 $, $Date: 2008-10-16 15:31:16 +0200 (Do, 16 Okt 2008) $
+ * $Revision: 51 $, $Date: 2008-10-17 11:20:26 +0200 (Fr, 17 Okt 2008) $
  *
  * main module of shm
@@ -680 +680 @@
 
         printf( "\n" );
-        printf( "SeismicHandler version 2.4i (16-Jan-2008), Copyright (C) 2006\n" );
+        printf( "SeismicHandler version 2.4j (17-Oct-2008), Copyright (C) 2006\n" );
         printf( "Klaus Stammler, Seismological Observatory Graefenberg (SZGRF)\n" );
         printf( "of the Federal Institute for Geosciences and Natural Resources (BGR).\n" );
@@ -1500 +1500 @@
                         break;
                 } /*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]) );
+                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 );
-                        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')  {