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

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
=== modified file 'FsWisdom/Updater_QTableWidget.cpp'
--- FsWisdom/Updater_QTableWidget.cpp 2009-06-10 16:39:27 +0000
+++ FsWisdom/Updater_QTableWidget.cpp 2009-08-14 08:57:35 +0000
@@ -54,9 +54,15 @@
54 int expertVoxelsDrilled = this->drillingStepsNode->noOfExpertVoxelsDrilledByUserForCurrentDrillingStep(i+1);54 int expertVoxelsDrilled = this->drillingStepsNode->noOfExpertVoxelsDrilledByUserForCurrentDrillingStep(i+1);
55 int expertVoxels = this->drillingStepsNode->noOfVoxelsDrilledByExpertForCurrentDrillingStep(i+1);55 int expertVoxels = this->drillingStepsNode->noOfVoxelsDrilledByExpertForCurrentDrillingStep(i+1);
5656
57 table->setItem( i,2, new QTableWidgetItem(QString(newString.setNum(expertVoxelsDrilled))));57 if (expertVoxels==0){
58 table->setItem( i,3, new QTableWidgetItem(QString(newString.setNum((float)expertVoxelsDrilled/(float)expertVoxels))));58 table->setItem( i,2, new QTableWidgetItem(QString("-")));
59 table->setItem( i,3, new QTableWidgetItem(QString("-")));
60 }
61 else{
62 table->setItem( i,2, new QTableWidgetItem(QString(newString.setNum(expertVoxelsDrilled))));
63 table->setItem( i,3, new QTableWidgetItem(QString(newString.setNum((float)expertVoxelsDrilled/(float)expertVoxels))));
5964
65 }
60 expertVoxelsDrilledTotal += expertVoxelsDrilled;66 expertVoxelsDrilledTotal += expertVoxelsDrilled;
61 expertVoxelsTotal += expertVoxels;67 expertVoxelsTotal += expertVoxels;
62 }68 }

Subscribers

People subscribed via source and target branches

to all changes: