From 90ff8e672b911f17bb7849f9d8316577b3ed59cf Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Sat, 28 Dec 2013 14:56:01 -0800 Subject: Update tank model with custom tanks used in XML files Fixes #377 Signed-off-by: Dirk Hohndel --- equipment.c | 11 ++++++++++- qt-ui/mainwindow.cpp | 1 + 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/equipment.c b/equipment.c index 240e92681..133bef2b2 100644 --- a/equipment.c +++ b/equipment.c @@ -13,11 +13,20 @@ void add_cylinder_description(cylinder_type_t *type) { const char *desc; + int i; desc = type->description; if (!desc) return; - /* now do something with it... */ + for (i = 0; i < 100 && tank_info[i].name != NULL; i++) { + if (strcmp(tank_info[i].name, desc) == 0) + return; + } + if (i < 100) { + tank_info[i].name = desc; + tank_info[i].ml = type->size.mliter; + tank_info[i].bar = type->workingpressure.mbar / 1000; + } } void add_weightsystem_description(weightsystem_t *weightsystem) { diff --git a/qt-ui/mainwindow.cpp b/qt-ui/mainwindow.cpp index 5f410ff3c..ad52c7d7f 100644 --- a/qt-ui/mainwindow.cpp +++ b/qt-ui/mainwindow.cpp @@ -75,6 +75,7 @@ MainWindow::MainWindow() : helpView(0) void MainWindow::refreshDisplay(bool recreateDiveList) { ui.InfoWidget->reload(); + TankInfoModel::instance()->update(); ui.ProfileWidget->refresh(); ui.globe->reload(); if (recreateDiveList) -- cgit v1.2.3-70-g09d2