mirror of
				https://github.com/subsurface/subsurface.git
				synced 2025-02-19 22:16:15 +00:00 
			
		
		
		
	Basically we could end up in a situation where the plotInfo is no longer valid, yet the model changes and triggers a redraw before the new data is passed into the TankBar. Instead of chasing that race condition it seemed much easier to just copy the plot_data entries and the gas information in the dive. Fixes #716 Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
		
			
				
	
	
		
			112 lines
		
	
	
	
		
			3.4 KiB
		
	
	
	
		
			C++
		
	
	
	
	
	
			
		
		
	
	
			112 lines
		
	
	
	
		
			3.4 KiB
		
	
	
	
		
			C++
		
	
	
	
	
	
| #include "tankitem.h"
 | |
| #include "diveplotdatamodel.h"
 | |
| #include "divetextitem.h"
 | |
| #include "profile.h"
 | |
| #include <QGradient>
 | |
| #include <QDebug>
 | |
| #include <QPen>
 | |
| 
 | |
| TankItem::TankItem(QObject *parent) :
 | |
| 	QGraphicsRectItem(),
 | |
| 	dataModel(0),
 | |
| 	pInfoEntry(0),
 | |
| 	pInfoNr(0)
 | |
| {
 | |
| 	height = 3;
 | |
| 	QColor red(PERSIANRED1);
 | |
| 	QColor blue(AIR_BLUE);
 | |
| 	QColor yellow(NITROX_YELLOW);
 | |
| 	QColor green(NITROX_GREEN);
 | |
| 	QLinearGradient nitroxGradient(QPointF(0, 0), QPointF(0, height));
 | |
| 	nitroxGradient.setColorAt(0.0, green);
 | |
| 	nitroxGradient.setColorAt(0.49, green);
 | |
| 	nitroxGradient.setColorAt(0.5, yellow);
 | |
| 	nitroxGradient.setColorAt(1.0, yellow);
 | |
| 	nitrox = nitroxGradient;
 | |
| 	QLinearGradient trimixGradient(QPointF(0, 0), QPointF(0, height));
 | |
| 	trimixGradient.setColorAt(0.0, green);
 | |
| 	trimixGradient.setColorAt(0.49, green);
 | |
| 	trimixGradient.setColorAt(0.5, red);
 | |
| 	trimixGradient.setColorAt(1.0, red);
 | |
| 	trimix = trimixGradient;
 | |
| 	air = blue;
 | |
| 	memset(&diveCylinderStore, 0, sizeof(diveCylinderStore));
 | |
| }
 | |
| 
 | |
| void TankItem::setData(DivePlotDataModel *model, struct plot_info *plotInfo, struct dive *d)
 | |
| {
 | |
| 	free(pInfoEntry);
 | |
| 	// the plotInfo and dive structures passed in could become invalid before we stop using them,
 | |
| 	// so copy the data that we need
 | |
| 	int size = plotInfo->nr * sizeof(plotInfo->entry[0]);
 | |
| 	pInfoEntry = (struct plot_data *)malloc(size);
 | |
| 	pInfoNr = plotInfo->nr;
 | |
| 	memcpy(pInfoEntry, plotInfo->entry, size);
 | |
| 	copy_cylinders(d, &diveCylinderStore, false);
 | |
| 	dataModel = model;
 | |
| 	connect(dataModel, SIGNAL(dataChanged(QModelIndex, QModelIndex)), this, SLOT(modelDataChanged(QModelIndex, QModelIndex)));
 | |
| 	modelDataChanged();
 | |
| }
 | |
| 
 | |
| void TankItem::createBar(qreal x, qreal w, struct gasmix *gas)
 | |
| {
 | |
| 	// pick the right gradient, size, position and text
 | |
| 	QGraphicsRectItem *rect = new QGraphicsRectItem(x, 0, w, height, this);
 | |
| 	if (gasmix_is_air(gas))
 | |
| 		rect->setBrush(air);
 | |
| 	else if (gas->he.permille)
 | |
| 		rect->setBrush(trimix);
 | |
| 	else
 | |
| 		rect->setBrush(nitrox);
 | |
| 	rect->setPen(QPen(QBrush(), 0.0)); // get rid of the thick line around the rectangle
 | |
| 	rects.push_back(rect);
 | |
| 	DiveTextItem *label = new DiveTextItem(rect);
 | |
| 	label->setText(gasname(gas));
 | |
| 	label->setBrush(Qt::black);
 | |
| 	label->setPos(x + 1, 0);
 | |
| 	label->setAlignment(Qt::AlignBottom | Qt::AlignRight);
 | |
| 	label->setZValue(101);
 | |
| }
 | |
| 
 | |
| void TankItem::modelDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight)
 | |
| {
 | |
| 	// We don't have enougth data to calculate things, quit.
 | |
| 
 | |
| 	if (!dataModel || !pInfoEntry || !pInfoNr)
 | |
| 		return;
 | |
| 
 | |
| 	// remove the old rectangles
 | |
| 	foreach (QGraphicsRectItem *r, rects) {
 | |
| 		delete(r);
 | |
| 	}
 | |
| 	rects.clear();
 | |
| 
 | |
| 	// walk the list and figure out which tanks go where
 | |
| 	struct plot_data *entry = pInfoEntry;
 | |
| 	int cylIdx = entry->cylinderindex;
 | |
| 	int i = -1;
 | |
| 	int startTime = 0;
 | |
| 	struct gasmix *gas = &diveCylinderStore.cylinder[cylIdx].gasmix;
 | |
| 	qreal width, left;
 | |
| 	while (++i < pInfoNr) {
 | |
| 		entry = &pInfoEntry[i];
 | |
| 		if (entry->cylinderindex == cylIdx)
 | |
| 			continue;
 | |
| 		width = hAxis->posAtValue(entry->sec) - hAxis->posAtValue(startTime);
 | |
| 		left = hAxis->posAtValue(startTime);
 | |
| 		createBar(left, width, gas);
 | |
| 		cylIdx = entry->cylinderindex;
 | |
| 		gas = &diveCylinderStore.cylinder[cylIdx].gasmix;
 | |
| 		startTime = entry->sec;
 | |
| 	}
 | |
| 	width = hAxis->posAtValue(entry->sec) - hAxis->posAtValue(startTime);
 | |
| 	left = hAxis->posAtValue(startTime);
 | |
| 	createBar(left, width, gas);
 | |
| }
 | |
| 
 | |
| void TankItem::setHorizontalAxis(DiveCartesianAxis *horizontal)
 | |
| {
 | |
| 	hAxis = horizontal;
 | |
| 	connect(hAxis, SIGNAL(sizeChanged()), this, SLOT(modelDataChanged()));
 | |
| 	modelDataChanged();
 | |
| }
 |