X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=equipment.c;h=be544ab0830677a47e0be6b811aa1942f75c1372;hb=049b895d9beb33cba7d53985c4c382ab66d41cc3;hp=62183c0c17054dc51ae461ee7488dd0991dbaaea;hpb=2b26b6433f77cb4bf7523a90148a0087549e30e5;p=ext%2Fsubsurface.git diff --git a/equipment.c b/equipment.c index 62183c0..be544ab 100644 --- a/equipment.c +++ b/equipment.c @@ -283,18 +283,24 @@ static int cyl_nothing(cylinder_t *cyl) !cyl->type.description && !cyl->gasmix.o2.permille && !cyl->gasmix.he.permille && + !cyl->sample_start.mbar && + !cyl->sample_end.mbar && !cyl->start.mbar && !cyl->end.mbar; } static void set_one_cylinder(int index, cylinder_t *cyl, GtkListStore *model, GtkTreeIter *iter) { + unsigned int start, end; + + start = cyl->start.mbar ? : cyl->sample_start.mbar; + end = cyl->end.mbar ? : cyl->sample_end.mbar; gtk_list_store_set(model, iter, CYL_DESC, cyl->type.description ? : "", CYL_SIZE, cyl->type.size.mliter, CYL_WORKP, cyl->type.workingpressure.mbar, - CYL_STARTP, cyl->start.mbar, - CYL_ENDP, cyl->end.mbar, + CYL_STARTP, start, + CYL_ENDP, end, CYL_O2, cyl->gasmix.o2.permille, CYL_HE, cyl->gasmix.he.permille, -1);