From d0894af6117e86d6b13f4e3fa546475ea0f9d695 Mon Sep 17 00:00:00 2001 From: Michael Carpenter Date: Mon, 27 Jan 2014 21:29:19 -0500 Subject: [PATCH] Change so both actual min/max and theoretical min/max values for 3d tables are available for coloring purposes --- core/src/parameterview.cpp | 5 +- core/src/tablemap3d.cpp | 24 ++++---- core/src/tableview3d.cpp | 96 +++++++++++++++---------------- lib/core/table3ddata.h | 18 ++++-- plugins/freeems/fetable3ddata.cpp | 72 +++++++++++++++++------ plugins/freeems/fetable3ddata.h | 39 +++++++++---- 6 files changed, 156 insertions(+), 98 deletions(-) diff --git a/core/src/parameterview.cpp b/core/src/parameterview.cpp index afb6ba0..1667320 100644 --- a/core/src/parameterview.cpp +++ b/core/src/parameterview.cpp @@ -14,6 +14,7 @@ ParameterView::ParameterView(QWidget *parent) : QWidget(parent) ui.setupUi(this); connect(ui.parameterTreeWidget,SIGNAL(currentItemChanged(QTreeWidgetItem*,QTreeWidgetItem*)),this,SLOT(currentItemChanged(QTreeWidgetItem*,QTreeWidgetItem*))); connect(ui.parameterTreeWidget,SIGNAL(itemSelectionChanged()),this,SLOT(itemSelectionChanged())); + ui.parameterTreeWidget->setColumnCount(2); } void ParameterView::itemSelectionChanged() { @@ -51,7 +52,7 @@ void ParameterView::currentItemChanged(QTreeWidgetItem *current,QTreeWidgetItem //This is our menu! for (int j=0;jtext(0)) + if (m_metaMenu.menulist[i].subMenuList[j].variable == current->text(1)) { //This is our current item! if (!m_metaMenu.menulist[i].subMenuList[j].is_seperator) @@ -165,7 +166,7 @@ void ParameterView::passMenuList(MenuSetup menu) //{ // item->addChild(new QTreeWidgetItem(QStringList() << menu.menulist[i].second[j])); //} - item->addChild(new QTreeWidgetItem(QStringList() << menu.menulist[i].subMenuList[j].title)); + item->addChild(new QTreeWidgetItem(QStringList() << menu.menulist[i].subMenuList[j].title << menu.menulist[i].subMenuList[j].variable)); } } } diff --git a/core/src/tablemap3d.cpp b/core/src/tablemap3d.cpp index 9199982..d604839 100644 --- a/core/src/tablemap3d.cpp +++ b/core/src/tablemap3d.cpp @@ -142,7 +142,7 @@ void TableMap3D::paintGL() glVertex3f(maxx/*-(((float)1)/((float)m_tableData->xAxis().size()))*/,maxy/*+((float)2)/((float)m_tableData->xAxis().size())*/,(float)i/10.0); glVertex3f(0,maxy/*+((float)2)/((float)m_tableData->xAxis().size())*/,(float)i/10.0); glEnd(); - this->renderText(-0.1,maxy + 0.1,(float)i/10.0,QString::number((m_tableData->maxZAxis()) * (i/10.0),'f',2)); + this->renderText(-0.1,maxy + 0.1,(float)i/10.0,QString::number((m_tableData->maxCalcedValue()) * (i/10.0),'f',2)); } @@ -215,28 +215,28 @@ void TableMap3D::paintGL() double g=0; double b=0; double val = m_tableData->values()[y][x]; - if (val < m_tableData->maxZAxis()/4) + if (val < m_tableData->maxCalcedValue()/4) { r=0; - g=(255*((val)/(m_tableData->maxZAxis()/4.0))); + g=(255*((val)/(m_tableData->maxCalcedValue()/4.0))); b=255; } - else if (val < ((m_tableData->maxZAxis()/4)*2)) + else if (val < ((m_tableData->maxCalcedValue()/4)*2)) { r=0; g=255; - b=255-(255*((val-((m_tableData->maxZAxis()/4.0)))/(m_tableData->maxZAxis()/4.0))); + b=255-(255*((val-((m_tableData->maxCalcedValue()/4.0)))/(m_tableData->maxCalcedValue()/4.0))); } - else if (val < ((m_tableData->maxZAxis()/4)*3)) + else if (val < ((m_tableData->maxCalcedValue()/4)*3)) { - r=(255*((val-((m_tableData->maxZAxis()/4.0)*2))/(m_tableData->maxZAxis()/4.0))); + r=(255*((val-((m_tableData->maxCalcedValue()/4.0)*2))/(m_tableData->maxCalcedValue()/4.0))); g=255; b=0; } else { r=255; - g=255-(255*((val-((m_tableData->maxZAxis()/4.0)*3))/(m_tableData->maxZAxis()/4.0))); + g=255-(255*((val-((m_tableData->maxCalcedValue()/4.0)*3))/(m_tableData->maxCalcedValue()/4.0))); b=0; } if (i == 0 || i == 2) @@ -256,28 +256,28 @@ void TableMap3D::paintGL() float y0 = ((float)x * maxy)/((float)m_tableData->xAxis().size()-1.0); float x0 = ((float)y)/((float)m_tableData->yAxis().size()-1.0); - float z0 = (float)m_tableData->values()[y][x] / m_tableData->maxZAxis(); + float z0 = (float)m_tableData->values()[y][x] / m_tableData->maxCalcedValue(); glColor4f(r,g,b,1); //glVertex3f(x0+((i==1) ? MAP3DCELLSPACING : 0),(maxy-y0)-((i==1) ? MAP3DCELLSPACING : 0),z0); glVertex3f(x0,(maxy-y0),z0+((i==0) ? 0.001 : ((i==2) ? -0.001 : 0))); float y1 = ((float)x * maxy)/((float)m_tableData->xAxis().size()-1.0); float x1 = ((float)y+1)/((float)m_tableData->yAxis().size()-1.0); - float z1 = (float)m_tableData->values()[y+1][x] / m_tableData->maxZAxis(); + float z1 = (float)m_tableData->values()[y+1][x] / m_tableData->maxCalcedValue(); glColor4f(r,g,b,1); //glVertex3f(x1-((i==1) ? MAP3DCELLSPACING : 0),(maxy-y1)-((i==1) ? MAP3DCELLSPACING : 0),z1); glVertex3f(x1,(maxy-y1),z1+((i==0) ? 0.001 : ((i==2) ? -0.001 : 0))); float y2 = ((float)((x+1.0) * maxy))/((float)m_tableData->xAxis().size()-1.0); float x2 = ((float)y+1.0)/((float)m_tableData->yAxis().size()-1.0); - float z2 = (float)m_tableData->values()[y+1][x+1] / m_tableData->maxZAxis(); + float z2 = (float)m_tableData->values()[y+1][x+1] / m_tableData->maxCalcedValue(); glColor4f(r,g,b,1); //glVertex3f(x2-((i==1) ? MAP3DCELLSPACING : 0),(maxy-y2)+((i==1) ? MAP3DCELLSPACING : 0),z2); glVertex3f(x2,(maxy-y2),z2+((i==0) ? 0.001 : ((i==2) ? -0.001 : 0))); float y3 = ((float)(x+1) * maxy)/((float)m_tableData->xAxis().size()-1.0); float x3 = ((float)y)/((float)m_tableData->yAxis().size()-1.0); - float z3 = (float)m_tableData->values()[y][x+1]/m_tableData->maxZAxis(); + float z3 = (float)m_tableData->values()[y][x+1]/m_tableData->maxCalcedValue(); glColor4f(r,g,b,1); //glVertex3f(x3+((i==1) ? MAP3DCELLSPACING : 0),(maxy-y3)+((i==1) ? MAP3DCELLSPACING : 0),z3); glVertex3f(x3,(maxy-y3),z3+((i==0) ? 0.001 : ((i==2) ? -0.001 : 0))); diff --git a/core/src/tableview3d.cpp b/core/src/tableview3d.cpp index 8c2372c..7cf3459 100644 --- a/core/src/tableview3d.cpp +++ b/core/src/tableview3d.cpp @@ -176,16 +176,16 @@ void TableView3D::setValue(int row, int column,double value,bool ignoreselection if (row == ui.tableWidget->rowCount()-1) { setSilentValue(row,column,formatNumber(tempValue,m_metaData.xDp)); - if (tempValue > tableData->maxXAxis()) + if (tempValue > tableData->maxCalcedXAxis()) { - QMessageBox::information(0,"Error",QString("Value entered too large! Value range " + QString::number(tableData->minXAxis()) + "-" + QString::number(tableData->maxXAxis()) + ". Entered value:") + ui.tableWidget->item(row,column)->text()); + QMessageBox::information(0,"Error",QString("Value entered too large! Value range " + QString::number(tableData->minCalcedXAxis()) + "-" + QString::number(tableData->maxCalcedXAxis()) + ". Entered value:") + ui.tableWidget->item(row,column)->text()); setSilentValue(row,column,formatNumber(currentvalue,m_metaData.xDp)); //ui.tableWidget->item(row,column)->setText(QString::number(currentvalue)); return; } - else if (tempValue < tableData->minXAxis()) + else if (tempValue < tableData->minCalcedXAxis()) { - QMessageBox::information(0,"Error",QString("Value entered too small! Value range " + QString::number(tableData->minXAxis()) + "-" + QString::number(tableData->maxXAxis()) + ". Entered value:") + ui.tableWidget->item(row,column)->text()); + QMessageBox::information(0,"Error",QString("Value entered too small! Value range " + QString::number(tableData->minCalcedXAxis()) + "-" + QString::number(tableData->maxCalcedXAxis()) + ". Entered value:") + ui.tableWidget->item(row,column)->text()); setSilentValue(row,column,formatNumber(currentvalue,m_metaData.xDp)); //ui.tableWidget->item(row,column)->setText(QString::number(currentvalue)); return; @@ -197,16 +197,16 @@ void TableView3D::setValue(int row, int column,double value,bool ignoreselection else if (column == 0) { setSilentValue(row,column,formatNumber(tempValue,m_metaData.yDp)); - if (tempValue > tableData->maxYAxis()) + if (tempValue > tableData->maxCalcedYAxis()) { - QMessageBox::information(0,"Error",QString("Value entered too large! Value range " + QString::number(tableData->minYAxis()) + "-" + QString::number(tableData->maxYAxis()) + ". Entered value:") + ui.tableWidget->item(row,column)->text()); + QMessageBox::information(0,"Error",QString("Value entered too large! Value range " + QString::number(tableData->minCalcedYAxis()) + "-" + QString::number(tableData->maxCalcedYAxis()) + ". Entered value:") + ui.tableWidget->item(row,column)->text()); //ui.tableWidget->item(row,column)->setText(QString::number(currentvalue)); setSilentValue(row,column,formatNumber(currentvalue,m_metaData.yDp)); return; } - else if (tempValue < tableData->minYAxis()) + else if (tempValue < tableData->minCalcedYAxis()) { - QMessageBox::information(0,"Error",QString("Value entered too small! Value range " + QString::number(tableData->minYAxis()) + "-" + QString::number(tableData->maxYAxis()) + ". Entered value:") + ui.tableWidget->item(row,column)->text()); + QMessageBox::information(0,"Error",QString("Value entered too small! Value range " + QString::number(tableData->minCalcedYAxis()) + "-" + QString::number(tableData->maxCalcedYAxis()) + ". Entered value:") + ui.tableWidget->item(row,column)->text()); //ui.tableWidget->item(row,column)->setText(QString::number(currentvalue)); setSilentValue(row,column,formatNumber(currentvalue,m_metaData.yDp)); return; @@ -217,16 +217,16 @@ void TableView3D::setValue(int row, int column,double value,bool ignoreselection else { setSilentValue(row,column,formatNumber(tempValue,m_metaData.zDp)); - if (tempValue > tableData->maxZAxis()) + if (tempValue > tableData->maxCalcedValue()) { - QMessageBox::information(0,"Error",QString("Value entered too large! Value range " + QString::number(tableData->minZAxis()) + "-" + QString::number(tableData->maxZAxis()) + ". Entered value:") + ui.tableWidget->item(row,column)->text()); + QMessageBox::information(0,"Error",QString("Value entered too large! Value range " + QString::number(tableData->minCalcedValue()) + "-" + QString::number(tableData->maxCalcedValue()) + ". Entered value:") + ui.tableWidget->item(row,column)->text()); //ui.tableWidget->item(row,column)->setText(QString::number(currentvalue)); setSilentValue(row,column,formatNumber(currentvalue,m_metaData.zDp)); return; } - if (tempValue < tableData->minZAxis()) + if (tempValue < tableData->minCalcedValue()) { - QMessageBox::information(0,"Error",QString("Value entered too small! Value range " + QString::number(tableData->minZAxis()) + "-" + QString::number(tableData->maxZAxis()) + ". Entered value:") + ui.tableWidget->item(row,column)->text()); + QMessageBox::information(0,"Error",QString("Value entered too small! Value range " + QString::number(tableData->minCalcedValue()) + "-" + QString::number(tableData->maxCalcedValue()) + ". Entered value:") + ui.tableWidget->item(row,column)->text()); //ui.tableWidget->item(row,column)->setText(QString::number(currentvalue)); setSilentValue(row,column,formatNumber(currentvalue,m_metaData.zDp)); return; @@ -258,15 +258,15 @@ void TableView3D::hotKeyPressed(int key,Qt::KeyboardModifiers modifier) double maxval = 0; if (ui.tableWidget->selectedItems()[i]->row() == ui.tableWidget->rowCount()-1) { - maxval = tableData->maxXAxis(); + maxval = tableData->maxCalcedXAxis(); } else if (ui.tableWidget->selectedItems()[i]->column() == 0) { - maxval = tableData->maxYAxis(); + maxval = tableData->maxCalcedYAxis(); } else { - maxval = tableData->maxZAxis(); + maxval = tableData->maxCalcedValue(); } if (modifier & Qt::ShiftModifier) { @@ -309,18 +309,18 @@ void TableView3D::hotKeyPressed(int key,Qt::KeyboardModifiers modifier) double maxval = 0; if (ui.tableWidget->selectedItems()[i]->row() == ui.tableWidget->rowCount()-1) { - maxval = tableData->maxXAxis(); - minval = tableData->minXAxis(); + maxval = tableData->maxCalcedXAxis(); + minval = tableData->minCalcedXAxis(); } else if (ui.tableWidget->selectedItems()[i]->column() == 0) { - maxval = tableData->maxYAxis(); - minval = tableData->minYAxis(); + maxval = tableData->maxCalcedYAxis(); + minval = tableData->minCalcedYAxis(); } else { - maxval = tableData->maxZAxis(); - minval = tableData->minZAxis(); + maxval = tableData->maxCalcedValue(); + minval = tableData->minCalcedValue(); } if (modifier & Qt::ShiftModifier) { @@ -513,33 +513,33 @@ QString TableView3D::verifyValue(int row,int column,QString item) if (row == ui.tableWidget->rowCount()-1) { - if (tempValue > tableData->maxXAxis()) + if (tempValue > tableData->maxCalcedXAxis()) { return "Axis value entered too large!"; } - else if (tempValue < tableData->minXAxis()) + else if (tempValue < tableData->minCalcedXAxis()) { return "Axis value entered too small"; } } else if (column == 0) { - if (tempValue > tableData->maxYAxis()) + if (tempValue > tableData->maxCalcedYAxis()) { return "Axis value too large"; } - else if (tempValue < tableData->minYAxis()) + else if (tempValue < tableData->minCalcedYAxis()) { return "Axis value too small"; } } else { - if (tempValue > tableData->maxZAxis()) + if (tempValue > tableData->maxCalcedValue()) { return "Value too large for table"; } - if (tempValue < tableData->minZAxis()) + if (tempValue < tableData->minCalcedValue()) { return "Value too small for table"; } @@ -990,21 +990,21 @@ bool TableView3D::updateTable() { double val = tableData->values()[row][col]; ui.tableWidget->setItem((tableData->rows()-1)-(row),col+1,new QTableWidgetItem(formatNumber(val,m_metaData.zDp))); - if (val < tableData->maxZAxis()/4) + if (val < tableData->maxCalcedValue()/4) { - ui.tableWidget->item((tableData->rows()-1)-((row)),(col)+1)->setBackgroundColor(QColor::fromRgb(0,(255*((val)/(tableData->maxZAxis()/4.0))),255)); + ui.tableWidget->item((tableData->rows()-1)-((row)),(col)+1)->setBackgroundColor(QColor::fromRgb(0,(255*((val)/(tableData->maxCalcedValue()/4.0))),255)); } - else if (val < ((tableData->maxZAxis()/4)*2)) + else if (val < ((tableData->maxCalcedValue()/4)*2)) { - ui.tableWidget->item((tableData->rows()-1)-((row)),(col)+1)->setBackgroundColor(QColor::fromRgb(0,255,255-(255*((val-((tableData->maxZAxis()/4.0)))/(tableData->maxZAxis()/4.0))))); + ui.tableWidget->item((tableData->rows()-1)-((row)),(col)+1)->setBackgroundColor(QColor::fromRgb(0,255,255-(255*((val-((tableData->maxCalcedValue()/4.0)))/(tableData->maxCalcedValue()/4.0))))); } - else if (val < ((tableData->maxZAxis()/4)*3)) + else if (val < ((tableData->maxCalcedValue()/4)*3)) { - ui.tableWidget->item((tableData->rows()-1)-((row)),(col)+1)->setBackgroundColor(QColor::fromRgb((255*((val-((tableData->maxZAxis()/4.0)*2))/(tableData->maxZAxis()/4.0))),255,0)); + ui.tableWidget->item((tableData->rows()-1)-((row)),(col)+1)->setBackgroundColor(QColor::fromRgb((255*((val-((tableData->maxCalcedValue()/4.0)*2))/(tableData->maxCalcedValue()/4.0))),255,0)); } else { - ui.tableWidget->item((tableData->rows()-1)-((row)),(col)+1)->setBackgroundColor(QColor::fromRgb(255,255-(255*((val-((tableData->maxZAxis()/4.0)*3))/(tableData->maxZAxis()/4.0))),0)); + ui.tableWidget->item((tableData->rows()-1)-((row)),(col)+1)->setBackgroundColor(QColor::fromRgb(255,255-(255*((val-((tableData->maxCalcedValue()/4.0)*3))/(tableData->maxCalcedValue()/4.0))),0)); } } } @@ -1081,21 +1081,21 @@ void TableView3D::reColorTable(int rownum,int colnum) { double val = tableData->values()[row][col]; //ui.tableWidget->setItem((tableData->rows()-1)-(row),col+1,new QTableWidgetItem(formatNumber(val,m_metaData.zDp))); - if (val < tableData->maxZAxis()/4) + if (val < tableData->maxCalcedValue()/4) { - ui.tableWidget->item((tableData->rows()-1)-((row)),(col)+1)->setBackgroundColor(QColor::fromRgb(0,(255*((val)/(tableData->maxZAxis()/4.0))),255)); + ui.tableWidget->item((tableData->rows()-1)-((row)),(col)+1)->setBackgroundColor(QColor::fromRgb(0,(255*((val)/(tableData->maxCalcedValue()/4.0))),255)); } - else if (val < ((tableData->maxZAxis()/4)*2)) + else if (val < ((tableData->maxCalcedValue()/4)*2)) { - ui.tableWidget->item((tableData->rows()-1)-((row)),(col)+1)->setBackgroundColor(QColor::fromRgb(0,255,255-(255*((val-((tableData->maxZAxis()/4.0)))/(tableData->maxZAxis()/4.0))))); + ui.tableWidget->item((tableData->rows()-1)-((row)),(col)+1)->setBackgroundColor(QColor::fromRgb(0,255,255-(255*((val-((tableData->maxCalcedValue()/4.0)))/(tableData->maxCalcedValue()/4.0))))); } - else if (val < ((tableData->maxZAxis()/4)*3)) + else if (val < ((tableData->maxCalcedValue()/4)*3)) { - ui.tableWidget->item((tableData->rows()-1)-((row)),(col)+1)->setBackgroundColor(QColor::fromRgb((255*((val-((tableData->maxZAxis()/4.0)*2))/(tableData->maxZAxis()/4.0))),255,0)); + ui.tableWidget->item((tableData->rows()-1)-((row)),(col)+1)->setBackgroundColor(QColor::fromRgb((255*((val-((tableData->maxCalcedValue()/4.0)*2))/(tableData->maxCalcedValue()/4.0))),255,0)); } else { - ui.tableWidget->item((tableData->rows()-1)-((row)),(col)+1)->setBackgroundColor(QColor::fromRgb(255,255-(255*((val-((tableData->maxZAxis()/4.0)*3))/(tableData->maxZAxis()/4.0))),0)); + ui.tableWidget->item((tableData->rows()-1)-((row)),(col)+1)->setBackgroundColor(QColor::fromRgb(255,255-(255*((val-((tableData->maxCalcedValue()/4.0)*3))/(tableData->maxCalcedValue()/4.0))),0)); } } } @@ -1127,21 +1127,21 @@ void TableView3D::reColorTable(int rownum,int colnum) //QLOG_DEBUG() << "Value:" << val; //ui.tableWidget->setItem((tableData->rows()-1)-(row),col+1,new QTableWidgetItem(formatNumber(val,m_metaData.zDp))); - if (val < tableData->maxZAxis()/4) + if (val < tableData->maxCalcedValue()/4) { - ui.tableWidget->item(rownum,colnum)->setBackgroundColor(QColor::fromRgb(0,(255*((val)/(tableData->maxZAxis()/4.0))),255)); + ui.tableWidget->item(rownum,colnum)->setBackgroundColor(QColor::fromRgb(0,(255*((val)/(tableData->maxCalcedValue()/4.0))),255)); } - else if (val < ((tableData->maxZAxis()/4)*2)) + else if (val < ((tableData->maxCalcedValue()/4)*2)) { - ui.tableWidget->item(rownum,colnum)->setBackgroundColor(QColor::fromRgb(0,255,255-(255*((val-((tableData->maxZAxis()/4.0)))/(tableData->maxZAxis()/4.0))))); + ui.tableWidget->item(rownum,colnum)->setBackgroundColor(QColor::fromRgb(0,255,255-(255*((val-((tableData->maxCalcedValue()/4.0)))/(tableData->maxCalcedValue()/4.0))))); } - else if (val < ((tableData->maxZAxis()/4)*3)) + else if (val < ((tableData->maxCalcedValue()/4)*3)) { - ui.tableWidget->item(rownum,colnum)->setBackgroundColor(QColor::fromRgb((255*((val-((tableData->maxZAxis()/4.0)*2))/(tableData->maxZAxis()/4.0))),255,0)); + ui.tableWidget->item(rownum,colnum)->setBackgroundColor(QColor::fromRgb((255*((val-((tableData->maxCalcedValue()/4.0)*2))/(tableData->maxCalcedValue()/4.0))),255,0)); } else { - ui.tableWidget->item(rownum,colnum)->setBackgroundColor(QColor::fromRgb(255,255-(255*((val-((tableData->maxZAxis()/4.0)*3))/(tableData->maxZAxis()/4.0))),0)); + ui.tableWidget->item(rownum,colnum)->setBackgroundColor(QColor::fromRgb(255,255-(255*((val-((tableData->maxCalcedValue()/4.0)*3))/(tableData->maxCalcedValue()/4.0))),0)); } connect(ui.tableWidget,SIGNAL(cellChanged(int,int)),this,SLOT(tableCellChanged(int,int))); connect(ui.tableWidget,SIGNAL(currentCellChanged(int,int,int,int)),this,SLOT(tableCurrentCellChanged(int,int,int,int))); diff --git a/lib/core/table3ddata.h b/lib/core/table3ddata.h index afb9fa7..0e533ee 100644 --- a/lib/core/table3ddata.h +++ b/lib/core/table3ddata.h @@ -71,12 +71,18 @@ class Table3DData : public DataBlock virtual void setCell(int row, int column,double val)=0; virtual void setXAxis(int column,double val)=0; virtual void setYAxis(int row,double val)=0; - virtual double maxXAxis()=0; - virtual double maxYAxis()=0; - virtual double maxZAxis()=0; - virtual double minXAxis()=0; - virtual double minYAxis()=0; - virtual double minZAxis()=0; + virtual double maxActualXAxis() = 0; + virtual double maxActualYAxis() = 0; + virtual double maxActualValue() = 0; + virtual double minActualYAxis() = 0; + virtual double minActualXAxis() = 0; + virtual double minActualValue() = 0; + virtual double maxCalcedXAxis() = 0; + virtual double maxCalcedYAxis() = 0; + virtual double maxCalcedValue() = 0; + virtual double minCalcedXAxis() = 0; + virtual double minCalcedYAxis() = 0; + virtual double minCalcedValue() = 0; virtual void setWritesEnabled(bool enabled)=0; virtual void writeWholeLocation(bool ram)=0; virtual bool isRam()=0; diff --git a/plugins/freeems/fetable3ddata.cpp b/plugins/freeems/fetable3ddata.cpp index 82eca53..27bdc1a 100644 --- a/plugins/freeems/fetable3ddata.cpp +++ b/plugins/freeems/fetable3ddata.cpp @@ -41,13 +41,13 @@ void FETable3DData::setData(unsigned short locationid,bool isflashonly, QByteArr QLOG_DEBUG() << "YAxis:" << yaxissize; - m_maxXAxis = calcAxis(65535,m_metaData.xAxisCalc); - m_maxYAxis = calcAxis(65535,m_metaData.yAxisCalc); - m_maxZAxis = calcAxis(65535,m_metaData.zAxisCalc); + m_maxCalcedXAxis = calcAxis(65535,m_metaData.xAxisCalc); + m_maxCalcedYAxis = calcAxis(65535,m_metaData.yAxisCalc); + m_maxCalcedValue = calcAxis(65535,m_metaData.zAxisCalc); - m_minXAxis = calcAxis(0,m_metaData.xAxisCalc); - m_minYAxis = calcAxis(0,m_metaData.yAxisCalc); - m_minZAxis = calcAxis(0,m_metaData.zAxisCalc); + m_minCalcedXAxis = calcAxis(0,m_metaData.xAxisCalc); + m_minCalcedYAxis = calcAxis(0,m_metaData.yAxisCalc); + m_minCalcedValue = calcAxis(0,m_metaData.zAxisCalc); for (int i=0;i