diff --git a/SleepyHead.depend b/SleepyHead.depend index 9d0b01a7..67cc856c 100644 --- a/SleepyHead.depend +++ b/SleepyHead.depend @@ -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 @@ -7869,11 +7869,11 @@ "tinyxml/tinyxml.h" -1306574943 /home/mark/projects/git/sleepyhead/graphs/graph.h +1306647783 /home/mark/projects/git/sleepyhead/graphs/graph.h -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" @@ -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 @@ -7919,7 +7919,7 @@ -1306614082 source:/home/mark/projects/git/sleepyhead/libs/sleeplib/machine.cpp +1306647390 source:/home/mark/projects/git/sleepyhead/libs/sleeplib/machine.cpp @@ -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 @@ -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 + diff --git a/SleepyHeadMain.cpp b/SleepyHeadMain.cpp index 1e279d41..92f9c40c 100644 --- a/SleepyHeadMain.cpp +++ b/SleepyHeadMain.cpp @@ -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("  \n"); html=html+wxT("")+_("Sleep Times")+wxT("\n"); html=html+wxT("")+_("Date")+wxT("")+machine->day[day]->first().Format(wxT("%x"))+wxT("\n"); - html=html+wxT("")+_("Sleep")+wxT("")+machine->day[day]->first().Format(wxT("%I:%M%p"))+wxT("\n"); - html=html+wxT("")+_("Wake")+wxT("")+machine->day[day]->last().Format(wxT("%I:%M%p"))+wxT("\n"); + html=html+wxT("")+_("Sleep")+wxT("")+machine->day[day]->first().Format(wxT("%H:%M"))+wxT("\n"); + html=html+wxT("")+_("Wake")+wxT("")+machine->day[day]->last().Format(wxT("%H:%M"))+wxT("\n"); + html=html+wxT("")+_("Total Time")+wxT("")+machine->day[day]->total_time().Format(wxT("%H:%M hours"))+wxT("\n"); html=html+wxT("  \n"); html=html+wxT("")+_("Indices")+wxT("\n"); html=html+wxT("")+_("AHI")+wxT("")+wxString::Format(wxT("%0.2f"),ahi)+wxT("\n"); @@ -586,24 +587,39 @@ void Daily::OnCalendarDay( wxCalendarEvent& event ) // html=html+wxT("Session Informaton\n"); html=html+wxT("")+_("Mode")+wxT("")+modestr+wxT("\n"); html=html+wxT("")+_("Relief")+wxT("")+epr+wxT("\n"); - html=html+wxT("")+_("Avg Leak")+wxT("")+wxString::Format(wxT("%.2f"),d->summary_avg(CPAP_LeakAverage))+wxT("\n"); if (mode==MODE_CPAP) { html=html+wxT("")+_("Pressure")+wxT("")+wxString::Format(wxT("%.1fcmH2O"),d->summary_min(CPAP_PressureMin))+wxT("\n"); } else if (mode==MODE_APAP) { - html=html+wxT("")+_("Avg Pressure")+wxT("")+wxString::Format(wxT("%.2fcmH2O"),d->summary_avg(CPAP_PressureAverage))+wxT("\n"); - html=html+wxT("")+_("90% Pressure")+wxT("")+wxString::Format(wxT("%.2fcmH2O"),d->summary_avg(CPAP_PressurePercentValue))+wxT("\n"); - html=html+wxT("")+_("Pressure-Min")+wxT("")+wxString::Format(wxT("%.1fcmH2O"),d->summary_min(CPAP_PressureMin))+wxT("\n"); - html=html+wxT("")+_("Pressure-Max")+wxT("")+wxString::Format(wxT("%.1fcmH2O"),d->summary_max(CPAP_PressureMax))+wxT("\n"); - html=html+wxT("")+_("Pressure-Min2")+wxT("")+wxString::Format(wxT("%.1fcmH2O"),d->summary_min(CPAP_PressureMinAchieved))+wxT("\n"); - html=html+wxT("")+_("Pressure-Max2")+wxT("")+wxString::Format(wxT("%.1fcmH2O"),d->summary_max(CPAP_PressureMaxAchieved))+wxT("\n"); + html=html+wxT("")+_("Avg Pressure")+wxT("")+wxString::Format(wxT("%.2fcmH2O"),d->summary_avg(CPAP_PressureAverage))+wxT("\n"); + html=html+wxT("")+_("Min Reached")+wxT("")+wxString::Format(wxT("%.1fcmH2O"),d->summary_min(CPAP_PressureMinAchieved))+wxT("\n"); + html=html+wxT("")+_("Max Reached")+wxT("")+wxString::Format(wxT("%.1fcmH2O"),d->summary_max(CPAP_PressureMaxAchieved))+wxT("\n"); + html=html+wxT("")+_("90% Pressure?")+wxT("")+wxString::Format(wxT("%.1fcmH2O"),d->summary_avg(CPAP_PressurePercentValue))+wxT("\n"); + } else if (mode==MODE_BIPAP) { + html=html+wxT("")+_("Avg IAP")+wxT("")+wxString::Format(wxT("%.2fcmH2O"),d->summary_avg(BIPAP_IAPAverage))+wxT("\n"); + html=html+wxT("")+_("Avg EAP")+wxT("")+wxString::Format(wxT("%.1fcmH2O"),d->summary_avg(BIPAP_EAPAverage))+wxT("\n"); + html=html+wxT("")+_("Min IAP")+wxT("")+wxString::Format(wxT("%.2fcmH2O"),d->summary_min(BIPAP_IAPMin))+wxT("\n"); + html=html+wxT("")+_("Max IAP")+wxT("")+wxString::Format(wxT("%.1fcmH2O"),d->summary_max(BIPAP_IAPMax))+wxT("\n"); + html=html+wxT("")+_("Min EAP")+wxT("")+wxString::Format(wxT("%.1fcmH2O"),d->summary_min(BIPAP_EAPMin))+wxT("\n"); + html=html+wxT("")+_("Max EAP")+wxT("")+wxString::Format(wxT("%.1fcmH2O"),d->summary_max(BIPAP_EAPMax))+wxT("\n"); + } + html=html+wxT("")+_("Avg Leak")+wxT("")+wxString::Format(wxT("%.2f"),d->summary_avg(CPAP_LeakAverage))+wxT("\n"); html=html+wxT("  \n"); html=html+wxT("")+_("System Settings")+wxT("\n"); - + if (mode==MODE_CPAP) { + html=html+wxT("")+_("Pressure")+wxT("")+wxString::Format(wxT("%.1fcmH2O"),d->summary_min(CPAP_PressureMin))+wxT("\n"); + } else if (mode==MODE_APAP) { + html=html+wxT("")+_("Pressure Min")+wxT("")+wxString::Format(wxT("%.1fcmH2O"),d->summary_min(CPAP_PressureMin))+wxT("\n"); + html=html+wxT("")+_("Pressure Max")+wxT("")+wxString::Format(wxT("%.1fcmH2O"),d->summary_max(CPAP_PressureMax))+wxT("\n"); + } else if (mode==MODE_BIPAP) { + html=html+wxT("")+_("Pressure IAP")+wxT("")+wxString::Format(wxT("%.1fcmH2O"),d->summary_min(CPAP_PressureMin))+wxT("\n"); + html=html+wxT("")+_("Pressure EAP")+wxT("")+wxString::Format(wxT("%.1fcmH2O"),d->summary_max(CPAP_PressureMax))+wxT("\n"); + } html=html+wxT("")+_("Ramp-Time")+wxT("")+wxString::Format(wxT("%imin"),(int)d->summary_max(CPAP_RampTime))+wxT("\n"); html=html+wxT("")+_("Ramp-Prs.")+wxT("")+wxString::Format(wxT("%.1fcmH2O"),d->summary_min(CPAP_RampStartingPressure))+wxT("\n"); + // check HumidiferStatus.. wxString str; if (bool(d->summary_max(CPAP_HumidifierStatus))) { diff --git a/graphs/graph.cpp b/graphs/graph.cpp index 46e2409e..f5a0f5d6 100644 --- a/graphs/graph.cpp +++ b/graphs/graph.cpp @@ -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; diff --git a/graphs/graph.h b/graphs/graph.h index aa31492b..c10d18e5 100644 --- a/graphs/graph.h +++ b/graphs/graph.h @@ -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 diff --git a/libs/sleeplib/machine.cpp b/libs/sleeplib/machine.cpp index 06e508d6..796f94f4 100644 --- a/libs/sleeplib/machine.cpp +++ b/libs/sleeplib/machine.cpp @@ -61,7 +61,7 @@ map CPAPModeNames={ map 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 (tmpdate) date=tmp; } } } diff --git a/libs/sleeplib/machine.h b/libs/sleeplib/machine.h index a019a434..f87edfec 100644 --- a/libs/sleeplib/machine.h +++ b/libs/sleeplib/machine.h @@ -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, diff --git a/libs/sleeplib/prs1_loader.cpp b/libs/sleeplib/prs1_loader.cpp index 02adf17f..9be740e7 100644 --- a/libs/sleeplib/prs1_loader.cpp +++ b/libs/sleeplib/prs1_loader.cpp @@ -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); diff --git a/version.h b/version.h index 4f0ddd69..5a6ad72f 100644 --- a/version.h +++ b/version.h @@ -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;