chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-05 10:40:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Mouse control improvements

Browse Source
This commit is contained in:
Mark Watkins 2011-05-29 15:58:00 +10:00
parent f5352333db
commit 563b3a793e
8 changed files with 105 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
SleepyHead.depend
View File

@ -7835,7 +7835,7 @@
"sleeplib/machine.h"
"graphs/graph.h"
1306601639 /home/mark/projects/git/sleepyhead/libs/sleeplib/machine.h
1306645236 /home/mark/projects/git/sleepyhead/libs/sleeplib/machine.h
<wx/string.h>
<wx/variant.h>
<wx/dir.h>
@ -7869,11 +7869,11 @@
<map>
"tinyxml/tinyxml.h"
1306574943 /home/mark/projects/git/sleepyhead/graphs/graph.h
1306647783 /home/mark/projects/git/sleepyhead/graphs/graph.h
<sleeplib/machine.h>
<list>
1306639384 /home/mark/projects/git/sleepyhead/version.h
1306648365 /home/mark/projects/git/sleepyhead/version.h
1306549105 /home/mark/projects/git/sleepyhead/libs/sleeplib/prs1_loader.h
"machine.h"
@ -7890,7 +7890,7 @@
"preferences.h"
"tinyxml/tinyxml.h"
1306638297 source:/home/mark/projects/git/sleepyhead/SleepyHeadMain.cpp
1306647571 source:/home/mark/projects/git/sleepyhead/SleepyHeadMain.cpp
"wx_pch.h"
"version.h"
<wx/app.h>
@ -7905,7 +7905,7 @@
"SleepyHeadMain.h"
"sleeplib/profiles.h"
1306639142 source:/home/mark/projects/git/sleepyhead/graphs/graph.cpp
1306647888 source:/home/mark/projects/git/sleepyhead/graphs/graph.cpp
<wx/settings.h>
<wx/dcbuffer.h>
<wx/log.h>
@ -7919,7 +7919,7 @@
<wx/ffile.h>
<wx/utils.h>
1306614082 source:/home/mark/projects/git/sleepyhead/libs/sleeplib/machine.cpp
1306647390 source:/home/mark/projects/git/sleepyhead/libs/sleeplib/machine.cpp
<tr1/random>
<wx/colour.h>
<wx/log.h>
@ -7951,7 +7951,7 @@
"machine_loader.h"
"tinyxml/tinyxml.h"
1306607755 source:/home/mark/projects/git/sleepyhead/libs/sleeplib/prs1_loader.cpp
1306645407 source:/home/mark/projects/git/sleepyhead/libs/sleeplib/prs1_loader.cpp
<wx/dir.h>
<wx/filename.h>
<wx/ffile.h>
@ -7991,3 +7991,15 @@
1302101441 /usr/include/wx-2.8/wx/generic/datectrl.h
1305166122 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.8/wx/datectrl.h
"wx/defs.h"
"wx/control.h"
"wx/datetime.h"
"wx/palmos/datectrl.h"
"wx/msw/datectrl.h"
"wx/generic/datectrl.h"
1305166122 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.8/wx/msw/datectrl.h
1305166122 /opt/mingw/usr/i686-pc-mingw32/include/wx-2.8/wx/generic/datectrl.h

42
SleepyHeadMain.cpp
View File

@ -458,8 +458,8 @@ Daily::Daily(wxWindow *win)
AddData(flags[8]=new FlagData(PRS1_VSnore2,1));
AddData(flags[9]=new FlagData(PRS1_Unknown0E,1));
FRW->AddLayer(new gLineOverlayBar(flags[0],wxGREEN2,wxT("CSR")));
FRW->AddLayer(new gLineChart(frw,wxBLACK,200000,true));
/* FRW->AddLayer(new gLineOverlayBar(flags[0],wxGREEN2,wxT("CSR")));
FRW->AddLayer(new gLineOverlayBar(flags[7],wxRED,wxT("PR"),LOT_Dot));
FRW->AddLayer(new gLineOverlayBar(flags[6],wxYELLOW,wxT("RE")));
FRW->AddLayer(new gLineOverlayBar(flags[9],wxDARK_GREEN,wxT("U0E")));
@ -467,12 +467,12 @@ Daily::Daily(wxWindow *win)
FRW->AddLayer(new gLineOverlayBar(flags[4],wxBLACK,wxT("FL")));
FRW->AddLayer(new gLineOverlayBar(flags[3],wxBLUE,wxT("H")));
FRW->AddLayer(new gLineOverlayBar(flags[2],wxAQUA,wxT("OA")));
FRW->AddLayer(new gLineOverlayBar(flags[1],wxPURPLE,wxT("CA"))); */
FRW->AddLayer(new gLineOverlayBar(flags[1],wxPURPLE,wxT("CA")));
SF=new gGraphWindow(ScrolledWindow,-1,wxT("Sleep Flags"),wxPoint(0,0), wxSize(600,150), wxNO_BORDER);
SF->SetMargins(10,15,20,80);
// SF->LinkZoom(FRW);
SF->LinkZoom(FRW);
#if defined(__UNIX__)
// SF->LinkZoom(PRD); // Uncomment to link in more graphs.. Too slow on windows.
// SF->LinkZoom(LEAK);
@ -566,8 +566,9 @@ void Daily::OnCalendarDay( wxCalendarEvent& event )
html=html+wxT("<tr><td>&nbsp;</td><td>&nbsp;</td></tr>\n");
html=html+wxT("<tr><td colspan=2 align=center><i>")+_("Sleep Times")+wxT("</i></td></tr>\n");
html=html+wxT("<tr><td><b>")+_("Date")+wxT("</b></td><td>")+machine->day[day]->first().Format(wxT("%x"))+wxT("</td></tr>\n");
html=html+wxT("<tr><td><b>")+_("Sleep")+wxT("</b></td><td>")+machine->day[day]->first().Format(wxT("%I:%M%p"))+wxT("</td></tr>\n");
html=html+wxT("<tr><td><b>")+_("Wake")+wxT("</b></td><td>")+machine->day[day]->last().Format(wxT("%I:%M%p"))+wxT("</td></tr>\n");
html=html+wxT("<tr><td><b>")+_("Sleep")+wxT("</b></td><td>")+machine->day[day]->first().Format(wxT("%H:%M"))+wxT("</td></tr>\n");
html=html+wxT("<tr><td><b>")+_("Wake")+wxT("</b></td><td>")+machine->day[day]->last().Format(wxT("%H:%M"))+wxT("</td></tr>\n");
html=html+wxT("<tr><td><b>")+_("Total Time")+wxT("</b></td><td><i>")+machine->day[day]->total_time().Format(wxT("%H:%M&nbsp;hours"))+wxT("</i></td></tr>\n");
html=html+wxT("<tr><td>&nbsp;</td><td>&nbsp;</td></tr>\n");
html=html+wxT("<tr><td colspan=2 align=center><i>")+_("Indices")+wxT("</i></td></tr>\n");
html=html+wxT("<tr><td><b>")+_("AHI")+wxT("</b></td><td>")+wxString::Format(wxT("%0.2f"),ahi)+wxT("</td></tr>\n");
@ -586,24 +587,39 @@ void Daily::OnCalendarDay( wxCalendarEvent& event )
// html=html+wxT("<tr><td colspan=2 align=center><i>Session Informaton</i></td></tr>\n");
html=html+wxT("<tr><td><b>")+_("Mode")+wxT("</b></td><td>")+modestr+wxT("</td></tr>\n");
html=html+wxT("<tr><td><b>")+_("Relief")+wxT("</b></td><td>")+epr+wxT("</td></tr>\n");
html=html+wxT("<tr><td><b>")+_("Avg Leak")+wxT("</b></td><td>")+wxString::Format(wxT("%.2f"),d->summary_avg(CPAP_LeakAverage))+wxT("</td></tr>\n");
if (mode==MODE_CPAP) {
html=html+wxT("<tr><td><b>")+_("Pressure")+wxT("</b></td><td>")+wxString::Format(wxT("%.1fcmH2O"),d->summary_min(CPAP_PressureMin))+wxT("</td></tr>\n");
} else if (mode==MODE_APAP) {
html=html+wxT("<tr><td><b>")+_("Avg Pressure")+wxT("</b></td><td>")+wxString::Format(wxT("%.2fcmH2O"),d->summary_avg(CPAP_PressureAverage))+wxT("</td></tr>\n");
html=html+wxT("<tr><td><b>")+_("90% Pressure")+wxT("</b></td><td>")+wxString::Format(wxT("%.2fcmH2O"),d->summary_avg(CPAP_PressurePercentValue))+wxT("</td></tr>\n");
html=html+wxT("<tr><td><b>")+_("Pressure-Min")+wxT("</b></td><td>")+wxString::Format(wxT("%.1fcmH2O"),d->summary_min(CPAP_PressureMin))+wxT("</td></tr>\n");
html=html+wxT("<tr><td><b>")+_("Pressure-Max")+wxT("</b></td><td>")+wxString::Format(wxT("%.1fcmH2O"),d->summary_max(CPAP_PressureMax))+wxT("</td></tr>\n");
html=html+wxT("<tr><td><b>")+_("Pressure-Min2")+wxT("</b></td><td>")+wxString::Format(wxT("%.1fcmH2O"),d->summary_min(CPAP_PressureMinAchieved))+wxT("</td></tr>\n");
html=html+wxT("<tr><td><b>")+_("Pressure-Max2")+wxT("</b></td><td>")+wxString::Format(wxT("%.1fcmH2O"),d->summary_max(CPAP_PressureMaxAchieved))+wxT("</td></tr>\n");
html=html+wxT("<tr><td><b>")+_("Avg&nbsp;Pressure")+wxT("</b></td><td>")+wxString::Format(wxT("%.2fcmH2O"),d->summary_avg(CPAP_PressureAverage))+wxT("</td></tr>\n");
html=html+wxT("<tr><td><b>")+_("Min&nbsp;Reached")+wxT("</b></td><td>")+wxString::Format(wxT("%.1fcmH2O"),d->summary_min(CPAP_PressureMinAchieved))+wxT("</td></tr>\n");
html=html+wxT("<tr><td><b>")+_("Max&nbsp;Reached")+wxT("</b></td><td>")+wxString::Format(wxT("%.1fcmH2O"),d->summary_max(CPAP_PressureMaxAchieved))+wxT("</td></tr>\n");
html=html+wxT("<tr><td><b>")+_("90%&nbsp;Pressure?")+wxT("</b></td><td>")+wxString::Format(wxT("%.1fcmH2O"),d->summary_avg(CPAP_PressurePercentValue))+wxT("</td></tr>\n");
} else if (mode==MODE_BIPAP) {
html=html+wxT("<tr><td><b>")+_("Avg IAP")+wxT("</b></td><td>")+wxString::Format(wxT("%.2fcmH2O"),d->summary_avg(BIPAP_IAPAverage))+wxT("</td></tr>\n");
html=html+wxT("<tr><td><b>")+_("Avg EAP")+wxT("</b></td><td>")+wxString::Format(wxT("%.1fcmH2O"),d->summary_avg(BIPAP_EAPAverage))+wxT("</td></tr>\n");
html=html+wxT("<tr><td><b>")+_("Min IAP")+wxT("</b></td><td>")+wxString::Format(wxT("%.2fcmH2O"),d->summary_min(BIPAP_IAPMin))+wxT("</td></tr>\n");
html=html+wxT("<tr><td><b>")+_("Max IAP")+wxT("</b></td><td>")+wxString::Format(wxT("%.1fcmH2O"),d->summary_max(BIPAP_IAPMax))+wxT("</td></tr>\n");
html=html+wxT("<tr><td><b>")+_("Min EAP")+wxT("</b></td><td>")+wxString::Format(wxT("%.1fcmH2O"),d->summary_min(BIPAP_EAPMin))+wxT("</td></tr>\n");
html=html+wxT("<tr><td><b>")+_("Max EAP")+wxT("</b></td><td>")+wxString::Format(wxT("%.1fcmH2O"),d->summary_max(BIPAP_EAPMax))+wxT("</td></tr>\n");
}
html=html+wxT("<tr><td><b>")+_("Avg Leak")+wxT("</b></td><td>")+wxString::Format(wxT("%.2f"),d->summary_avg(CPAP_LeakAverage))+wxT("</td></tr>\n");
html=html+wxT("<tr><td>&nbsp;</td><td>&nbsp;</td></tr>\n");
html=html+wxT("<tr><td colspan=2 align=center><i>")+_("System Settings")+wxT("</i></td></tr>\n");
if (mode==MODE_CPAP) {
html=html+wxT("<tr><td><b>")+_("Pressure")+wxT("</b></td><td>")+wxString::Format(wxT("%.1fcmH2O"),d->summary_min(CPAP_PressureMin))+wxT("</td></tr>\n");
} else if (mode==MODE_APAP) {
html=html+wxT("<tr><td><b>")+_("Pressure&nbsp;Min")+wxT("</b></td><td>")+wxString::Format(wxT("%.1fcmH2O"),d->summary_min(CPAP_PressureMin))+wxT("</td></tr>\n");
html=html+wxT("<tr><td><b>")+_("Pressure&nbsp;Max")+wxT("</b></td><td>")+wxString::Format(wxT("%.1fcmH2O"),d->summary_max(CPAP_PressureMax))+wxT("</td></tr>\n");
} else if (mode==MODE_BIPAP) {
html=html+wxT("<tr><td><b>")+_("Pressure&nbsp;IAP")+wxT("</b></td><td>")+wxString::Format(wxT("%.1fcmH2O"),d->summary_min(CPAP_PressureMin))+wxT("</td></tr>\n");
html=html+wxT("<tr><td><b>")+_("Pressure&nbsp;EAP")+wxT("</b></td><td>")+wxString::Format(wxT("%.1fcmH2O"),d->summary_max(CPAP_PressureMax))+wxT("</td></tr>\n");
}
html=html+wxT("<tr><td><b>")+_("Ramp-Time")+wxT("</b></td><td>")+wxString::Format(wxT("%imin"),(int)d->summary_max(CPAP_RampTime))+wxT("</td></tr>\n");
html=html+wxT("<tr><td><b>")+_("Ramp-Prs.")+wxT("</b></td><td>")+wxString::Format(wxT("%.1fcmH2O"),d->summary_min(CPAP_RampStartingPressure))+wxT("</td></tr>\n");
// check HumidiferStatus..
wxString str;
if (bool(d->summary_max(CPAP_HumidifierStatus))) {

32
graphs/graph.cpp
View File

@ -139,6 +139,15 @@ void gGraphWindow::SetXBounds(double minx, double maxx)
SetMaxX(maxx);
Refresh(false);
}
void gGraphWindow::ResetXBounds()
{
//min_x=minx;
//max_x=maxx;
SetMinX(RealMinX());
SetMaxX(RealMaxX());
Refresh(false);
}
void gGraphWindow::ZoomXPixels(int x1, int x2)
{
double rx1=0,rx2=0;
@ -272,13 +281,14 @@ void gGraphWindow::OnMouseRightDown(wxMouseEvent &event)
//voiid ZoomX
void gGraphWindow::OnMouseRightRelease(wxMouseEvent &event)
{
double zoom_fact=2;
if (event.ControlDown()) zoom_fact=5.0;
if (abs(event.GetX()-m_mouseRClick_start.x)<3 && abs(event.GetY()-m_mouseRClick_start.y)<3) {
for (auto g=link_zoom.begin();g!=link_zoom.end();g++) {
(*g)->ZoomX(2,0);
(*g)->ZoomX(zoom_fact,0);
}
if (m_block_zoom) {
} else {
ZoomX(2,0); //event.GetX()); // adds origin to zoom out.. Doesn't look that cool.
if (!m_block_zoom) {
ZoomX(zoom_fact,0); //event.GetX()); // adds origin to zoom out.. Doesn't look that cool.
}
}
m_mouseRDown=false;
@ -305,9 +315,19 @@ void gGraphWindow::OnMouseLeftRelease(wxMouseEvent &event)
int t2=MAX(x1,x2);
wxRect r;
if (t1 != t2) {
if ((t2-t1)>3) {
ZoomXPixels(t1,t2);
} else {
double zoom_fact=0.5;
if (event.ControlDown()) zoom_fact=0.25;
for (auto g=link_zoom.begin();g!=link_zoom.end();g++) {
(*g)->ZoomX(zoom_fact,event.GetX());
}
if (!m_block_zoom) {
ZoomX(zoom_fact,event.GetX()); //event.GetX()); // adds origin to zoom out.. Doesn't look that cool.
}
}
r=wxRect(0, 0, 0, 0);
@ -1712,7 +1732,7 @@ void PressureData::Reload(Day *day)
}
} else { */
min_y=floor(min_y);
max_y=ceil(max_y);
max_y=ceil(max_y+1);
//}
real_min_x=min_x;

1
graphs/graph.h
View File

@ -159,6 +159,7 @@ class gGraphWindow:public wxWindow // rename to gGraphWindow
virtual void SetMinY(double v);
virtual void SetMaxY(double v);
virtual void ResetXBounds();
virtual void SetXBounds(double minx, double maxx);
virtual void ZoomX(double mult,int origin_px);
virtual void ZoomXPixels(int x1, int x2); // Zoom between two selected points on screen

11
libs/sleeplib/machine.cpp
View File

@ -61,7 +61,7 @@ map<CPAPMode,wxString> CPAPModeNames={
map<PRTypes,wxString> PressureReliefNames={
{PR_NONE,_("None")},
{PR_CFLEX,wxT("C-Flex")},
{PR_CFLEXPLUS,wxT("C-Flex Plus")},
{PR_CFLEXPLUS,wxT("C-Flex+")},
{PR_AFLEX,wxT("A-Flex")},
{PR_EPR,wxT("Exhalation Pressure Relief (EPR)")},
{PR_SMARTFLEX,wxT("SmartFlex")}
@ -444,12 +444,15 @@ EventDataType Day::weighted_avg(MachineCode code,int field)
}
wxTimeSpan Day::total_time()
{
if (d_totaltime>wxTimeSpan::Seconds(0)) return d_totaltime;
//if (d_totaltime>wxTimeSpan::Seconds(0)) return d_totaltime;
d_totaltime=wxTimeSpan::Seconds(0);
for (auto s=sessions.begin();s!=sessions.end();s++) {
Session & sess=*(*s);
d_totaltime+=sess.last()-sess.first();
if (d_totaltime>wxTimeSpan::Hours(15)) {
int c=1;
}
}
return d_totaltime;
}
@ -470,7 +473,7 @@ const wxDateTime & Day::first(MachineCode code)
date=tmp;
fir=false;
} else {
if (date>tmp) date=tmp;
if (tmp<date) date=tmp;
}
}
}
@ -496,7 +499,7 @@ const wxDateTime & Day::last(MachineCode code)
date=tmp;
fir=false;
} else {
if (date<tmp) date=tmp;
if (tmp>date) date=tmp;
}
}
}

2
libs/sleeplib/machine.h
View File

@ -46,6 +46,8 @@ wxInt16 {
CPAP_PressureMaxAchieved, CPAP_PressurePercentValue, CPAP_PressurePercentName, CPAP_PressureAverage, CPAP_PressureMedian,
CPAP_LeakMedian,CPAP_LeakMinimum,CPAP_LeakMaximum,CPAP_LeakAverage,CPAP_Duration,
BIPAP_EAPAverage,BIPAP_IAPAverage,BIPAP_EAPMin,BIPAP_EAPMax,BIPAP_IAPMin,BIPAP_IAPMax,
// PRS1 Specific Codes
PRS1_PressurePulse=0x1000, PRS1_VSnore2,
PRS1_Unknown00, PRS1_Unknown01, PRS1_Unknown08, PRS1_Unknown09, PRS1_Unknown0B, PRS1_Unknown0E, PRS1_Unknown10, PRS1_Unknown12,

17
libs/sleeplib/prs1_loader.cpp
View File

@ -294,10 +294,19 @@ int PRS1Loader::OpenMachine(Machine *m,wxString path)
if (sess->count_events(CPAP_IAP)>0) {
sess->summary[CPAP_Mode]=(long)MODE_BIPAP;
sess->summary[CPAP_PressureMedian]=(sess->avg_event_field(CPAP_EAP,0)+sess->avg_event_field(CPAP_IAP,0))/2.0;
sess->summary[CPAP_PressureAverage]=(sess->weighted_avg_event_field(CPAP_IAP,0)+sess->weighted_avg_event_field(CPAP_EAP,0))/2.0;
sess->summary[CPAP_PressureMinAchieved]=sess->min_event_field(CPAP_IAP,0);
sess->summary[CPAP_PressureMaxAchieved]=sess->max_event_field(CPAP_EAP,0);
sess->summary[BIPAP_IAPAverage]=sess->weighted_avg_event_field(CPAP_IAP,0);
sess->summary[BIPAP_IAPMin]=sess->min_event_field(CPAP_IAP,0);
sess->summary[BIPAP_IAPMax]=sess->max_event_field(CPAP_IAP,0);
sess->summary[BIPAP_EAPAverage]=sess->weighted_avg_event_field(CPAP_EAP,0);
sess->summary[BIPAP_EAPMin]=sess->min_event_field(CPAP_EAP,0);
sess->summary[BIPAP_EAPMax]=sess->max_event_field(CPAP_EAP,0);
} else {
sess->summary[CPAP_PressureMedian]=sess->avg_event_field(CPAP_Pressure,0);
sess->summary[CPAP_PressureAverage]=sess->weighted_avg_event_field(CPAP_Pressure,0);
@ -346,6 +355,8 @@ bool PRS1Loader::OpenSummary(Session *session,wxString filename)
if (ext!=1)
return false;
if (size<0x30)
return false;
//size|=(header[3]<<16) | (header[4]<<24); // the jury is still out on the 32bitness of one. doesn't matter here anyway.
size-=(hl+2);
@ -399,9 +410,11 @@ bool PRS1Loader::OpenSummary(Session *session,wxString filename)
session->summary[PRS1_MaskAlert]=(buffer[0x0c]&0x08)==0x08;
session->summary[PRS1_ShowAHI]=(buffer[0x0c]&0x04)==0x04;
int duration=buffer[0x14] | (buffer[0x15] << 8);
unsigned char * b=&buffer[0x14];
wxUint16 bb=*(wxUint16*)b;
int duration=bb;// | (buffer[0x15] << 8);
session->summary[CPAP_Duration]=(long)duration;
wxLogMessage(wxString::Format(wxT("%i"),duration));
wxLogMessage(wxString::Format(wxT("ID: %i %i"),session->session(),duration));
float hours=float(duration)/3600.0;
session->set_hours(hours);

12
version.h
View File

@ -16,14 +16,14 @@ namespace AutoVersion{
//Standard Version Type
static const long MAJOR = 0;
static const long MINOR = 7;
static const long BUILD = 1721;
static const long REVISION = 3923;
static const long BUILD = 1771;
static const long REVISION = 4228;
//Miscellaneous Version Types
static const long BUILDS_COUNT = 5906;
#define RC_FILEVERSION 0,7,1721,3923
#define RC_FILEVERSION_STRING "0, 7, 1721, 3923\0"
static const char FULLVERSION_STRING[] = "0.7.1721.3923";
static const long BUILDS_COUNT = 6012;
#define RC_FILEVERSION 0,7,1771,4228
#define RC_FILEVERSION_STRING "0, 7, 1771, 4228\0"
static const char FULLVERSION_STRING[] = "0.7.1771.4228";
//These values are to keep track of your versioning state, don't modify them.
static const long BUILD_HISTORY = 62;