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

Merge branch 'comboBoxDelegate' of https://github.com/tcanabrava/subsurface

Browse source
This commit is contained in:
Dirk Hohndel 2013-05-22 12:14:06 -07:00
commit 63b6f7d5a2
11 changed files with 8 additions and 627 deletions
Download patch file Download diff file Expand all files Collapse all files

22
qt-ui/models.cpp
View file

@ -67,7 +67,7 @@ QVariant CylindersModel::data(const QModelIndex& index, int role) const
cylinder_t *cyl = &current->cylinder[index.row()];
if (role == Qt::DisplayRole) {
if (role == Qt::DisplayRole || role==Qt::EditRole) {
switch(index.column()) {
case TYPE:
ret = QString(cyl->type.description);
@ -160,7 +160,7 @@ int CylindersModel::rowCount(const QModelIndex& parent) const
return rows;
}
void CylindersModel::add(cylinder_t* cyl)
void CylindersModel::add()
{
if (rows >= MAX_CYLINDERS) {
return;
@ -168,14 +168,6 @@ void CylindersModel::add(cylinder_t* cyl)
int row = rows;
cylinder_t& cylinder = current->cylinder[row];
cylinder.end.mbar = cyl->end.mbar;
cylinder.start.mbar = cyl->start.mbar;
cylinder.type.description = strdup(cyl->type.description);
cylinder.type.size = cyl->type.size;
cylinder.type.workingpressure = cyl->type.workingpressure;
beginInsertRows(QModelIndex(), row, row);
rows++;
endInsertRows();
@ -266,7 +258,7 @@ QVariant WeightModel::data(const QModelIndex& index, int role) const
weightsystem_t *ws = &current_dive->weightsystem[index.row()];
if (role == Qt::DisplayRole) {
if (role == Qt::DisplayRole || role == Qt::EditRole) {
switch(index.column()) {
case TYPE:
ret = QString(ws->description);
@ -331,18 +323,12 @@ QVariant WeightModel::headerData(int section, Qt::Orientation orientation, int r
return ret;
}
void WeightModel::add(weightsystem_t* weight)
void WeightModel::add()
{
if (rows >= MAX_WEIGHTSYSTEMS)
return;
int row = rows;
weightsystem_t *ws = &current->weightsystem[row];
ws->description = weight->description;
ws->weight.grams = weight->weight.grams;
beginInsertRows(QModelIndex(), row, row);
rows++;
endInsertRows();