diff --git a/examples/xlsx/calendar/main.cpp b/examples/xlsx/calendar/main.cpp index 5ceeb8c..3ad957e 100644 --- a/examples/xlsx/calendar/main.cpp +++ b/examples/xlsx/calendar/main.cpp @@ -25,7 +25,7 @@ int main(int argc, char **argv) headerStyle.setFontColor(Qt::darkBlue); headerStyle.setHorizontalAlignment(Format::AlignHCenter); headerStyle.setVerticalAlignment(Format::AlignVCenter); - xlsx.setRow(1, 80); + xlsx.setRowHeight(1, 80); xlsx.write("A1", QString("%1 %2").arg(QLocale().monthName(month)).arg(today.year())); xlsx.mergeCells("A1:N1", headerStyle); @@ -40,8 +40,8 @@ int main(int argc, char **argv) monthStyle.setFillPattern(Format::PatternSolid); monthStyle.setPatternBackgroundColor(Qt::darkBlue); - xlsx.setColumn(day*2-1, day*2-1, 5); - xlsx.setColumn(day*2, day*2, 13); + xlsx.setColumnWidth(day*2-1, day*2-1, 5); + xlsx.setColumnWidth(day*2, day*2, 13); xlsx.write(2, day*2-1, QLocale().dayName(day)); xlsx.mergeCells(CellRange(2, day*2-1, 2, day*2), monthStyle); } @@ -105,7 +105,7 @@ int main(int argc, char **argv) QDate date(today.year(), month, day); if (!date.isValid()) break; - xlsx.setRow(rownum, 100); + xlsx.setRowHeight(rownum, 100); int dow = date.dayOfWeek(); int colnum = dow*2-1; diff --git a/examples/xlsx/demo/main.cpp b/examples/xlsx/demo/main.cpp index b595d16..7d1e854 100644 --- a/examples/xlsx/demo/main.cpp +++ b/examples/xlsx/demo/main.cpp @@ -95,8 +95,8 @@ int main() //--------------------------------------------------------------- //Create the first sheet (Otherwise, default "Sheet1" will be created) xlsx.addSheet("Aligns & Borders"); - xlsx.setColumn("B", "B", 20); - xlsx.setColumn("H", "H", 12); + xlsx.setColumnWidth(2, 20); //Column B + xlsx.setColumnWidth(8, 12); //Column H xlsx.currentWorksheet()->setGridLinesVisible(false); //Alignment @@ -179,7 +179,7 @@ int main() //--------------------------------------------------------------- //Create the third sheet. xlsx.addSheet("Formulas"); - xlsx.setColumn("A", "B", 40); + xlsx.setColumnWidth(1, 2, 40); Format rAlign; rAlign.setHorizontalAlignment(Format::AlignRight); Format lAlign; @@ -242,7 +242,7 @@ int main() //--------------------------------------------------------------- //Create the fourth sheet. xlsx.addSheet("NumFormats"); - xlsx.setColumn("B", "B", 40); + xlsx.setColumnWidth(2, 40); writeInternalNumFormatsCell(xlsx, 4, 2.5681, 2); writeInternalNumFormatsCell(xlsx, 5, 2500000, 3); writeInternalNumFormatsCell(xlsx, 6, -500, 5); @@ -282,7 +282,7 @@ int main() xlsx.groupRows(11, 26, false); xlsx.groupRows(15, 17, false); xlsx.groupRows(20, 22, false); - xlsx.setColumn(1, 10, 10.0); + xlsx.setColumnWidth(1, 10, 10.0); xlsx.groupColumns(1, 2); xlsx.groupColumns(5, 8, false); diff --git a/examples/xlsx/formulas/main.cpp b/examples/xlsx/formulas/main.cpp index b75e5d3..57765d1 100644 --- a/examples/xlsx/formulas/main.cpp +++ b/examples/xlsx/formulas/main.cpp @@ -12,7 +12,7 @@ int main() //![0] //![1] - xlsx.setColumn("A", "B", 40); + xlsx.setColumnWidth(1, 2, 40); Format rAlign; rAlign.setHorizontalAlignment(Format::AlignRight); Format lAlign; diff --git a/examples/xlsx/hello/main.cpp b/examples/xlsx/hello/main.cpp index 54a5a2d..a80411c 100755 --- a/examples/xlsx/hello/main.cpp +++ b/examples/xlsx/hello/main.cpp @@ -3,23 +3,19 @@ int main() { - //![0] QXlsx::Document xlsx; - //![0] + QString sheetName="200"; + QString cellString; + xlsx.addSheet(sheetName); + for (int i=0;i<2000;i++) { + for (int j=0;j<2000;++j) + { + cellString.sprintf("%d:%d",i,j); + xlsx.write(i,j,cellString); + } + } - //![1] - xlsx.write("A1", "Hello Qt!"); - xlsx.write("A2", 12345); - xlsx.write("A3", "=44+33"); - xlsx.write("A4", true); - xlsx.write("A5", "http://qt-project.org"); - xlsx.write("A6", QDate(2013, 12, 27)); - xlsx.write("A7", QTime(6, 30)); - //![1] - - //![2] - xlsx.save(); - //![2] + xlsx.saveAs("Book1.xlsx"); return 0; } diff --git a/examples/xlsx/numberformat/main.cpp b/examples/xlsx/numberformat/main.cpp index af3a82c..1fb4b9a 100644 --- a/examples/xlsx/numberformat/main.cpp +++ b/examples/xlsx/numberformat/main.cpp @@ -7,7 +7,7 @@ int main(int argc, char** argv) QGuiApplication(argc, argv); QXlsx::Document xlsx; - xlsx.setColumn(1, 4, 20.0); + xlsx.setColumnWidth(1, 4, 20.0); QXlsx::Format header; header.setFontBold(true); @@ -33,7 +33,7 @@ int main(int argc, char** argv) //Builtin number formats xlsx.addSheet(); - xlsx.setColumn(1, 4, 20.0); + xlsx.setColumnWidth(1, 4, 20.0); xlsx.write(1, 1, "Raw data", header); xlsx.write(1, 2, "Builtin Format", header); xlsx.write(1, 3, "Shown value", header); diff --git a/examples/xlsx/rowcolumn/main.cpp b/examples/xlsx/rowcolumn/main.cpp index 2c2278a..b485d27 100644 --- a/examples/xlsx/rowcolumn/main.cpp +++ b/examples/xlsx/rowcolumn/main.cpp @@ -8,10 +8,10 @@ int main() xlsx.write(1, 2, "Row:0, Col:2 ==> (C1)"); //Set the height of the first row to 50.0(points) - xlsx.setRow(1, 50.0); + xlsx.setRowHeight(1, 50.0); //Set the width of the third column to 40.0(chars) - xlsx.setColumn(3, 3, 40.0); + xlsx.setColumnWidth(3, 3, 40.0); //Set style for the row 11th. QXlsx::Format format1; @@ -20,7 +20,8 @@ int main() format1.setFontSize(20); xlsx.write(11, 1, "Hello Row Style"); xlsx.write(11, 6, "Blue Color"); - xlsx.setRow(11, 41, format1); + xlsx.setRowFormat(11, format1); + xlsx.setRowHeight(11, 41); //Set style for the col [9th, 16th) QXlsx::Format format2; @@ -29,7 +30,8 @@ int main() for (int row=12; row<=30; row++) for (int col=9; col<=15; col++) xlsx.write(row, col, row+col); - xlsx.setColumn(9, 16, 5.0, format2); + xlsx.setColumnWidth(9, 16, 5.0); + xlsx.setColumnFormat(9, 16, format2); xlsx.save(); return 0; diff --git a/examples/xlsx/style/main.cpp b/examples/xlsx/style/main.cpp index b2eedd7..ae99412 100644 --- a/examples/xlsx/style/main.cpp +++ b/examples/xlsx/style/main.cpp @@ -26,7 +26,7 @@ int main() format3.setFontSize(20); xlsx.write(11, 1, "Hello Row Style"); xlsx.write(11, 6, "Blue Color"); - xlsx.setRow(11, 41, format3); + xlsx.setRowFormat(11, 41, format3); QXlsx::Format format4; format4.setFontBold(true); @@ -34,7 +34,7 @@ int main() for (int row=21; row<=40; row++) for (int col=9; col<16; col++) xlsx.write(row, col, row+col); - xlsx.setColumn(9, 16, 5.0, format4); + xlsx.setColumnFormat(9, 16, format4); xlsx.write("A5", QDate(2013, 8, 29));