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

Fixed windows xaxis date issues. Plus now comes with much more memory freeing goodness all around.

Browse Source
This commit is contained in:
Mark Watkins 2011-05-31 12:18:41 +10:00
parent 4956784ee4
commit 5d8675df24
12 changed files with 165 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
GUIFrame.cpp
View File

@ -177,6 +177,7 @@ SummaryPanel::SummaryPanel( wxWindow* parent, wxWindowID id, const wxPoint& pos,
m_mgr.AddPane( ScrolledWindow, wxAuiPaneInfo() .Center() .Caption( wxT("Overview") ).CloseButton( false ).MaximizeButton( false ).MinimizeButton( false ).PinButton( true ).Dock().Resizable().FloatingSize( wxDefaultSize ).DockFixed( false ).MinSize( wxSize( 440,400 ) ) );
fgSizer = new wxFlexGridSizer( 0, 1, 0, 0 );
fgSizer->AddGrowableCol( 0 );
fgSizer->SetFlexibleDirection( wxVERTICAL );
fgSizer->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_ALL );
@ -190,7 +191,7 @@ SummaryPanel::SummaryPanel( wxWindow* parent, wxWindowID id, const wxPoint& pos,
wxBoxSizer* bSizer1;
bSizer1 = new wxBoxSizer( wxHORIZONTAL );
rbAll = new wxRadioButton( m_panel1, wxID_RB, _("Everything"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP );
rbAll = new wxRadioButton( m_panel1, wxID_ANY, _("Everything"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP );
bSizer1->Add( rbAll, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
rbLastWeek = new wxRadioButton( m_panel1, wxID_ANY, _("Last Week"), wxDefaultPosition, wxDefaultSize, 0 );

1
GUIFrame.h
View File

@ -36,7 +36,6 @@
///////////////////////////////////////////////////////////////////////////
#define wxID_QUIT 1000
#define wxID_RB 1001
///////////////////////////////////////////////////////////////////////////////
/// Class GUIFrame

56
SleepyHead.depend
View File

@ -7785,12 +7785,12 @@
"wx/progdlg.h"
"wx/dialog.h"
1306758595 source:/home/mark/projects/git/sleepyhead/GUIFrame.cpp
1306802240 source:/home/mark/projects/git/sleepyhead/GUIFrame.cpp
"wx/wxprec.h"
<wx/wx.h>
"GUIFrame.h"
1306753008 /home/mark/projects/git/sleepyhead/GUIFrame.h
1306797017 /home/mark/projects/git/sleepyhead/GUIFrame.h
<wx/intl.h>
<wx/string.h>
<wx/bitmap.h>
@ -7815,7 +7815,7 @@
<wx/datectrl.h>
<wx/dateevt.h>
1306741958 source:/home/mark/projects/git/sleepyhead/SleepyHeadApp.cpp
1306807901 source:/home/mark/projects/git/sleepyhead/SleepyHeadApp.cpp
"wx_pch.h"
<iostream>
<wx/log.h>
@ -7831,7 +7831,7 @@
1305881106 /home/mark/projects/git/sleepyhead/SleepyHeadApp.h
<wx/app.h>
1306753017 /home/mark/projects/git/sleepyhead/SleepyHeadMain.h
1306806202 /home/mark/projects/git/sleepyhead/SleepyHeadMain.h
"SleepyHeadApp.h"
"GUIFrame.h"
"sleeplib/machine.h"
@ -7871,11 +7871,11 @@
<map>
"tinyxml/tinyxml.h"
1306795897 /home/mark/projects/git/sleepyhead/graphs/graph.h
1306804928 /home/mark/projects/git/sleepyhead/graphs/graph.h
<sleeplib/machine.h>
<list>
1306795962 /home/mark/projects/git/sleepyhead/version.h
1306808014 /home/mark/projects/git/sleepyhead/version.h
1306724655 /home/mark/projects/git/sleepyhead/libs/sleeplib/prs1_loader.h
"machine.h"
@ -7892,7 +7892,7 @@
"preferences.h"
"tinyxml/tinyxml.h"
1306794879 source:/home/mark/projects/git/sleepyhead/SleepyHeadMain.cpp
1306807855 source:/home/mark/projects/git/sleepyhead/SleepyHeadMain.cpp
"wx_pch.h"
"version.h"
<wx/app.h>
@ -7908,8 +7908,9 @@
<wx/fs_mem.h>
"SleepyHeadMain.h"
"sleeplib/profiles.h"
"sleeplib/machine_loader.h"
1306795843 source:/home/mark/projects/git/sleepyhead/graphs/graph.cpp
1306807718 source:/home/mark/projects/git/sleepyhead/graphs/graph.cpp
<wx/settings.h>
<wx/dcbuffer.h>
<wx/log.h>
@ -7924,7 +7925,7 @@
<wx/ffile.h>
<wx/utils.h>
1306760870 source:/home/mark/projects/git/sleepyhead/libs/sleeplib/machine.cpp
1306806694 source:/home/mark/projects/git/sleepyhead/libs/sleeplib/machine.cpp
<tr1/random>
<wx/colour.h>
<wx/log.h>
@ -7934,7 +7935,7 @@
"profiles.h"
<algorithm>
1306414968 source:/home/mark/projects/git/sleepyhead/libs/sleeplib/machine_loader.cpp
1306807233 source:/home/mark/projects/git/sleepyhead/libs/sleeplib/machine_loader.cpp
"machine_loader.h"
1306414968 source:/home/mark/projects/git/sleepyhead/libs/sleeplib/preferences.cpp
@ -7945,7 +7946,7 @@
<wx/stdpaths.h>
"preferences.h"
1306759549 source:/home/mark/projects/git/sleepyhead/libs/sleeplib/profiles.cpp
1306807867 source:/home/mark/projects/git/sleepyhead/libs/sleeplib/profiles.cpp
<wx/filefn.h>
<wx/filename.h>
<wx/utils.h>
@ -8080,3 +8081,36 @@
1306766429 /home/mark/Downloads/burn48.xpm
1305615469 /opt/mingw/usr/i686-pc-mingw32//include/wx-2.9/wx/datectrl.h
"wx/defs.h"
"wx/control.h"
"wx/datetime.h"
"wx/palmos/datectrl.h"
"wx/msw/datectrl.h"
"wx/generic/datectrl.h"
1305615469 /opt/mingw/usr/i686-pc-mingw32//include/wx-2.9/wx/msw/datectrl.h
1305615469 /opt/mingw/usr/i686-pc-mingw32//include/wx-2.9/wx/generic/datectrl.h
"wx/compositewin.h"
1305615467 /opt/mingw/usr/i686-pc-mingw32//include/wx-2.9/wx/compositewin.h
"wx/window.h"
1305615468 /opt/mingw/usr/i686-pc-mingw32//include/wx-2.9/wx/progdlg.h
"wx/defs.h"
"wx/palmos/progdlg.h"
"wx/generic/progdlgg.h"
"wx/msw/progdlg.h"
1305615467 /opt/mingw/usr/i686-pc-mingw32//include/wx-2.9/wx/generic/progdlgg.h
"wx/dialog.h"
1305615469 /opt/mingw/usr/i686-pc-mingw32//include/wx-2.9/wx/msw/progdlg.h
1305615466 /opt/mingw/usr/i686-pc-mingw32//include/wx-2.9/wx/fs_mem.h
"wx/defs.h"
"wx/filesys.h"
"wx/hashmap.h"
"wx/bitmap.h"

4
SleepyHeadApp.cpp
View File

@ -38,7 +38,7 @@ bool SleepyHeadApp::OnInit()
wxLog *logger=new wxLogStream(&std::cout);
wxLog::SetActiveTarget(logger);
wxFileSystem::AddHandler(new wxMemoryFSHandler);
// wxFileSystem::AddHandler(new wxMemoryFSHandler);
wxInitAllImageHandlers();
//wxDateTime::SetCountry(wxDateTime::USA);
@ -67,6 +67,8 @@ bool SleepyHeadApp::OnInit()
int SleepyHeadApp::OnExit()
{
//delete loader_progress;
wxLogMessage("Closing Profiles...");
Profiles::Done();
return true;
}

90
SleepyHeadMain.cpp
View File

@ -31,6 +31,7 @@
#include "SleepyHeadMain.h"
#include "sleeplib/profiles.h"
#include "sleeplib/machine_loader.h"
#if defined(__WXMSW__)
extern "C" void *_GdipStringFormatCachedGenericTypographic = NULL;
@ -68,8 +69,6 @@ wxString wxbuildinfo(wxbuildinfoformat format)
SleepyHeadFrame::SleepyHeadFrame(wxFrame *frame)
: GUIFrame(frame)
{
loader_progress=new wxProgressDialog(wxT("SleepyHead"),wxT("Please Wait..."),100,this, wxPD_APP_MODAL|wxPD_AUTO_HIDE|wxPD_SMOOTH);
loader_progress->Hide();
wxString title=wxTheApp->GetAppName()+wxT(" v")+wxString(AutoVersion::FULLVERSION_STRING,wxConvUTF8);
SetTitle(title);
@ -101,11 +100,10 @@ SleepyHeadFrame::SleepyHeadFrame(wxFrame *frame)
SleepyHeadFrame::~SleepyHeadFrame()
{
if (loader_progress) {
loader_progress->Hide();
loader_progress->Destroy();
delete loader_progress;
}
//delete summary;
//DestroyLoaders();
}
void SleepyHeadFrame::UpdateProfiles()
{
@ -138,6 +136,26 @@ void SleepyHeadFrame::UpdateProfiles()
void SleepyHeadFrame::OnClose(wxCloseEvent &event)
{
int idx=main_auinotebook->GetPageIndex(daily);
if (idx!=wxNOT_FOUND) {
daily->Close();
}
idx=main_auinotebook->GetPageIndex(summary);
if (idx!=wxNOT_FOUND) {
summary->Close();
}
//delete summary
wxMenuItemList z=ProfileMenu->GetMenuItems();
int i=ProfileMenuID;
for (unsigned int j=0;j<z.size();j++) {
wxMenuItem *mi=z[j];
this->Disconnect(i,wxEVT_COMMAND_MENU_SELECTED,wxCommandEventHandler(SleepyHeadFrame::OnProfileSelected));
ProfileMenu->Remove(mi);
i++;
}
this->Disconnect(wxID_ANY, wxEVT_DO_SCREENSHOT, wxCommandEventHandler(SleepyHeadFrame::DoScreenshot));
Destroy();
}
@ -241,6 +259,9 @@ void SleepyHeadFrame::OnImportSD(wxCommandEvent &event)
wxDirDialog dd(this,_("Choose a Directory")); //,wxT(""),wxT(""),style=wxFD_OPEN);
if (dd.ShowModal()!=wxID_OK) return;
loader_progress=new wxProgressDialog(wxT("SleepyHead"),wxT("Please Wait..."),100,this, wxPD_APP_MODAL|wxPD_AUTO_HIDE|wxPD_SMOOTH);
loader_progress->Hide();
wxString path=dd.GetPath();
loader_progress->Update(0);
@ -248,18 +269,8 @@ void SleepyHeadFrame::OnImportSD(wxCommandEvent &event)
profile->Import(path);
loader_progress->Update(100);
loader_progress->Show(false);
/*//UpdateMachineMenu(); // Also updates cpap_machines list.
auto q=MachineMenu->GetMenuItems().rbegin();
int i=0;
Machine *m;
if (q!=MachineMenu->GetMenuItems().rend()) {
(*q)->Check(true);
i=(*q)->GetId()-MachineMenuID;
}
m=cpap_machines[i];
*/
loader_progress->Destroy();
loader_progress=NULL;
int idx=main_auinotebook->GetPageIndex(daily);
if (idx!=wxNOT_FOUND) {
@ -329,9 +340,9 @@ Summary::Summary(wxWindow *win,Profile *_profile)
PRESSURE=new gGraphWindow(ScrolledWindow,-1,wxT("Pressure"),wxPoint(0,0), wxSize(400,200), wxNO_BORDER);
PRESSURE->SetMargins(10,15,60,80);
//PRESSURE->AddLayer(new gBarChart(pressure,wxBLUE));
PRESSURE->AddLayer(new gLineChart(pressure,wxBLUE,6192));
PRESSURE->AddLayer(new gLineChart(pressure,wxDARK_GREEN,6192));
PRESSURE->AddLayer(new gLineChart(pressure_eap,wxRED,6192,false,true));
PRESSURE->AddLayer(new gLineChart(pressure_iap,wxGREEN,6192,false,true));
PRESSURE->AddLayer(new gLineChart(pressure_iap,wxBLUE,6192,false,true));
PRESSURE->AddLayer(new gXAxis(NULL,wxBLACK));
fgSizer->Add(PRESSURE,1,wxEXPAND);
@ -339,7 +350,7 @@ Summary::Summary(wxWindow *win,Profile *_profile)
LEAK=new gGraphWindow(ScrolledWindow,-1,wxT("Mask Leak"),wxPoint(0,0), wxSize(400,200), wxNO_BORDER);
LEAK->SetMargins(10,15,60,80);
//LEAK->AddLayer(new gBarChart(leak,wxYELLOW));
LEAK->AddLayer(new gLineChart(leak,wxYELLOW,6192));
LEAK->AddLayer(new gLineChart(leak,wxPURPLE,6192));
LEAK->AddLayer(new gXAxis(NULL,wxBLACK));
fgSizer->Add(LEAK,1,wxEXPAND);
@ -429,19 +440,19 @@ void Summary::OnRBSelect( wxCommandEvent& event )
if (rbCustomDate->GetValue()) {
EnableDatePickers(true);
} else if (rbAll->GetValue()) {
start=profile->FirstDay()-wxTimeSpan::Day();
end=profile->LastDay();
start=profile->FirstDay()+wxTimeSpan::Day();
end=profile->LastDay()+wxTimeSpan::Day();
EnableDatePickers(false);
} else if (rbLastMonth->GetValue()) {
end=profile->LastDay();
start=end-wxTimeSpan::Days(30);
end=profile->LastDay()+wxTimeSpan::Day();
start=end-wxTimeSpan::Days(30-1);
EnableDatePickers(false);
} else if (rbLastWeek->GetValue()) {
end=profile->LastDay();
start=end-wxTimeSpan::Days(7);
end=profile->LastDay()+wxTimeSpan::Day();
start=end-wxTimeSpan::Days(7-1);
EnableDatePickers(false);
}
if ((start==StartDatePicker->GetValue()) && (end==EndDatePicker->GetValue()))
return;
StartDatePicker->SetValue(start);
EndDatePicker->SetValue(end);
@ -466,6 +477,10 @@ void Summary::OnEndDateChanged( wxDateEvent& event )
(*h)->SetDateRange(start,end);
}
}
void Summary::OnClose(wxCloseEvent &event)
{
Destroy();
}
Daily::Daily(wxWindow *win,Profile *p)
@ -508,14 +523,14 @@ Daily::Daily(wxWindow *win,Profile *p)
G_AHI->AddLayer(l);
AddData(leakdata=new PressureData(CPAP_Leak,0));
LEAK=new gGraphWindow(ScrolledWindow,-1,wxT("Mask Leaks"),wxPoint(0,0), wxSize(600,150), wxNO_BORDER);
LEAK=new gGraphWindow(ScrolledWindow,-1,wxT("Mask Leaks"),wxPoint(0,0), wxSize(600,130), wxNO_BORDER);
LEAK->AddLayer(new gLineChart(leakdata,wxPURPLE,4096,false));
LEAK->AddLayer(new gXAxis(NULL,wxBLACK));
AddData(pressure_iap=new PressureData(CPAP_IAP));
AddData(pressure_eap=new PressureData(CPAP_EAP));
AddData(prd=new PressureData(CPAP_Pressure));
PRD=new gGraphWindow(ScrolledWindow,-1,wxT("Pressure"),wxPoint(0,0), wxSize(600,150), wxNO_BORDER);
PRD=new gGraphWindow(ScrolledWindow,-1,wxT("Pressure"),wxPoint(0,0), wxSize(600,130), wxNO_BORDER);
PRD->AddLayer(new gLineChart(prd,wxDARK_GREEN,4096,false));
PRD->AddLayer(new gLineChart(pressure_iap,wxBLUE,4096,false,true));
PRD->AddLayer(new gLineChart(pressure_eap,wxRED,4096,false,true));
@ -547,10 +562,11 @@ Daily::Daily(wxWindow *win,Profile *p)
FRW->AddLayer(new gLineOverlayBar(flags[1],wxPURPLE,wxT("CA")));
FRW->AddLayer(new gXAxis(NULL,wxBLACK));
SF=new gGraphWindow(ScrolledWindow,-1,wxT("Sleep Flags"),wxPoint(0,0), wxSize(600,150), wxNO_BORDER);
SF=new gGraphWindow(ScrolledWindow,-1,wxT("Event Flags"),wxPoint(0,0), wxSize(600,150), wxNO_BORDER);
// SF->SetMargins(10,15,20,80);
SF->LinkZoom(FRW);
FRW->LinkZoom(SF);
#if defined(__UNIX__)
// SF->LinkZoom(PRD); // Uncomment to link in more graphs.. Too slow on windows.
// SF->LinkZoom(LEAK);
@ -583,8 +599,12 @@ Daily::Daily(wxWindow *win,Profile *p)
}
Daily::~Daily()
{
}
void Daily::OnClose(wxCloseEvent &event)
{
Destroy();
}
void Daily::ResetDate()
{
foobar_datehack=false; // this exists due to a wxGTK bug.

2
SleepyHeadMain.h
View File

@ -41,6 +41,7 @@ protected:
virtual void OnRBSelect( wxCommandEvent& event );
virtual void OnStartDateChanged( wxDateEvent& event );
virtual void OnEndDateChanged( wxDateEvent& event );
virtual void OnClose(wxCloseEvent &event);
void EnableDatePickers(bool b);
@ -60,6 +61,7 @@ public:
protected:
virtual void OnCalendarDay( wxCalendarEvent& event );
virtual void OnCalendarMonth( wxCalendarEvent& event );
virtual void OnClose(wxCloseEvent &event);
void AddData(gPointData *d) { Data.push_back(d); };
void UpdateGraphs(Day *day);

4
WxWizFrame.fbp
View File

@ -1144,7 +1144,7 @@
<object class="wxFlexGridSizer" expanded="1">
<property name="cols">1</property>
<property name="flexible_direction">wxVERTICAL</property>
<property name="growablecols"></property>
<property name="growablecols">0</property>
<property name="growablerows"></property>
<property name="hgap">0</property>
<property name="minimum_size"></property>
@ -1266,7 +1266,7 @@
<property name="font"></property>
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_RB</property>
<property name="id">wxID_ANY</property>
<property name="label">Everything</property>
<property name="layer"></property>
<property name="max_size"></property>

64
graphs/graph.cpp
View File

@ -662,14 +662,22 @@ void gXAxis::Plot(wxDC & dc, gGraphWindow & w)
int width=scrx-(start_px+w.GetRightMargin());
int height=scry-(start_py+w.GetBottomMargin());
dc.SetPen(*color[0]);
wxPen pen=wxPen(*wxBLACK,1,wxSOLID); //color[0]
dc.SetPen(pen);
dc.SetTextForeground(*wxBLACK);
double xx=w.max_x-w.min_x;
//wxDateTime d;
wxString fd=wxT("00:00:00:0000");
wxString fd;
if (xx<1.5) {
fd=wxT("00:00:00:0000");
} else {
fd=wxT("XX XXX");
}
dc.GetTextExtent(fd,&x,&y);
double max_ticks=(x+25.0)/width; // y+50 for rotated text
double jj=1/max_ticks;
double xx=w.max_x-w.min_x;
double minor_tick=max_ticks*xx;
double st2=w.min_x; //double(int(frac*1440.0))/1440.0;
double st,q;
@ -729,8 +737,9 @@ void gXAxis::Plot(wxDC & dc, gGraphWindow & w)
int hour,minute,second,millisecond;
wxDateTime d;
for (double i=st; i<=w.max_x; i+=min_tick) { //600.0/86400.0) {
d.Set(i+2400000.5+.000001); // JDN vs MJD vs Rounding errors
for (double i=st; i<w.max_x; i+=min_tick) { //600.0/86400.0) {
d.Set(i+2400000.5+.000001+1); // JDN vs MJD vs Rounding errors
if (show_time) {
minute=d.GetMinute();
@ -746,17 +755,24 @@ void gXAxis::Plot(wxDC & dc, gGraphWindow & w)
fd=wxString::Format(wxT("%02i:%02i"),hour,minute);
}
} else {
fd=d.Format(wxT("%e %b"));
fd=d.Format(wxT("%d %b"));
//fd=wxT("ZZ FUNK");
}
// dc.GetTextExtent(fd,&x,&y);
// px=x2p(w,i);
px=w.x2p(i); //w.GetLeftMargin()+((i - w.min_x) * xmult);
dc.DrawLine(px,py,px,py+6);
y=x=0;
dc.GetTextExtent(fd,&x,&y); // This doesn't work properly on windows.
// There is a wx2.8 bug in wxMSW that screws up calculating x properly.
const int offset=0;
dc.GetTextExtent(fd,&x,&y);
if (!show_time) {
dc.DrawRotatedText(fd, px-(y/2)+2, py+x+14, 90);
dc.DrawRotatedText(fd, px-(y/2)+2, py+x+16+offset, 90.0);
} else {
dc.DrawText(fd, px-(x/2), py+y);
}
@ -1033,6 +1049,7 @@ void gBarChart::Plot(wxDC & dc, gGraphWindow & w)
dc.DrawRectangle(rect);
str=FormatX(data->point[0][i].x);
textX=textY=0;
dc.GetTextExtent(str, &textX, &textY);
if (t2>textY) {
int j=t1+((t2/2)-(textY/2));
@ -1110,9 +1127,10 @@ void gLineChart::Plot(wxDC & dc, gGraphWindow & w)
// dc.DrawLine(start_px,start_py,start_px+width,start_py);
dc.DrawLine(start_px+width+1,start_py,start_px+width+1,start_py+height+1);
// Funky Bar.. move this to it's own layer.
wxPen pen2(wxDARK_GREY, 1, wxDOT);
wxPen pen3(*wxGREEN, 2, wxSOLID);
dc.SetPen( pen2 );
dc.DrawLine(start_px,start_py+height+10,start_px+width,start_py+height+10);
double rmx=w.rmax_x-w.rmin_x;
@ -1763,12 +1781,16 @@ void FlagData::Reload(Day *day)
m_ready=true;
}
////////////////////////////////////////////////////////////////////////////////////////////
// HistoryData Implementation
////////////////////////////////////////////////////////////////////////////////////////////
HistoryData::HistoryData(Profile * _profile)
:gPointData(1024),profile(_profile)
{
AddSegment(max_points);
if (profile->LastDay().IsValid()) {
real_min_x=profile->FirstDay().GetMJD()-1;
real_min_x=profile->FirstDay().GetMJD();
real_max_x=profile->LastDay().GetMJD()+1;
}
}
@ -1778,7 +1800,7 @@ HistoryData::~HistoryData()
void HistoryData::ResetDateRange()
{
if (profile->LastDay().IsValid()) {
real_min_x=profile->FirstDay().GetMJD()-1;
real_min_x=profile->FirstDay().GetMJD();
real_max_x=profile->LastDay().GetMJD()+1;
}
Reload(NULL);
@ -1813,14 +1835,14 @@ void HistoryData::Reload(Day *day)
point[vc][i].x=x;
point[vc][i].y=y;
if (first) {
max_x=min_x=x;
// max_x=min_x=x;
max_y=min_y=y;
first=false;
}
if (y>max_y) max_y=y;
if (y<min_y) min_y=y;
if (x<min_x) min_x=x;
if (x>max_x) max_x=x;
//if (x<min_x) min_x=x;
//if (x>max_x) max_x=x;
i++;
if (i>max_points) {
@ -1831,9 +1853,11 @@ void HistoryData::Reload(Day *day)
}
np[vc]=i;
vc++;
max_x+=1;
real_min_x=min_x;
real_max_x=max_x;
min_x=real_min_x;
max_x=real_max_x;
// max_x+=1;
//real_min_x=min_x;
//real_max_x=max_x;
real_min_y=min_y;
real_max_y=max_y;
m_ready=true;
@ -1849,10 +1873,10 @@ double HistoryData::GetAverage()
}
void HistoryData::SetDateRange(wxDateTime start,wxDateTime end)
{
double x1=start.GetMJD()+1;
double x2=end.GetMJD()+1;
double x1=start.GetMJD()-1;//+1;
double x2=end.GetMJD();
if (x1 < real_min_x) x1=real_min_x;
if (x2 > real_max_x) x2=real_max_x;
if (x2 > (real_max_x)) x2=(real_max_x);
min_x=x1;
max_x=x2;
for (auto i=notify_layers.begin();i!=notify_layers.end();i++) {

2
graphs/graph.h
View File

@ -400,7 +400,7 @@ class gBarChart:public gLayer
// d.Set(i+2400000.5+.000001); // JDN vs MJD vs Rounding errors
virtual const wxString & FormatX(double v) { static wxString t; wxDateTime d; d.Set(v+2400000.5+1); t=d.Format(wxT("%e %b")); return t; };
virtual const wxString & FormatX(double v) { static wxString t; wxDateTime d; d.Set(v+2400000.5+1); t=d.Format(wxT("%d %b")); return t; };
//virtual const wxString & FormatX(double v) { static wxString t; wxDateTime d; d.Set(vi+2400000.5); t=d.Format(wxT("%H:%M")); return t; };
//virtual const wxString & FormatX(double v) { static wxString t; t=wxString::Format(wxT("%.1f"),v); return t; };
virtual const wxString & FormatY(double v) { static wxString t; t=wxString::Format(wxT("%.1f"),v); return t; };

3
libs/sleeplib/machine.cpp
View File

@ -109,6 +109,7 @@ map<MachineCode,wxString> DefaultMCLongNames= {
//////////////////////////////////////////////////////////////////////////////////////////
Machine::Machine(Profile *p,MachineID id)
{
wxLogDebug(wxT("Create Machine"));
profile=p;
if (!id) {
std::tr1::minstd_rand gen;
@ -127,6 +128,7 @@ Machine::Machine(Profile *p,MachineID id)
}
Machine::~Machine()
{
wxLogDebug(wxT("Destroy Machine"));
for (auto d=day.begin();d!=day.end();d++) {
delete d->second;
}
@ -254,6 +256,7 @@ bool Machine::Save()
Day::Day(Machine *m)
:machine(m)
{
d_firstsession=true;
sessions.clear();
}

2
libs/sleeplib/profiles.cpp
View File

@ -245,7 +245,7 @@ void Scan()
if (!wxDirExists(path)) {
wxString tmp=pref.Get("{home}");
wxLogMessage(wxT("zzz")+tmp);
//wxLogMessage(wxT("zzz")+tmp);
if (!wxDirExists(tmp)) wxMkdir(tmp);
Create(wxGetUserId(),wxGetUserName(),wxT(""));
return;

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 = 2313;
static const long REVISION = 7342;
static const long BUILD = 2435;
static const long REVISION = 7996;
//Miscellaneous Version Types
static const long BUILDS_COUNT = 7196;
#define RC_FILEVERSION 0,7,2313,7342
#define RC_FILEVERSION_STRING "0, 7, 2313, 7342\0"
static const char FULLVERSION_STRING[] = "0.7.2313.7342";
static const long BUILDS_COUNT = 7416;
#define RC_FILEVERSION 0,7,2435,7996
#define RC_FILEVERSION_STRING "0, 7, 2435, 7996\0"
static const char FULLVERSION_STRING[] = "0.7.2435.7996";
//These values are to keep track of your versioning state, don't modify them.
static const long BUILD_HISTORY = 62;