Skip to content

Commit

Permalink
Change so 2d tables no longer go black with all the same value
Browse files Browse the repository at this point in the history
  • Loading branch information
Michael Carpenter authored and Michael Carpenter committed Nov 21, 2013
1 parent f5c31ad commit 3c6418a
Showing 1 changed file with 18 additions and 12 deletions.
30 changes: 18 additions & 12 deletions core/src/tableview2d.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -810,22 +810,28 @@ bool TableView2D::updateTable()
ui.tableWidget->setColumnCount(ui.tableWidget->columnCount()+1);
ui.tableWidget->setItem(0,ui.tableWidget->columnCount()-1,new QTableWidgetItem(QString::number(tableData->axis()[i],'f',m_metaData.xDp)));
ui.tableWidget->setItem(1,ui.tableWidget->columnCount()-1,new QTableWidgetItem(QString::number(tableData->values()[i],'f',m_metaData.yDp)));

if ((tableData->values()[i] - tableData->minActualYAxis()) < (tableData->maxActualYAxis() - tableData->minActualYAxis())/4)
{
ui.tableWidget->item(1,ui.tableWidget->columnCount()-1)->setBackgroundColor(QColor::fromRgb(0,(255*(((tableData->values()[i] - tableData->minActualYAxis()))/((tableData->maxActualYAxis() - tableData->minActualYAxis())/4.0))),255));
}
else if ((tableData->values()[i] - tableData->minActualYAxis()) < (((tableData->maxActualYAxis()-tableData->minActualYAxis())/4)*2))
if (tableData->maxActualYAxis() == tableData->minActualYAxis())
{
ui.tableWidget->item(1,ui.tableWidget->columnCount()-1)->setBackgroundColor(QColor::fromRgb(0,255,255-(255*(((tableData->values()[i] - tableData->minActualYAxis())-(((tableData->maxActualYAxis() - tableData->minActualYAxis())/4.0)))/((tableData->maxActualYAxis() - tableData->minActualYAxis())/4.0)))));
}
else if ((tableData->values()[i] - tableData->minActualYAxis()) < (((tableData->maxActualYAxis() - tableData->minActualYAxis())/4)*3))
{
ui.tableWidget->item(1,ui.tableWidget->columnCount()-1)->setBackgroundColor(QColor::fromRgb((255*(((tableData->values()[i] - tableData->minActualYAxis())-(((tableData->maxActualYAxis() - tableData->minActualYAxis())/4.0)*2))/((tableData->maxActualYAxis() - tableData->minActualYAxis())/4.0))),255,0));
ui.tableWidget->item(1,ui.tableWidget->columnCount()-1)->setBackgroundColor(QColor::fromRgb(0,255,(255/2.0),255));
}
else
{
ui.tableWidget->item(1,ui.tableWidget->columnCount()-1)->setBackgroundColor(QColor::fromRgb(255,255-(255*(((tableData->values()[i] - tableData->minActualYAxis())-(((tableData->maxActualYAxis() - tableData->minActualYAxis())/4.0)*3))/((tableData->maxActualYAxis() - tableData->minActualYAxis())/4.0))),0));
if ((tableData->values()[i] - tableData->minActualYAxis()) < (tableData->maxActualYAxis() - tableData->minActualYAxis())/4)
{
ui.tableWidget->item(1,ui.tableWidget->columnCount()-1)->setBackgroundColor(QColor::fromRgb(0,(255*(((tableData->values()[i] - tableData->minActualYAxis()))/((tableData->maxActualYAxis() - tableData->minActualYAxis())/4.0))),255));
}
else if ((tableData->values()[i] - tableData->minActualYAxis()) < (((tableData->maxActualYAxis()-tableData->minActualYAxis())/4)*2))
{
ui.tableWidget->item(1,ui.tableWidget->columnCount()-1)->setBackgroundColor(QColor::fromRgb(0,255,255-(255*(((tableData->values()[i] - tableData->minActualYAxis())-(((tableData->maxActualYAxis() - tableData->minActualYAxis())/4.0)))/((tableData->maxActualYAxis() - tableData->minActualYAxis())/4.0)))));
}
else if ((tableData->values()[i] - tableData->minActualYAxis()) < (((tableData->maxActualYAxis() - tableData->minActualYAxis())/4)*3))
{
ui.tableWidget->item(1,ui.tableWidget->columnCount()-1)->setBackgroundColor(QColor::fromRgb((255*(((tableData->values()[i] - tableData->minActualYAxis())-(((tableData->maxActualYAxis() - tableData->minActualYAxis())/4.0)*2))/((tableData->maxActualYAxis() - tableData->minActualYAxis())/4.0))),255,0));
}
else
{
ui.tableWidget->item(1,ui.tableWidget->columnCount()-1)->setBackgroundColor(QColor::fromRgb(255,255-(255*(((tableData->values()[i] - tableData->minActualYAxis())-(((tableData->maxActualYAxis() - tableData->minActualYAxis())/4.0)*3))/((tableData->maxActualYAxis() - tableData->minActualYAxis())/4.0))),0));
}
}
samples.append(QPointF(tableData->axis()[i],tableData->values()[i]));
}
Expand Down

0 comments on commit 3c6418a

Please sign in to comment.