mirror of
https://gitlab.com/pholy/OSCAR-code.git
synced 2025-04-05 02:30:44 +00:00
MinutesAtPressure (timeAtPressure) has been refactored.
TimeAtPressure Graph now has the same look and feel as the Pressure Graph. Configuration chamges to the Pressure Graph now also impact the TimeAtPressureGraph. Changes are identified in MinauteatPressure.cpp (first 100 lines)
This commit is contained in:
LoudSnorer
parent
940b247cb9
commit
3591f112a9
File diff suppressed because it is too large
Load Diff
@ -9,48 +9,57 @@
|
||||
#ifndef MINUTESATPRESSURE_H
|
||||
#define MINUTESATPRESSURE_H
|
||||
|
||||
#include <QPen>
|
||||
#include "Graphs/layer.h"
|
||||
#include "SleepLib/day.h"
|
||||
#include "SleepLib/schema.h"
|
||||
#include "Graphs/gLineChart.h"
|
||||
|
||||
class MinutesAtPressure;
|
||||
struct PressureInfo
|
||||
{
|
||||
PressureInfo()
|
||||
{
|
||||
code = 0;
|
||||
minx = maxx = 0;
|
||||
peaktime = peakevents = 0;
|
||||
min_pressure = max_pressure = 0;
|
||||
}
|
||||
public:
|
||||
PressureInfo();
|
||||
PressureInfo(ChannelID code, qint64 minTime, qint64 maxTime) ;
|
||||
PressureInfo(PressureInfo ©) = default;
|
||||
|
||||
PressureInfo(ChannelID code, qint64 minx, qint64 maxx) : code(code), minx(minx), maxx(maxx)
|
||||
{
|
||||
times.resize(300);
|
||||
}
|
||||
void AddChannel(ChannelID c)
|
||||
{
|
||||
chans.append(c);
|
||||
events[c].resize(300);
|
||||
}
|
||||
void AddChannels(QList<ChannelID> & chans)
|
||||
{
|
||||
for (int i=0; i<chans.size(); ++i) {
|
||||
AddChannel(chans.at(i));
|
||||
}
|
||||
}
|
||||
void AddChannel(ChannelID c);
|
||||
void AddChannels(QList<ChannelID> & chans);
|
||||
void finishCalcs();
|
||||
void setMachineTimes(EventDataType min,EventDataType max);
|
||||
|
||||
ChannelID code;
|
||||
qint64 minx, maxx;
|
||||
schema::Channel chan;
|
||||
qint64 minTime, maxTime;
|
||||
QVector<int> times;
|
||||
int peaktime, peakevents;
|
||||
int min_pressure, max_pressure;
|
||||
|
||||
QHash<ChannelID, QVector<int> > events;
|
||||
QHash<ChannelID, int> numEvents;
|
||||
QList<ChannelID> chans;
|
||||
QVector<EventList*> eventLists;
|
||||
|
||||
void updateBucketsPerPressure(Session* sess);
|
||||
int bucketsPerPressure = 1;
|
||||
int numberXaxisDivisions =10;
|
||||
|
||||
EventDataType rawToPressure ( EventStoreType raw,EventDataType gain);
|
||||
EventStoreType rawToBucketId ( EventStoreType raw,EventDataType gain);
|
||||
EventDataType minpressure = 0.0;
|
||||
EventDataType maxpressure = 0.0;
|
||||
qint64 totalDuration = 0;
|
||||
|
||||
EventDataType machinePressureMin = 0.0;
|
||||
EventDataType machinePressureMax = 0.0;
|
||||
|
||||
int firstPlotBucket =0;
|
||||
int lastPlotBucket =0;
|
||||
|
||||
private:
|
||||
void init();
|
||||
};
|
||||
|
||||
|
||||
class RecalcMAP:public QRunnable
|
||||
{
|
||||
friend class MinutesAtPressure;
|
||||
@ -58,15 +67,31 @@ public:
|
||||
explicit RecalcMAP(MinutesAtPressure * map) :map(map), m_quit(false), m_done(false) {}
|
||||
virtual ~RecalcMAP();
|
||||
virtual void run();
|
||||
|
||||
void quit();
|
||||
|
||||
|
||||
protected:
|
||||
void updateTimes(PressureInfo & info, Session * sess);
|
||||
MinutesAtPressure * map;
|
||||
volatile bool m_quit;
|
||||
volatile bool m_done;
|
||||
|
||||
private:
|
||||
void setSelectionRange(gGraph* graph);
|
||||
qint64 minTime, maxTime;
|
||||
ChannelID chanId; // required for debug.
|
||||
|
||||
PressureInfo * ipap_info;
|
||||
void updateTimes(PressureInfo & info);
|
||||
void updateEvents(Session*sess,PressureInfo & info);
|
||||
void updateTimesValues(qint64 d1,qint64 d2, int key,PressureInfo & info);
|
||||
void updateEventsChannel(Session * sess,ChannelID id, QVector<int> &background, PressureInfo & info );
|
||||
void updateFlagData(int ¤tLoc, int & currentEL,int& currentData,qint64 eventTime, QVector<int> &dataArray, PressureInfo & info ) ;
|
||||
void updateSpanData(int ¤tLoc, int & currentEL,int& currentData,qint64 startSpan, qint64 eventTime , QVector<int> &dataArray, PressureInfo & info ) ;
|
||||
|
||||
};
|
||||
|
||||
|
||||
|
||||
class MinutesAtPressure:public Layer
|
||||
{
|
||||
friend class RecalcMAP;
|
||||
@ -96,6 +121,10 @@ public:
|
||||
return map;
|
||||
}
|
||||
|
||||
|
||||
protected:
|
||||
|
||||
int numCloned =0;
|
||||
void CloneInto(MinutesAtPressure * layer) {
|
||||
mutex.lock();
|
||||
timelock.lock();
|
||||
@ -103,47 +132,142 @@ public:
|
||||
layer->m_minimum_height = m_minimum_height;
|
||||
layer->m_lastminx = m_lastminx;
|
||||
layer->m_lastmaxx = m_lastmaxx;
|
||||
layer->times = times;
|
||||
layer->chans = chans;
|
||||
layer->events = events;
|
||||
layer->maxtime = maxtime;
|
||||
layer->maxevents = maxevents;
|
||||
layer->m_presChannel = m_presChannel;
|
||||
layer->m_minpressure = m_minpressure;
|
||||
layer->m_maxpressure = m_maxpressure;
|
||||
layer->max_mins = max_mins;
|
||||
|
||||
layer->ahis = ahis;
|
||||
layer->ipap = ipap;
|
||||
layer->epap = epap;
|
||||
layer->numCloned=numCloned+1;
|
||||
|
||||
timelock.unlock();
|
||||
layer->m_enabled = m_enabled;
|
||||
mutex.unlock();
|
||||
}
|
||||
protected:
|
||||
QMutex timelock;
|
||||
QMutex mutex;
|
||||
|
||||
bool m_empty;
|
||||
int m_minimum_height;
|
||||
|
||||
qint64 m_lastminx;
|
||||
qint64 m_lastmaxx;
|
||||
gGraph * m_graph;
|
||||
bool isCLoned() {return numCloned!=0;};
|
||||
RecalcMAP * m_remap;
|
||||
QMap<EventStoreType, int> times;
|
||||
QMap<EventStoreType, int> epap_times;
|
||||
QList<ChannelID> chans;
|
||||
QHash<ChannelID, QMap<EventStoreType, EventDataType> > events;
|
||||
int maxtime;
|
||||
int maxevents;
|
||||
ChannelID m_presChannel;
|
||||
EventStoreType m_minpressure;
|
||||
EventStoreType m_maxpressure;
|
||||
bool initialized=false;
|
||||
bool m_empty;
|
||||
QMutex mutex;
|
||||
QMutex timelock;
|
||||
int m_minimum_height;
|
||||
//QAtomicInteger<int> m_recalcCount;
|
||||
|
||||
private:
|
||||
|
||||
PressureInfo epap, ipap;
|
||||
void setEnabled(gGraph &graph);
|
||||
QHash<ChannelID, bool > m_enabled;
|
||||
gGraph * m_graph;
|
||||
qint64 m_lastminx;
|
||||
qint64 m_lastmaxx;
|
||||
QPoint last_mouse=QPoint(0,0);
|
||||
|
||||
EventDataType m_last_height=0; // re-calculate only when needed.
|
||||
int m_last_peaktime=0; // re-calculate only when needed.
|
||||
|
||||
bool isEnabled(ChannelID id) ;
|
||||
QString topBarLabel;
|
||||
|
||||
};
|
||||
|
||||
|
||||
class MapPainter
|
||||
{
|
||||
public:
|
||||
// environment - set in constructor
|
||||
QPainter& painter;
|
||||
gGraph& graph;
|
||||
QRectF& drawingRect;
|
||||
QRectF& boundingRect;
|
||||
EventDataType lineThickness;
|
||||
|
||||
MapPainter(
|
||||
QPainter& painter,
|
||||
gGraph& graph,
|
||||
QRectF& drawingRect ,
|
||||
QRectF& boundingRect ) :
|
||||
painter(painter),
|
||||
graph(graph),
|
||||
drawingRect(drawingRect) ,
|
||||
boundingRect(boundingRect) {
|
||||
lineThickness= AppSetting->lineThickness();
|
||||
};
|
||||
|
||||
// mouse related
|
||||
int mouseOverKey;
|
||||
bool graphSelected;
|
||||
void setMouse(int mouseOverKey,bool graphSelected) {
|
||||
this->mouseOverKey=mouseOverKey;
|
||||
this->graphSelected=graphSelected;
|
||||
};
|
||||
|
||||
// for all graphs horizonatal
|
||||
int startGraphBucket;
|
||||
int endGraphBucket;
|
||||
EventDataType pixelsPerBucket;
|
||||
EventDataType minpressure;
|
||||
int bucketsPerPressure;
|
||||
void setHorizontal( EventDataType minpressure, EventDataType maxpressure,EventDataType pixelsPerBucket , int bucketsPerPressure, int catmullRomSplineNumberOfPoints) {
|
||||
this->startGraphBucket = minpressure*bucketsPerPressure;
|
||||
this->endGraphBucket = maxpressure*bucketsPerPressure;
|
||||
this->pixelsPerBucket = pixelsPerBucket;
|
||||
this->minpressure = minpressure;
|
||||
this->bucketsPerPressure = bucketsPerPressure;
|
||||
initCatmullRomSpline(pixelsPerBucket,catmullRomSplineNumberOfPoints);
|
||||
};
|
||||
|
||||
void drawEvent();
|
||||
void drawSpanEvents();
|
||||
void drawEventTick();
|
||||
|
||||
|
||||
// Pen type for drawing - per graph
|
||||
QPen linePen;
|
||||
QPen pointSelectionPen;
|
||||
QPen pointEnhancePen;
|
||||
QPen tickPen;
|
||||
QPen tickEnhancePen;
|
||||
QPen tickEnhanceTransparentPen;
|
||||
|
||||
//EventDataType bottom,top,height,left,right;
|
||||
|
||||
schema::Channel* channel;
|
||||
schema::ChanType chanType;
|
||||
EventDataType yPixelsPerUnit;
|
||||
QVector<int> dataArray;
|
||||
int startBucket;
|
||||
int endBucket;
|
||||
void setChannelInfo(ChannelID id, QVector<int> dataArray, EventDataType yPixelsPerUnit ,int ,int) ;
|
||||
|
||||
void initCatmullRomSpline(EventDataType pixelsPerBucket,int numberOfPoints);
|
||||
EventDataType catmullRomSplineIncrement, catmullRomSplineInterval;
|
||||
int catmullRomSplineNumberOfPoints;
|
||||
EventDataType catmullRomSplineXstep; // based on pixelsPerBucket.
|
||||
|
||||
void setPenColorAlpha(ChannelID channelId ,int opacity) ;
|
||||
void setPenColorAlpha(ChannelID channelId ) ;
|
||||
void drawPlot();
|
||||
EventDataType dataToYaxis(int value) ;
|
||||
EventDataType verifyYaxis(EventDataType value);
|
||||
void initCatmullRomSpline(int numberOfPoints);
|
||||
void drawPoint(bool fill,int xp, int yp);
|
||||
EventDataType drawSegment ( int i , EventDataType fromx,EventDataType fromy) ;
|
||||
|
||||
EventDataType yPixelsPerMsec ;
|
||||
EventDataType yPixelsPerEvent;
|
||||
EventDataType pixelsPerPressure;
|
||||
|
||||
EventDataType yPixelsPerStep ;
|
||||
EventDataType yMinutesPerStep;
|
||||
EventDataType peakMinutes;
|
||||
|
||||
int singleCharWidth, textHeight;
|
||||
void calculatePeakY(int peaktime );
|
||||
int drawYaxis(int peaktime);
|
||||
|
||||
void drawEventYaxis(EventDataType peakEvents,int widest_YAxis);
|
||||
void drawXaxis(int numberXaxisDivisions , int startGraphBucket , int endGraphBucket);
|
||||
|
||||
void drawMetaData(QPoint& last_mouse , QString& topBarLabel,PressureInfo& ipap , PressureInfo& epap ,QHash<ChannelID, bool >& enabled , EventDataType minpressure , EventDataType maxpressure);
|
||||
|
||||
EventDataType max_mins;
|
||||
|
||||
QMap<EventStoreType, EventDataType> ahis;
|
||||
};
|
||||
|
||||
#endif // MINUTESATPRESSURE_H
|
||||
|
||||
Loading…
Reference in New Issue
Block a user