codebase / stimlib

Commit 6a46c8ff09229928c105e8fc22ab8b2a8b074833

Authored by David Mayerich
1 parent ba51ae6a

fixed bugs in applying masks to files

Showing 4 changed files with 14 additions and 12 deletions   Show diff stats
Inline Side-by-side
stim/envi/bil.h
  Show/Hide comments   View file @6a46c8f
... ... @@ -818,7 +818,7 @@ public:
818 818  
819 819 /// @param outfile is the name of the masked output file
820 820 /// @param p is a pointer to memory of size X * Y, where p(i) = 0 for pixels that will be set to zero.
821   - bool apply_mask(std::string outfile, unsigned char* p){
  821 + bool apply_mask(std::string outfile, unsigned char* p, bool PROGRESS = false){
822 822  
823 823 std::ofstream target(outfile.c_str(), std::ios::binary);
824 824  
... ... @@ -842,6 +842,7 @@ public:
842 842 }
843 843 }
844 844 target.write(reinterpret_cast<const char*>(temp), L); //write a band data into target file
  845 + if(PROGRESS) progress = (double)(i+1) / (double)Y() * 100;
845 846 }
846 847 target.close();
847 848 free(temp);
... ...
stim/envi/bip.h
  Show/Hide comments   View file @6a46c8f
... ... @@ -745,7 +745,7 @@ public:
745 745  
746 746 /// @param outfile is the name of the masked output file
747 747 /// @param p is a pointer to memory of size X * Y, where p(i) = 0 for pixels that will be set to zero.
748   - bool apply_mask(std::string outfile, unsigned char* p){
  748 + bool apply_mask(std::string outfile, unsigned char* p, bool PROGRESS = false){
749 749  
750 750 std::ofstream target(outfile.c_str(), std::ios::binary);
751 751  
... ... @@ -768,6 +768,7 @@ public:
768 768 }
769 769 }
770 770 target.write(reinterpret_cast<const char*>(temp), L); //write the edited band data into target file
  771 + if(PROGRESS) progress = (double)(i+1) / (double)Y() * 100;
771 772 }
772 773 target.close(); //close the target file
773 774 free(temp); //free allocated memory
... ...
stim/envi/bsq.h
  Show/Hide comments   View file @6a46c8f
... ... @@ -734,7 +734,7 @@ public:
734 734  
735 735 /// @param outfile is the name of the masked output file
736 736 /// @param p is a pointer to memory of size X * Y, where p(i) = 0 for pixels that will be set to zero.
737   - bool apply_mask(std::string outfile, unsigned char* p){
  737 + bool apply_mask(std::string outfile, unsigned char* p, bool PROGRESS = false){
738 738  
739 739 std::ofstream target(outfile.c_str(), std::ios::binary);
740 740  
... ... @@ -756,6 +756,7 @@ public:
756 756 }
757 757 }
758 758 target.write(reinterpret_cast<const char*>(temp), L); //write the XY slice at that band to disk
  759 + if(PROGRESS) progress = (double)(i + 1) / (double)Z() * 100;
759 760 }
760 761 target.close();
761 762 free(temp);
... ...
stim/envi/envi.h
  Show/Hide comments   View file @6a46c8f
... ... @@ -541,32 +541,31 @@ public:
541 541  
542 542 /// @param outfile is the name of the resulting masked output file
543 543 /// @param p is memory of size X*Y containing the mask (0 = false, all other values are true)
544   - bool apply_mask(std::string outfile, unsigned char* p)
  544 + void apply_mask(std::string outfile, unsigned char* p, bool PROGRESS = false)
545 545 {
546   - header.save(outfile + ".hdr");
547 546 if (header.interleave == envi_header::BSQ){ //if the infile is bsq file
548 547 if (header.data_type == envi_header::float32)
549   - return ((bsq<float>*)file)->apply_mask(outfile, p);
  548 + ((bsq<float>*)file)->apply_mask(outfile, p, PROGRESS);
550 549 else if (header.data_type == envi_header::float64)
551   - return ((bsq<double>*)file)->apply_mask(outfile, p);
  550 + ((bsq<double>*)file)->apply_mask(outfile, p, PROGRESS);
552 551 else
553 552 std::cout << "ERROR: unidentified data type" << std::endl;
554 553 }
555 554  
556 555 else if (header.interleave == envi_header::BIL){ //if the infile is bil file
557 556 if (header.data_type == envi_header::float32)
558   - return ((bil<float>*)file)->apply_mask(outfile, p);
  557 + ((bil<float>*)file)->apply_mask(outfile, p, PROGRESS);
559 558 else if (header.data_type == envi_header::float64)
560   - return ((bil<double>*)file)->apply_mask(outfile, p);
  559 + ((bil<double>*)file)->apply_mask(outfile, p, PROGRESS);
561 560 else
562 561 std::cout << "ERROR: unidentified data type" << std::endl;
563 562 }
564 563  
565 564 else if (header.interleave == envi_header::BIP){ //if the infile is bip file
566 565 if (header.data_type == envi_header::float32)
567   - return ((bip<float>*)file)->apply_mask(outfile, p);
  566 + ((bip<float>*)file)->apply_mask(outfile, p, PROGRESS);
568 567 else if (header.data_type == envi_header::float64)
569   - return ((bip<double>*)file)->apply_mask(outfile, p);
  568 + ((bip<double>*)file)->apply_mask(outfile, p, PROGRESS);
570 569 else
571 570 std::cout << "ERROR: unidentified data type" << std::endl;
572 571 }
... ... @@ -575,7 +574,7 @@ public:
575 574 std::cout << "ERROR: unidentified file type" << std::endl;
576 575 exit(1);
577 576 }
578   - return false;
  577 + header.save(outfile + ".hdr");
579 578 }
580 579  
581 580 /// Copies all spectra corresponding to nonzero values of a mask into a pre-allocated matrix of size (P x B)
... ...