rmontanana/Platform
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactor notes position in Excel reports

Browse Source
This commit is contained in:
Ricardo Montañana Gómez
2024-02-17 20:31:24 +01:00
parent 7d92876f06
commit 643038fd19
2 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/Platform/modules/ReportExcel.cc
View File

@@ -90,7 +90,12 @@ namespace platform {
oss << "Discretized: " << (data["discretized"].get<bool>() ? "True" : "False"); oss << "Discretized: " << (data["discretized"].get<bool>() ? "True" : "False");
worksheet_write_string(worksheet, 3, 12, oss.str().c_str(), styles["headerSmall"]); worksheet_write_string(worksheet, 3, 12, oss.str().c_str(), styles["headerSmall"]);
} }
void ReportExcel::append_notes(lxw_worksheet* notes_worksheet, const json& r, int row) void ReportExcel::header_notes(int row)
{
writeString(row, 0, "Dataset", "bodyHeader");
worksheet_merge_range(worksheet, row, 1, row, 6, "Note", styles["bodyHeader_even"]);
}
void ReportExcel::append_notes(const json& r, int row)
{ {
static bool even_note = true; static bool even_note = true;
std::string suffix; std::string suffix;
@@ -103,17 +108,16 @@ namespace platform {
} }
lxw_format* style = NULL; lxw_format* style = NULL;
style = styles.at("text" + suffix); style = styles.at("text" + suffix);
if (row == 1) {
// Add header
worksheet_merge_range(notes_worksheet, 0, 0, 0, 1, "Dataset", styles["bodyHeader_even"]);
worksheet_merge_range(notes_worksheet, 0, 2, 0, 9, "Note", styles["bodyHeader_even"]);
}
auto initial_row = row; auto initial_row = row;
for (const auto& note : r["notes"]) { for (const auto& note : r["notes"]) {
worksheet_merge_range(notes_worksheet, row, 2, row, 9, note.get<std::string>().c_str(), style); worksheet_merge_range(worksheet, row, 1, row, 6, note.get<std::string>().c_str(), style);
row++; row++;
} }
worksheet_merge_range(notes_worksheet, initial_row, 0, row - 1, 1, r["dataset"].get<std::string>().c_str(), style); if (row - 1 == initial_row) {
writeString(initial_row, 0, r["dataset"].get<std::string>(), "text");
} else {
worksheet_merge_range(worksheet, initial_row, 0, row - 1, 0, r["dataset"].get<std::string>().c_str(), style);
}
} }
void ReportExcel::body() void ReportExcel::body()
@@ -133,8 +137,7 @@ namespace platform {
std::string hyperparameters; std::string hyperparameters;
bool only_one_result = data["results"].size() == 1; bool only_one_result = data["results"].size() == 1;
bool first_note = true; bool first_note = true;
lxw_worksheet* notes_worksheet; int notes_row = 15 + data["results"].size();
int notes_row = 1;
for (const auto& r : data["results"]) { for (const auto& r : data["results"]) {
writeString(row, col, r["dataset"].get<std::string>(), "text"); writeString(row, col, r["dataset"].get<std::string>(), "text");
writeInt(row, col + 1, r["samples"].get<int>(), "ints"); writeInt(row, col + 1, r["samples"].get<int>(), "ints");
@@ -163,9 +166,9 @@ namespace platform {
if (r["notes"].size() > 0) { if (r["notes"].size() > 0) {
if (first_note) { if (first_note) {
first_note = false; first_note = false;
notes_worksheet = workbook_add_worksheet(workbook, "Notes"); header_notes(notes_row++);
} }
append_notes(notes_worksheet, r, notes_row); append_notes(r, notes_row);
notes_row += r["notes"].size(); notes_row += r["notes"].size();
} }
} }

3
src/Platform/modules/ReportExcel.h
View File

@@ -18,7 +18,8 @@ namespace platform {
void body() override; void body() override;
void showSummary() override; void showSummary() override;
void footer(double totalScore, int row); void footer(double totalScore, int row);
void append_notes(lxw_worksheet* notes_worksheet, const json& r, int row); void append_notes(const json& r, int row);
void header_notes(int row);
}; };
}; };
#endif // !REPORTEXCEL_H #endif // !REPORTEXCEL_H