mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Replace wet_volume calculation with straight forward pressure formula

Browse source 
Since no one else approximates gas volumes at higher pressures, we
shouldn't do that either when converting imperial tank names (cuft @
working pressure) into wet volumes.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2013-06-19 14:36:48 -07:00
parent 88f0f60439
commit 77725ecfe9
1 changed files with 8 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
qt-ui/models.cpp
View file

@ -678,22 +678,17 @@ QVariant TankInfoModel::data(const QModelIndex& index, int role) const
if (role == Qt::FontRole){
return defaultModelFont();
}
struct tank_info *info = &tank_info[index.row()];
int ml = info->ml;
int bar = ((info->psi) ? psi_to_bar(info->psi) : info->bar) * 1000 + 0.5;
if (info->cuft && info->psi) {
pressure_t p;
p.mbar = psi_to_mbar(info->psi);
ml = wet_volume(info->cuft, p);
}
if (role == Qt::DisplayRole || role == Qt::EditRole) {
struct tank_info *info = &tank_info[index.row()];
int ml = info->ml;
double bar = (info->psi) ? psi_to_bar(info->psi) : info->bar;
if (info->cuft && info->psi)
ml = cuft_to_l(info->cuft) * 1000 / bar_to_atm(bar);
switch(index.column()) {
case BAR:
ret = bar;
ret = bar * 1000;
break;
case ML:
ret = ml;