Forssim

Merge lp:~par-hellstrom/forssim/fixedNaN into lp:forssim

  1. fixedNaN
  2. Merge into development
Proposed by parhe
Status: Merged
Merged at revision: not available
Proposed branch: lp:~par-hellstrom/forssim/fixedNaN
Merge into: lp:forssim
Diff against target: None lines
To merge this branch: bzr merge lp:~par-hellstrom/forssim/fixedNaN
Reviewer Review Type Date Requested Status
jocke Approve
Review via email: mp+10140@code.launchpad.net
To post a comment you must log in.
Revision history for this message
parhe (par-hellstrom) wrote :

Fixed NaN in GUI replaced with - if no expert voxels are present

Revision history for this message
jocke (jocke-karlsson) wrote :

looks good

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'FsWisdom/Updater_QTableWidget.cpp'
2--- FsWisdom/Updater_QTableWidget.cpp 2009-06-10 16:39:27 +0000
3+++ FsWisdom/Updater_QTableWidget.cpp 2009-08-14 08:57:35 +0000
4@@ -54,9 +54,15 @@
5 int expertVoxelsDrilled = this->drillingStepsNode->noOfExpertVoxelsDrilledByUserForCurrentDrillingStep(i+1);
6 int expertVoxels = this->drillingStepsNode->noOfVoxelsDrilledByExpertForCurrentDrillingStep(i+1);
7
8- table->setItem( i,2, new QTableWidgetItem(QString(newString.setNum(expertVoxelsDrilled))));
9- table->setItem( i,3, new QTableWidgetItem(QString(newString.setNum((float)expertVoxelsDrilled/(float)expertVoxels))));
10+ if (expertVoxels==0){
11+ table->setItem( i,2, new QTableWidgetItem(QString("-")));
12+ table->setItem( i,3, new QTableWidgetItem(QString("-")));
13+ }
14+ else{
15+ table->setItem( i,2, new QTableWidgetItem(QString(newString.setNum(expertVoxelsDrilled))));
16+ table->setItem( i,3, new QTableWidgetItem(QString(newString.setNum((float)expertVoxelsDrilled/(float)expertVoxels))));
17
18+ }
19 expertVoxelsDrilledTotal += expertVoxelsDrilled;
20 expertVoxelsTotal += expertVoxels;
21 }

Subscribers

People subscribed via source and target branches

to all changes: