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

Remove indexList variable in ManageScreen

Browse Source
This commit is contained in:
Ricardo Montañana Gómez
2024-03-17 13:08:07 +01:00
parent d47da27571
commit 4a0fa33917
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/manage/ManageScreen.cpp
View File

@@ -21,7 +21,6 @@ namespace platform {
results.load(); results.load();
results.sortDate(); results.sortDate();
sort_field = "Date"; sort_field = "Date";
indexList = true;
openExcel = false; openExcel = false;
workbook = NULL; workbook = NULL;
if (numFiles == 0 or numFiles > results.size()) { if (numFiles == 0 or numFiles > results.size()) {
@@ -324,7 +323,7 @@ namespace platform {
bool parserError = true; // force the first iteration bool parserError = true; // force the first iteration
while (parserError) { while (parserError) {
auto [min_index, max_index] = paginator[static_cast<int>(output_type)].getOffset(); auto [min_index, max_index] = paginator[static_cast<int>(output_type)].getOffset();
if (indexList) { if (output_type == OutputType::EXPERIMENTS) {
std::tie(option, index, parserError) = parser.parse(Colors::IGREEN(), mainOptions, 'r', min_index, max_index); std::tie(option, index, parserError) = parser.parse(Colors::IGREEN(), mainOptions, 'r', min_index, max_index);
} else { } else {
std::tie(option, subIndex, parserError) = parser.parse(Colors::IBLUE(), listOptions, 'r', min_index, max_index); std::tie(option, subIndex, parserError) = parser.parse(Colors::IBLUE(), listOptions, 'r', min_index, max_index);
@@ -373,8 +372,8 @@ namespace platform {
index_A = index; index_A = index;
list("A set to " + std::to_string(index), Colors::GREEN()); list("A set to " + std::to_string(index), Colors::GREEN());
break; break;
case 'b': case 'b': // set_b or back to list
if (indexList) { if (output_type == OutputType::EXPERIMENTS) {
if (index == index_A) { if (index == index_A) {
list("A and B cannot be the same!", Colors::RED()); list("A and B cannot be the same!", Colors::RED());
break; break;
@@ -396,7 +395,6 @@ namespace platform {
case 'l': case 'l':
output_type = OutputType::EXPERIMENTS; output_type = OutputType::EXPERIMENTS;
list(STATUS_OK, STATUS_COLOR); list(STATUS_OK, STATUS_COLOR);
indexList = true;
break; break;
case 'D': case 'D':
filename = results.at(index).getFilename(); filename = results.at(index).getFilename();
@@ -435,11 +433,9 @@ namespace platform {
list(STATUS_OK, STATUS_COLOR); list(STATUS_OK, STATUS_COLOR);
break; break;
} }
if (indexList) { if (output_type == OutputType::EXPERIMENTS) {
//report(index, false);
output_type = OutputType::RESULT; output_type = OutputType::RESULT;
list(STATUS_OK, STATUS_COLOR); list(STATUS_OK, STATUS_COLOR);
indexList = false;
} else { } else {
showIndex(subIndex); showIndex(subIndex);
} }