[Nsclspectcl-cvscommits] SpecTcl/Display client.c,5.3,5.4 dispshare.h,5.6,5.7 spectra.cc,5.4,5.5 titles.cc,5.4,5.5 xamineDataTypes.h,5.1,5.2

[Ron F. <ro...@us...>]

Update of /cvsroot/nsclspectcl/SpecTcl/Display
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26218/Display

Modified Files:
	client.c dispshare.h spectra.cc titles.cc xamineDataTypes.h 
Log Message:
Modify how additional information is attached to the Xamine spectrum
titles so that window files still work on the SpecTcl spectrum name.


Index: dispshare.h
===================================================================
RCS file: /cvsroot/nsclspectcl/SpecTcl/Display/dispshare.h,v
retrieving revision 5.6
retrieving revision 5.7
diff -C2 -d -r5.6 -r5.7
*** dispshare.h	20 Feb 2006 18:51:22 -0000	5.6
--- dispshare.h	18 Apr 2006 20:27:27 -0000	5.7
***************
*** 110,113 ****
--- 110,114 ----
    }
    volatile char *getname(spec_title name, int id) volatile;
+   volatile char *getinfo(spec_title info, int id) volatile;
    unsigned int getchannel(int id, int ix) volatile;
    unsigned int getchannel(int id, int ix, int iy) volatile;

Index: client.c
===================================================================
RCS file: /cvsroot/nsclspectcl/SpecTcl/Display/client.c,v
retrieving revision 5.3
retrieving revision 5.4
diff -C2 -d -r5.3 -r5.4
*** client.c	22 Sep 2005 12:41:46 -0000	5.3
--- client.c	18 Apr 2006 20:27:27 -0000	5.4
***************
*** 848,851 ****
--- 848,852 ----
  
    memset((void*)Xamine_memory->dsp_titles[spno], 0, sizeof(spec_title));
+   memset((void*)Xamine_memory->dsp_info[spno],   0, sizeof(spec_title));
    if(title != NULL) 
      strncpy((char*)Xamine_memory->dsp_titles[spno], title, 

Index: titles.cc
===================================================================
RCS file: /cvsroot/nsclspectcl/SpecTcl/Display/titles.cc,v
retrieving revision 5.4
retrieving revision 5.5
diff -C2 -d -r5.4 -r5.5
*** titles.cc	20 Feb 2006 18:51:22 -0000	5.4
--- titles.cc	18 Apr 2006 20:27:27 -0000	5.5
***************
*** 716,720 ****
      xamine_shared->getname(label_element, def->spectrum());
      if(strlen(label_element) == 0) strcpy(label_element, "<Untitled>");
!     strncat(label, label_element, sizeof(label) - strlen(label) -1);
      strncat(label, " ", sizeof(label) - strlen(label) -1);
    }
--- 716,723 ----
      xamine_shared->getname(label_element, def->spectrum());
      if(strlen(label_element) == 0) strcpy(label_element, "<Untitled>");
!     strncat(label, label_element, sizeof(label) - strlen(label) - 1);
!     xamine_shared->getinfo(label_element, def->spectrum()); // The info string..
!     strncat(label, " : ", sizeof(label) - strlen(label) - 1);
!     strncat(label, label_element, sizeof(label) - strlen(label) - 1);
      strncat(label, " ", sizeof(label) - strlen(label) -1);
    }

Index: xamineDataTypes.h
===================================================================
RCS file: /cvsroot/nsclspectcl/SpecTcl/Display/xamineDataTypes.h,v
retrieving revision 5.1
retrieving revision 5.2
diff -C2 -d -r5.1 -r5.2
*** xamineDataTypes.h	20 Feb 2006 18:51:22 -0000	5.1
--- xamineDataTypes.h	18 Apr 2006 20:27:27 -0000	5.2
***************
*** 120,123 ****
--- 120,124 ----
    spec_dimension  dsp_xy[XAMINE_MAXSPEC];
    spec_title      dsp_titles[XAMINE_MAXSPEC];
+   spec_title      dsp_info[XAMINE_MAXSPEC];    /* Associated info.  */
    unsigned int    dsp_offsets[XAMINE_MAXSPEC];
    spec_type       dsp_types[XAMINE_MAXSPEC];

Index: spectra.cc
===================================================================
RCS file: /cvsroot/nsclspectcl/SpecTcl/Display/spectra.cc,v
retrieving revision 5.4
retrieving revision 5.5
diff -C2 -d -r5.4 -r5.5
*** spectra.cc	20 Feb 2006 18:51:22 -0000	5.4
--- spectra.cc	18 Apr 2006 20:27:27 -0000	5.5
***************
*** 474,477 ****
--- 474,482 ----
    return name;
  }
+ volatile char* spec_shared::getinfo(spec_title info, int id) volatile
+ {
+   cvttitle(info, dsp_info[id-1], 1);
+   return info;
+ }
  volatile char* spec_shared::getxlabel_map(spec_label label, int id) volatile
  {