[Nsclspectcl-cvscommits] SpecTcl/Display guintegrate.cc,5.2,5.3

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

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

Modified Files:
	guintegrate.cc 
Log Message:
Incorporate guintegrate fix into this version.


Index: guintegrate.cc
===================================================================
RCS file: /cvsroot/nsclspectcl/SpecTcl/Display/guintegrate.cc,v
retrieving revision 5.2
retrieving revision 5.3
diff -C2 -d -r5.2 -r5.3
*** guintegrate.cc	3 Jun 2005 15:18:56 -0000	5.2
--- guintegrate.cc	7 Jun 2005 11:53:33 -0000	5.3
***************
*** 669,679 ****
      return;
    }
-   // grobj_generic *objects[GROBJ_MAXOBJECTS];
- 
-   grobj_generic** objects = new grobj_generic*[nobjects];
-   Xamine_GetSpectrumObjects(specno,
- 			    objects,
- 			    nobjects, True);
- 
    /* Format the header.  Put it in the dialog and if logging is on, put
    ** it in the log file too:
--- 669,672 ----
***************
*** 690,732 ****
    }
    d->AddText(buffer);
-   int i;
-   for( i = 0; i < nobjects; i++) {
-     if( (objects[i]->type() == summing_region_1d) ||
-         (objects[i]->type() == summing_region_2d)) {
-       Integrate(dialog, objects[i], specno, spectype);
-     }
-   }
-   delete []objects;
  
!   if(!att->is1d()) {
!     sprintf(buffer,"Contours:\n");
!     if(Xamine_logging)
!       Xamine_log.LogMessage(buffer);
!     d->AddText(buffer);
! 
!     nobjects = Xamine_GetSpectrumGateCount(specno);
!     objects = new grobj_generic*[nobjects];
! 
!     Xamine_GetSpectrumGates(specno, objects, nobjects, True);
  
!     for(i = 0; i < nobjects; i++) {
!       if(objects[i]->type() == contour_2d) {
  	Integrate(dialog, objects[i], specno, spectype);
        }
-       delete []objects;
      }
!   }
!   else {
!     sprintf(buffer, "Cuts: \n");
!     if(Xamine_logging)
!       Xamine_log.LogMessage(buffer);
!     d->AddText(buffer);
!     nobjects = Xamine_GetSpectrumGateCount(specno);
!     objects = new grobj_generic*[nobjects];
  
      Xamine_GetSpectrumGates(specno, objects, nobjects, True);
!     for(i = 0; i < nobjects; i++) {
!       if(objects[i]->type() == cut_1d) {
!         Integrate(dialog, objects[i], specno, spectype);
        }
      }
--- 683,730 ----
    }
    d->AddText(buffer);
  
!   // grobj_generic *objects[GROBJ_MAXOBJECTS];
  
!   if(nobjects > 0) {
!     grobj_generic** objects = new grobj_generic*[nobjects];
!     Xamine_GetSpectrumObjects(specno,
! 			      objects,
! 			      nobjects, True);
!     
!     
!     int i;
!     for( i = 0; i < nobjects; i++) {
!       if( (objects[i]->type() == summing_region_1d) ||
! 	  (objects[i]->type() == summing_region_2d)) {
  	Integrate(dialog, objects[i], specno, spectype);
        }
      }
!     delete []objects;
  
+   }
+   nobjects = Xamine_GetSpectrumGateCount(specno);
+   if(nobjects > 0) {
+     grobj_generic** objects = new grobj_generic*[nobjects];    
      Xamine_GetSpectrumGates(specno, objects, nobjects, True);
!     grobj_type matching;
!     
!     if(!att->is1d()) {
!       sprintf(buffer,"Contours:\n");
!       if(Xamine_logging)
! 	Xamine_log.LogMessage(buffer);
!       d->AddText(buffer);
!       matching = contour_2d;
!     }
!     else {
!       sprintf(buffer, "Cuts: \n");
!       if(Xamine_logging)
! 	Xamine_log.LogMessage(buffer);
!       d->AddText(buffer);
!       matching = cut_1d;
!       
!     }      
!     for(int i = 0; i < nobjects; i++) {
!       if(objects[i]->type() == matching) {
! 	Integrate(dialog, objects[i], specno, spectype);
        }
      }
***************
*** 735,738 ****
--- 733,737 ----
  
  }
+ 
  
  /*