Changeset 3a849c8 in tol

Timestamp:

Mar 20, 2011, 3:21:00 PM (16 years ago)

Author:

Jorge Pérez <josp.jorge@…>

Branches:

1941-docker-image-to-test, devel, master

Children:

fe52ab1

Parents:

51de3f7

Message:

refs #854, writing Date objects

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@3341 be4846ae-f051-483a-831f-b64e7d08527f

File:

• tol/contrib/excel/tolExcel.cpp (modified) (5 diffs)

tol/contrib/excel/tolExcel.cpp

@@ -346 +346 @@
   BasicExcel *m_ptrXLS;
   XLSFormatManager *m_ptrFmtMgr;
+  CellFormat *m_ptrCellFmt;
   BasicExcelWorksheet *m_ptrActiveWS;
 };
@@ -445 +446 @@
   m_ptrXLS(NULL),
   m_ptrFmtMgr(NULL),
+  m_ptrCellFmt(NULL),
   m_ptrActiveWS(NULL)
 {
-  m_ptrXLS = new BasicExcel;
-  m_ptrActiveWS = m_ptrXLS->AddWorksheet( );
-  m_isOpen = false;
+  this->m_ptrXLS = new BasicExcel;
+  this->m_ptrActiveWS = this->m_ptrXLS->AddWorksheet( );
+  this->m_ptrFmtMgr = new XLSFormatManager( *(this->m_ptrXLS) );
+  this->m_ptrCellFmt = new CellFormat( *(this->m_ptrFmtMgr) );
+  this->m_isOpen = false;
 }
 
@@ -458 +462 @@
   m_ptrActiveWS(NULL)
 {
-  m_ptrXLS = new BasicExcel;
-  if ( !( m_isOpen = m_ptrXLS->Load( path ) ) ) {
+  this->m_ptrXLS = new BasicExcel;
+  if ( !( this->m_isOpen = this->m_ptrXLS->Load( path ) ) ) {
     delete m_ptrXLS;
-    m_ptrXLS = NULL;
-  } else {
-    m_ptrActiveWS = m_ptrXLS->GetWorksheet( 0 );
+    this->m_ptrXLS = NULL;
+  } else {
+    this->m_ptrActiveWS = this->m_ptrXLS->GetWorksheet( 0 );
   }
   if ( m_ptrXLS ) {
-    m_ptrFmtMgr = new XLSFormatManager( *m_ptrXLS );
+    this->m_ptrFmtMgr = new XLSFormatManager( *(this->m_ptrXLS) );
+    this->m_ptrCellFmt = new CellFormat( *(this->m_ptrFmtMgr) );
   }
   m_ptrActiveWS = NULL;
@@ -473 +478 @@
 TolExcel::~TolExcel()
 {
-  if ( m_ptrFmtMgr ) {
-    delete m_ptrFmtMgr;
-    m_ptrFmtMgr = NULL;
-  }
-  if ( m_ptrXLS ) {
-    delete m_ptrXLS;
-    m_ptrXLS = NULL;
-  }
-  m_isOpen = false;
-  m_ptrXLS = NULL;
+  if ( this->m_ptrCellFmt ) {
+    delete this->m_ptrCellFmt;
+    this->m_ptrCellFmt = NULL;
+  }
+  if ( this->m_ptrFmtMgr ) {
+    delete this->m_ptrFmtMgr;
+    this->m_ptrFmtMgr = NULL;
+  }
+  if ( this->m_ptrXLS ) {
+    delete this->m_ptrXLS;
+    this->m_ptrXLS = NULL;
+  }
+  this->m_isOpen = false;
 }
 
@@ -498 +506 @@
   } else if ( value->Grammar() == GraDate() ) {
     BDate &date = Date( value );
+    //XLSFormatManager fmt_mgr(*m_ptrXLS);
+    //CellFormat fmt(fmt_mgr);
     int serialDate = TolExcel::DMYToExcelSerialDate( date.Day(),
                                                      date.Month(),
                                                      date.Year() );
-    cell->SetDouble( double( serialDate ) );
+    this->m_ptrCellFmt->set_format_string( "DD/MM/YYYY" );
+    //fmt.set_format_string( "DD/MM/YY" );
+    BDateFormat dateFormat( "%d/%m/%y" );
+    BText txt( dateFormat.DateToText( date ) );
+    cell->Set( txt.String() );
+    //cell->SetFormat( fmt );
+    cell->SetFormat( *(this->m_ptrCellFmt) );
+    //cell->SetDouble( double( serialDate ) );
+    //cell->SetDouble( 25780 );
+    //cell->Set( "31/07/70" );
   } else if ( value->Grammar() == GraText() ) {
     BText &txt = Text( value );