[Nsclspectcl-cvscommits] SpecTcl/Xamine Xamineplus.cpp,4.3,4.3.4.1

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

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

Modified Files:
      Tag: SpecTcl-2-2_development
	Xamineplus.cpp 
Log Message:
Issue 120 and related bugs: Memory leak on spectrum -delet -all
- Also fix up the way iteration works.
- Fix Issues in Xamine interface library: check for allocation failure was too late.
- Fix issues in Xamine allocator/free.. correct compaction algorithms.



Index: Xamineplus.cpp
===================================================================
RCS file: /cvsroot/nsclspectcl/SpecTcl/Xamine/Xamineplus.cpp,v
retrieving revision 4.3
retrieving revision 4.3.4.1
diff -C2 -d -r4.3 -r4.3.4.1
*** Xamineplus.cpp	13 Nov 2003 19:59:57 -0000	4.3
--- Xamineplus.cpp	13 Apr 2004 19:37:24 -0000	4.3.4.1
***************
*** 770,784 ****
  			       (char*)(p1d->getTitle().c_str()),
  			       p1d->getWord());
! 
!     // Apply the mapping transformation if it exists
!     CXamineMap1D Xmap = p1d->getXamineMap();
!     if(Xmap.getLow() != Xmap.getHigh()) {
!       Xamine_SetMap1d(nSpectrum, Xmap.getLow(), Xmap.getHigh(),
! 		      const_cast<char*>(Xmap.getUnits().c_str()));
!     }
!     else {
!       Xamine_SetMap1d(nSpectrum, 0.0, 0.0, "");
!     }
!     if(pData) {			// Successful completion:
        CXamine1D result(m_pDisplay, nSpectrum-1);
        *p1d  = result;
--- 770,783 ----
  			       (char*)(p1d->getTitle().c_str()),
  			       p1d->getWord());
!     if(pData) {
!       // Apply the mapping transformation if it exists
!       CXamineMap1D Xmap = p1d->getXamineMap();
!       if(Xmap.getLow() != Xmap.getHigh()) {
! 	Xamine_SetMap1d(nSpectrum, Xmap.getLow(), Xmap.getHigh(),
! 			const_cast<char*>(Xmap.getUnits().c_str()));
!       }
!       else {
! 	Xamine_SetMap1d(nSpectrum, 0.0, 0.0, "");
!       }
        CXamine1D result(m_pDisplay, nSpectrum-1);
        *p1d  = result;
***************
*** 795,809 ****
  			       (char*)(p2d->getTitle().c_str()),
  			       p2d->getByte());
- 
-     // Apply the mapping transformation if it exists
-     CXamineMap2D Xmap = p2d->getXamineMap();
-     if(Xmap.getXLow() != Xmap.getXHigh()) {
-       Xamine_SetMap2d(nSpectrum,
- 		      Xmap.getXLow(), Xmap.getXHigh(), 
- 		      const_cast<char*>(Xmap.getXUnits().c_str()),
- 		      Xmap.getYLow(), Xmap.getYHigh(), 
- 		      const_cast<char*>(Xmap.getYUnits().c_str()));
-     }
      if(pData) {			// Success
        CXamine2D result(m_pDisplay, nSpectrum-1);
        *p2d = result;
--- 794,808 ----
  			       (char*)(p2d->getTitle().c_str()),
  			       p2d->getByte());
      if(pData) {			// Success
+       
+       // Apply the mapping transformation if it exists
+       CXamineMap2D Xmap = p2d->getXamineMap();
+       if(Xmap.getXLow() != Xmap.getXHigh()) {
+ 	Xamine_SetMap2d(nSpectrum,
+ 			Xmap.getXLow(), Xmap.getXHigh(), 
+ 			const_cast<char*>(Xmap.getXUnits().c_str()),
+ 			Xmap.getYLow(), Xmap.getYHigh(), 
+ 			const_cast<char*>(Xmap.getYUnits().c_str()));
+       }
        CXamine2D result(m_pDisplay, nSpectrum-1);
        *p2d = result;