[Nsclspectcl-cvscommits] SpecTcl/Display Makefile.am,4.5,4.6 axes.cc,4.7,4.8 trackcursor.cc,4.3,4.4

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

Update of /cvsroot/nsclspectcl/SpecTcl/Display
In directory sc8-pr-cvs1:/tmp/cvs-serv7080/Display

Modified Files:
	Makefile.am axes.cc trackcursor.cc 
Log Message:
Figure out error in axes.cc/trackcursor.cc that cause the y axis labels of 
a 2-d to disappear in mapped mode, and that cause the y location ticker on 
mapped 2d display to disappear too.


Index: Makefile.am
===================================================================
RCS file: /cvsroot/nsclspectcl/SpecTcl/Display/Makefile.am,v
retrieving revision 4.5
retrieving revision 4.6
diff -C2 -d -r4.5 -r4.6
*** Makefile.am	25 Nov 2003 12:37:47 -0000	4.5
--- Makefile.am	12 Dec 2003 17:56:22 -0000	4.6
***************
*** 5,9 ****
  	XMPushbutton.cc XMManagers.cc XMText.cc
  
! INCLUDES = @XINCLUDES@ @MOTIF_INCLUDES@ $(HOMEDEF) $(GRIFLAGS)
  LDFLAGS = -g @XLIBSW@ @MOTIF_LIBSW@ @XTLIBSW@ @LD_EXTRA_FLAGS@
  XCCFLAGS = -g -c -w -I. -I.. $(INCLUDES) -DXTFUNCPROTO -DXAMINE
--- 5,9 ----
  	XMPushbutton.cc XMManagers.cc XMText.cc
  
! INCLUDES = -I.. @XINCLUDES@ @MOTIF_INCLUDES@ $(HOMEDEF) $(GRIFLAGS)
  LDFLAGS = -g @XLIBSW@ @MOTIF_LIBSW@ @XTLIBSW@ @LD_EXTRA_FLAGS@
  XCCFLAGS = -g -c -w -I. -I.. $(INCLUDES) -DXTFUNCPROTO -DXAMINE

Index: axes.cc
===================================================================
RCS file: /cvsroot/nsclspectcl/SpecTcl/Display/axes.cc,v
retrieving revision 4.7
retrieving revision 4.8
diff -C2 -d -r4.7 -r4.8
*** axes.cc	7 Nov 2003 21:33:38 -0000	4.7
--- axes.cc	12 Dec 2003 17:56:22 -0000	4.8
***************
*** 394,398 ****
  	  (ntick < 10) && (ntick >= 6))
      return tickint;
- 
    // Otherwise, see if we can make it a nice one the easy way
    if((paramrange / 10.0 >= 6) && (paramrange / 10.0 < 10)) {
--- 394,397 ----
***************
*** 812,816 ****
    last_value        = -1;	/* Make sure first tick is drawn. */
  
!   value_interval = (float)ComputeLinearTickInterval(hi - low +1, ybase+1);
  
  
--- 811,815 ----
    last_value        = -1;	/* Make sure first tick is drawn. */
  
!   value_interval = (float)ComputeLinearTickInterval(hi - low +1, (ny-ybase+1));
  
  
***************
*** 888,899 ****
  
    value_represented = (float)low;
!   last_value        = -1;	/* Make sure first tick is drawn. */
  
    // Compute the interval to display between successive tick marks
!   value_interval = ComputeMappedTickInterval((hi-low)+1, ybase+1);
  
    rem = value_interval - (int)value_interval;
!   interval = ((float)(ybase + 1) * value_interval) / (hi-low);
!   height   = (int)((nx-xbase)*XAMINE_TICK_FRACTION);
  
    int labelheight = (int)((float)(2*interval)/
--- 887,902 ----
  
    value_represented = (float)low;
!   last_value        = -1.111111;	/* Make sure first tick is drawn. */
  
    // Compute the interval to display between successive tick marks
!  
!   value_interval = ComputeMappedTickInterval((hi-low), (ybase+1));
!   if(value_interval == 0) {
!     value_interval = 0.2;
!   }
  
    rem = value_interval - (int)value_interval;
!   interval = ((float)(ybase) * value_interval) / (hi-low);
!   height   = (int)((ybase)*XAMINE_TICK_FRACTION);
  
    int labelheight = (int)((float)(2*interval)/

Index: trackcursor.cc
===================================================================
RCS file: /cvsroot/nsclspectcl/SpecTcl/Display/trackcursor.cc,v
retrieving revision 4.3
retrieving revision 4.4
diff -C2 -d -r4.3 -r4.4
*** trackcursor.cc	25 Aug 2003 16:25:31 -0000	4.3
--- trackcursor.cc	12 Dec 2003 17:56:22 -0000	4.4
***************
*** 422,434 ****
    fx = (Xamine_XChanToMapped(sid, locdata.xpos+1) + 
  	Xamine_XChanToMapped(sid, locdata.xpos)) / 2.0;
!   ffy = (Xamine_XChanToMapped(sid, locdata.ypos+1) +
! 	 Xamine_XChanToMapped(sid, locdata.ypos)) / 2.0;
  
    // These only make sense if we are 2-d, or flipped
    if((atts->is1d()) || (atts->isflipped())) {
!     fy = (Xamine_YChanToMapped(sid, locdata.ypos+1) + 
  	  Xamine_YChanToMapped(sid, locdata.ypos)) / 2.0;
!     ffx = (Xamine_YChanToMapped(sid, locdata.xpos+1) +
! 	   Xamine_YChanToMapped(sid, locdata.xpos)) / 2.0;
    }
  
--- 422,434 ----
    fx = (Xamine_XChanToMapped(sid, locdata.xpos+1) + 
  	Xamine_XChanToMapped(sid, locdata.xpos)) / 2.0;
!   fy = (Xamine_YChanToMapped(sid, locdata.ypos+1) +
! 	 Xamine_YChanToMapped(sid, locdata.ypos)) / 2.0;
  
    // These only make sense if we are 2-d, or flipped
    if((atts->is1d()) || (atts->isflipped())) {
!     ffy = (Xamine_YChanToMapped(sid, locdata.ypos+1) + 
  	  Xamine_YChanToMapped(sid, locdata.ypos)) / 2.0;
!     ffx = (Xamine_XChanToMapped(sid, locdata.xpos+1) +
! 	   Xamine_XChanToMapped(sid, locdata.xpos)) / 2.0;
    }