Changeset 17264 for trunk/Mars/mcore/ofits.h
- Timestamp:
- 10/18/13 17:52:38 (11 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Mars/mcore/ofits.h
r17263 r17264 33 33 #include "checksum.h" 34 34 35 #ifndef __MARS__36 namespace std37 {38 #endif39 40 35 // Sloppy: allow / <--- left 41 36 // allow all characters (see specs for what is possible) … … 43 38 // units: m kg s rad sr K A mol cd Hz J W V N Pa C Ohm S F Wb T Hlm lx 44 39 45 class ofits : public ofstream40 class ofits : public std::ofstream 46 41 { 47 42 public: … … 81 76 throw std::runtime_error("Key name empty."); 82 77 #else 83 gLog << ___err___ << "ERROR - Key name empty." << endl;78 gLog << ___err___ << "ERROR - Key name empty." << std::endl; 84 79 return false; 85 80 #endif … … 92 87 throw std::runtime_error(sout.str()); 93 88 #else 94 gLog << ___err___ << "ERROR - " << sout.str() << endl;89 gLog << ___err___ << "ERROR - " << sout.str() << std::endl; 95 90 return false; 96 91 #endif … … 107 102 throw std::runtime_error(sout.str()); 108 103 #else 109 gLog << ___err___ << "ERROR - " << sout.str() << endl;104 gLog << ___err___ << "ERROR - " << sout.str() << std::endl; 110 105 return false; 111 106 #endif … … 127 122 throw std::runtime_error(sout.str()); 128 123 #else 129 gLog << ___err___ << "ERROR - " << sout.str() << endl;124 gLog << ___err___ << "ERROR - " << sout.str() << std::endl; 130 125 return false; 131 126 #endif … … 154 149 throw std::runtime_error(sout.str()); 155 150 #else 156 gLog << ___err___ << "ERROR - " << sout.str() << endl;151 gLog << ___err___ << "ERROR - " << sout.str() << std::endl; 157 152 #endif 158 153 return false; … … 169 164 std::ostringstream sout; 170 165 sout << "Size " << sz << " of entry for key '" << key << "' exceeds 80 characters... removed comment."; 171 gLog << ___warn___ << "WARNING - " << sout.str() << endl;166 gLog << ___warn___ << "WARNING - " << sout.str() << std::endl; 172 167 #endif 173 168 return true; … … 179 174 throw std::runtime_error(sout.str()); 180 175 #else 181 gLog << ___err___ << "ERROR - " << sout.str() << endl;176 gLog << ___err___ << "ERROR - " << sout.str() << std::endl; 182 177 return false; 183 178 #endif … … 199 194 200 195 std::ostringstream sout; 201 sout << std::left << s etw(8) << key;196 sout << std::left << std::setw(8) << key; 202 197 203 198 if (!delim) … … 209 204 sout << "= "; 210 205 sout << (!value.empty() && value[0]=='\''?std::left:std::right); 211 sout << s etw(20) << value << std::left;206 sout << std::setw(20) << value << std::left; 212 207 213 208 if (!comment.empty()) … … 219 214 Checksum checksum; 220 215 221 void Out( ofstream &fout)216 void Out(std::ofstream &fout) 222 217 { 223 218 if (!changed) … … 286 281 throw std::runtime_error(sout.str()); 287 282 #else 288 gLog << ___err___ << "ERROR - " << sout.str() << endl;283 gLog << ___err___ << "ERROR - " << sout.str() << std::endl; 289 284 return false; 290 285 #endif … … 357 352 { 358 353 } 359 ofits(const char *fname) : ofstream(),354 ofits(const char *fname) : std::ofstream(), 360 355 fCommentTrimming(false), 361 356 fManualExtName(false) … … 388 383 SetStr("DATASUM", " 0", "Checksum for the data block"); 389 384 390 ofstream::open(filename);385 std::ofstream::open(filename); 391 386 } 392 387 … … 414 409 throw std::runtime_error(sout.str()); 415 410 #else 416 gLog << ___err___ << "ERROR - " << sout.str() << endl;411 gLog << ___err___ << "ERROR - " << sout.str() << std::endl; 417 412 return false; 418 413 #endif … … 462 457 463 458 if (p<0) 464 sout << s etprecision(-p) << fixed;459 sout << std::setprecision(-p) << fixed; 465 460 if (p>0) 466 sout << s etprecision(p);461 sout << std::setprecision(p); 467 462 if (p==0) 468 sout << s etprecision(f>1e-100 && f<1e100 ? 15 : 14);463 sout << std::setprecision(f>1e-100 && f<1e100 ? 15 : 14); 469 464 470 465 sout << f; … … 558 553 throw std::runtime_error(sout.str()); 559 554 #else 560 gLog << ___err___ << "ERROR - " << sout.str() << endl;555 gLog << ___err___ << "ERROR - " << sout.str() << std::endl; 561 556 return false; 562 557 #endif … … 570 565 throw std::runtime_error(sout.str()); 571 566 #else 572 gLog << ___err___ << "ERROR - " << sout.str() << endl;567 gLog << ___err___ << "ERROR - " << sout.str() << std::endl; 573 568 return false; 574 569 #endif … … 582 577 throw std::runtime_error(sout.str()); 583 578 #else 584 gLog << ___err___ << "ERROR - " << sout.str() << endl;579 gLog << ___err___ << "ERROR - " << sout.str() << std::endl; 585 580 return false; 586 581 #endif … … 597 592 throw std::runtime_error(sout.str()); 598 593 #else 599 gLog << ___err___ << "ERROR - " << sout.str() << endl;594 gLog << ___err___ << "ERROR - " << sout.str() << std::endl; 600 595 return false; 601 596 #endif … … 727 722 728 723 729 Checksum WriteHeader( ofstream &fout)724 Checksum WriteHeader(std::ofstream &fout) 730 725 { 731 726 Checksum sum; … … 796 791 throw std::runtime_error("File not empty anymore."); 797 792 #else 798 gLog << ___err___ << "ERROR - File not empty anymore." << endl;793 gLog << ___err___ << "ERROR - File not empty anymore." << std::endl; 799 794 return false; 800 795 #endif … … 824 819 const char *pend = src + num*N; 825 820 for (const char *ptr = src; ptr<pend; ptr+=N, dest+=N) 826 reverse_copy(ptr, ptr+N, dest);821 std::reverse_copy(ptr, ptr+N, dest); 827 822 } 828 823 … … 835 830 if (cnt!=fTable.bytes_per_row) 836 831 { 837 ostringstream sout;832 std::ostringstream sout; 838 833 sout << "WriteRow - Size " << cnt << " does not match expected size " << fTable.bytes_per_row; 839 834 #ifdef __EXCEPTIONS 840 835 throw std::runtime_error(sout.str()); 841 836 #else 842 gLog << ___err___ << "ERROR - " << sout.str() << endl;837 gLog << ___err___ << "ERROR - " << sout.str() << std::endl; 843 838 return false; 844 839 #endif … … 918 913 { 919 914 920 ostringstream dataSumStr;915 std::ostringstream dataSumStr; 921 916 dataSumStr << fDataSum.val(); 922 917 SetStr("DATASUM", dataSumStr.str()); … … 943 938 const Checksum chk = UpdateHeaderChecksum(); 944 939 945 ofstream::close();940 std::ofstream::close(); 946 941 947 942 if ((chk+fDataSum).valid()) 948 943 return true; 949 944 950 ostringstream sout;945 std::ostringstream sout; 951 946 sout << "Checksum (" << std::hex << chk.val() << ") invalid."; 952 947 #ifdef __EXCEPTIONS 953 948 throw std::runtime_error(sout.str()); 954 949 #else 955 gLog << ___err___ << "ERROR - " << sout.str() << endl;950 gLog << ___err___ << "ERROR - " << sout.str() << std::endl; 956 951 return false; 957 952 #endif 958 953 } 959 954 960 pair<string, int> GetChecksumData()955 std::pair<std::string, int> GetChecksumData() 961 956 { 962 957 std::string datasum; … … 972 967 if (datasum[0] == '\'') 973 968 datasum = datasum.substr(1, datasum.size()-2); 974 return make_pair(checksum, atoi(datasum.c_str()));969 return std::make_pair(checksum, atoi(datasum.c_str())); 975 970 } 976 971 … … 997 992 } 998 993 }; 999 1000 #ifndef __MARS__1001 };1002 #endif1003 994 1004 995 #if 0
Note:
See TracChangeset
for help on using the changeset viewer.