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

Picture handling: cleaning up the mess

Browse source 
We had pointers to data structures on the stack which we frequently
reallocated. These data structure contain basically a filename and an
offset. We then create a hash of the pointers to those datastructures with
the filename being the key. And then we passed those pointers around
through a Qt model(!!!) only in order to then later look up by filename
what the offset might be.

I am at a loss for words for the lunacy behind this design.

How about we just remember the offsets and pass the integers around?

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2014-08-05 12:37:14 -07:00
parent 3adbff2320
commit 4583cd8e09
5 changed files with 10 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
qt-ui/profile/profilewidget2.cpp
View file

@ -1360,17 +1360,17 @@ void ProfileWidget2::plotPictures()
double x, y, lastX = -1.0, lastY = -1.0;
DivePictureModel *m = DivePictureModel::instance();
for (int i = 0; i < m->rowCount(); i++) {
struct picture *pic = (struct picture*) m->index(i,1).data(Qt::UserRole).value<void*>();
int offsetSeconds = m->index(i,1).data(Qt::UserRole).value<int>();
// it's a correct picture, but doesn't have a timestamp: only show on the widget near the
// information area.
if (!pic->offset.seconds)
if (!offsetSeconds)
continue;
DivePictureItem *item = new DivePictureItem();
item->setPixmap(m->index(i,0).data(Qt::DecorationRole).value<QPixmap>());
item->setFileUrl(m->index(i,1).data().toString());
// let's put the picture at the correct time, but at a fixed "depth" on the profile
// not sure this is ideal, but it seems to look right.
x = timeAxis->posAtValue(pic->offset.seconds);
x = timeAxis->posAtValue(offsetSeconds);
if (i == 0)
y = 10;
else if (fabs(x - lastX) < 4)