From 54dc46d1d7848b9f047a25f2673676484e22645a Mon Sep 17 00:00:00 2001 From: "HuYingzhuo(hugo/hyzboy)" Date: Thu, 27 Jul 2023 10:24:26 +0800 Subject: [PATCH] used "," instead of "\t" in CSVOutput --- inc/hgl/util/csv/CSVOutput.h | 8 ++++---- inc/hgl/util/csv/CSVOutputStream.h | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/inc/hgl/util/csv/CSVOutput.h b/inc/hgl/util/csv/CSVOutput.h index e75c7ef..353907f 100644 --- a/inc/hgl/util/csv/CSVOutput.h +++ b/inc/hgl/util/csv/CSVOutput.h @@ -41,7 +41,7 @@ namespace hgl CSVOutput( io::TextOutputStream *os, //文本输出流 const uint field_count, //字段数量 - const T fields_terminated_char=T('\t'), //字段分隔符 + const T fields_terminated_char=T(','), //字段分隔符 const T enclosed_char=T('"')) //字符串包裹字符 { tos=os; @@ -119,8 +119,8 @@ namespace hgl using UTF16CSVOutput=CSVOutput; using UTF32CSVOutput=CSVOutput; - inline CSVOutput * CreateUTF8CSVOutput (io::TextOutputStream * tos,const uint fc,const u8char ftc=U8_TEXT ('\t'),const u8char ec=U8_TEXT ('"')){return(new UTF8CSVOutput (tos,fc,ftc,ec));} - inline CSVOutput * CreateUTF16CSVOutput (io::TextOutputStream * tos,const uint fc,const u16char ftc=U16_TEXT('\t'),const u16char ec=U16_TEXT('"')){return(new UTF16CSVOutput(tos,fc,ftc,ec));} - inline CSVOutput * CreateUTF32CSVOutput (io::TextOutputStream * tos,const uint fc,const u32char ftc=U32_TEXT('\t'),const u32char ec=U32_TEXT('"')){return(new UTF16CSVOutput(tos,fc,ftc,ec));} + inline CSVOutput * CreateUTF8CSVOutput (io::TextOutputStream * tos,const uint fc,const u8char ftc=U8_TEXT (','),const u8char ec=U8_TEXT ('"')){return(new UTF8CSVOutput (tos,fc,ftc,ec));} + inline CSVOutput * CreateUTF16CSVOutput (io::TextOutputStream * tos,const uint fc,const u16char ftc=U16_TEXT(','),const u16char ec=U16_TEXT('"')){return(new UTF16CSVOutput(tos,fc,ftc,ec));} + inline CSVOutput * CreateUTF32CSVOutput (io::TextOutputStream * tos,const uint fc,const u32char ftc=U32_TEXT(','),const u32char ec=U32_TEXT('"')){return(new UTF16CSVOutput(tos,fc,ftc,ec));} }//namespace util }//namespace hgl diff --git a/inc/hgl/util/csv/CSVOutputStream.h b/inc/hgl/util/csv/CSVOutputStream.h index 49ecb21..a208117 100644 --- a/inc/hgl/util/csv/CSVOutputStream.h +++ b/inc/hgl/util/csv/CSVOutputStream.h @@ -50,14 +50,14 @@ namespace hgl void WriteFloat(const F &value,const uint frac){csv->WriteFloat(value,frac);} };//template class CSVOutputStream - template inline CSVOutputStream *CreateCSVOutputToStream(io::OutputStream *os,io::TextOutputStream *tos,const uint field_count,const T fields_terminated_char=T('\t'),const T enclosed_char=T('"')) + template inline CSVOutputStream *CreateCSVOutputToStream(io::OutputStream *os,io::TextOutputStream *tos,const uint field_count,const T fields_terminated_char=T(','),const T enclosed_char=T('"')) { CSVOutput *csv=new CSVOutput(tos,field_count,fields_terminated_char,enclosed_char); return(new CSVOutputStream(os,tos,csv)); } - CSVOutputStream *CreateCSVOutputToUTF8File(const OSString &filename,const uint field_count,const u8char fields_terminated_char=U8_TEXT('\t'),const u8char enclosed_char=U8_TEXT('"')); - CSVOutputStream *CreateCSVOutputToUTF16LEFile(const OSString &filename,const uint field_count,const u16char fields_terminated_char=U16_TEXT('\t'),const u16char enclosed_char=U16_TEXT('"')); + CSVOutputStream *CreateCSVOutputToUTF8File(const OSString &filename,const uint field_count,const u8char fields_terminated_char=U8_TEXT(','),const u8char enclosed_char=U8_TEXT('"')); + CSVOutputStream *CreateCSVOutputToUTF16LEFile(const OSString &filename,const uint field_count,const u16char fields_terminated_char=U16_TEXT(','),const u16char enclosed_char=U16_TEXT('"')); }//namespace util }//namespace hgl