chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-06 11:10:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

add hide-show button to overview graph combo box

Browse Source
This commit is contained in:
LoudSnorer 2023-03-04 16:45:57 -05:00
parent 5eacf5a846
commit 8be2706623
2 changed files with 50 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
oscar/overview.cpp
View File

@ -459,12 +459,25 @@ void Overview::setGraphText () {
if (!g->visible()) { if (!g->visible()) {
numOff++; numOff++;
} }
//DEBUGFW Q(numTotal) Q(numOff) Q(g->name());
} }
} }
ui->graphCombo->setItemIcon(0, numOff ? *icon_warning : *icon_up_down); ui->graphCombo->setItemIcon(0, numOff ? *icon_warning : *icon_up_down);
QString graphText; QString graphText;
if (numOff == 0) graphText = QObject::tr("%1 Charts").arg(numTotal); int lastIndex = ui->graphCombo->count()-1;
else graphText = QObject::tr("%1 of %2 Charts").arg(numTotal-numOff).arg(numTotal);
if (numOff == 0) {
// all graphs are shown
graphText = QObject::tr("%1 Graphs").arg(numTotal);
ui->graphCombo->setItemText(lastIndex,STR_HIDE_ALL_GRAPHS);
} else {
// some graphs are hidden
graphText = QObject::tr("%1 of %2 Graphs").arg(numTotal-numOff).arg(numTotal);
if (numOff == numTotal) {
// all graphs are hidden
ui->graphCombo->setItemText(lastIndex,STR_SHOW_ALL_GRAPHS);
}
}
ui->graphCombo->setItemText(0, graphText); ui->graphCombo->setItemText(0, graphText);
} }
@ -473,7 +486,7 @@ void Overview::updateGraphCombo()
ui->graphCombo->clear(); ui->graphCombo->clear();
gGraph *g; gGraph *g;
ui->graphCombo->addItem(*icon_up_down, tr("10 of 10 Charts"), true); // Translation only to define space required ui->graphCombo->addItem(*icon_up_down, "", true);
for (int i = 0; i < GraphView->size(); i++) { for (int i = 0; i < GraphView->size(); i++) {
g = (*GraphView)[i]; g = (*GraphView)[i];
@ -485,7 +498,7 @@ void Overview::updateGraphCombo()
ui->graphCombo->addItem(*icon_off, g->title(), false); ui->graphCombo->addItem(*icon_off, g->title(), false);
} }
} }
ui->graphCombo->addItem(*icon_on,STR_HIDE_ALL_GRAPHS,true);
ui->graphCombo->setCurrentIndex(0); ui->graphCombo->setCurrentIndex(0);
setGraphText(); setGraphText();
updateCube(); updateCube();
@ -873,29 +886,40 @@ void Overview::setRange(QDate& start, QDate& end, bool updateGraphs/*zoom*/)
updateGraphCombo(); updateGraphCombo();
} }
void Overview::showGraph(int index,bool show, bool updateGraph) {
ui->graphCombo->setItemData(index,show,Qt::UserRole);
ui->graphCombo->setItemIcon(index, show ? *icon_on : *icon_off);
if (!updateGraph) return;
QString graphName = ui->graphCombo->itemText(index);
gGraph* graph=GraphView->findGraphTitle(graphName);
if (graph) graph->setVisible(show);
}
void Overview::showAllGraphs(bool show) {
//Skip over first button - label for comboBox
int lastIndex = ui->graphCombo->count()-1;
for (int i=1;i<lastIndex;i++) {
showGraph(i,show,true);
}
}
void Overview::on_graphCombo_activated(int index) void Overview::on_graphCombo_activated(int index)
{ {
if (index < 0) { if (index<0) return;
return; if (index > 0) {
} bool nextOn =!ui->graphCombo->itemData(index,Qt::UserRole).toBool();
int lastIndex = ui->graphCombo->count()-1;
if (index > 0 ) { if ( index == lastIndex ) {
gGraph *g; // user just pressed hide show button - toggle states of the button and apply the new state
QString s; showAllGraphs(nextOn);
s = ui->graphCombo->currentText(); showGraph(index,nextOn,false);
bool b = !ui->graphCombo->itemData(index, Qt::UserRole).toBool();
ui->graphCombo->setItemData(index, b, Qt::UserRole);
if (b) {
ui->graphCombo->setItemIcon(index, *icon_on);
} else { } else {
ui->graphCombo->setItemIcon(index, *icon_off); showGraph(index,nextOn,true);
} }
g = GraphView->findGraphTitle(s);
g->setVisible(b);
ui->graphCombo->showPopup(); ui->graphCombo->showPopup();
} }
ui->graphCombo->setCurrentIndex(0); ui->graphCombo->setCurrentIndex(0);
updateCube(); updateCube();
setGraphText(); setGraphText();

5
oscar/overview.h
View File

@ -199,6 +199,11 @@ class Overview : public QWidget
bool samePage; bool samePage;
SaveGraphLayoutSettings* saveGraphLayoutSettings=nullptr; SaveGraphLayoutSettings* saveGraphLayoutSettings=nullptr;
QString STR_HIDE_ALL_GRAPHS =QString(tr("Hide All Graphs"));
QString STR_SHOW_ALL_GRAPHS =QString(tr("Show All Graphs"));
void showGraph(int index,bool show, bool updateGraph);
void showAllGraphs(bool show);
}; };