diff --git a/SleepyHead.cbp b/SleepyHead.cbp index aabd16fe..ebabdfcb 100644 --- a/SleepyHead.cbp +++ b/SleepyHead.cbp @@ -99,6 +99,9 @@ + + + diff --git a/SleepyHead.depend b/SleepyHead.depend index 3079cb35..3a95b48e 100644 --- a/SleepyHead.depend +++ b/SleepyHead.depend @@ -7838,7 +7838,7 @@ "sleeplib/machine.h" "graphs/graph.h" -1306942290 /home/mark/projects/git/sleepyhead/libs/sleeplib/machine.h +1306984890 /home/mark/projects/git/sleepyhead/libs/sleeplib/machine.h @@ -7876,7 +7876,7 @@ -1306942431 /home/mark/projects/git/sleepyhead/version.h +1306985082 /home/mark/projects/git/sleepyhead/version.h 1306724655 /home/mark/projects/git/sleepyhead/libs/sleeplib/prs1_loader.h "machine.h" @@ -7893,7 +7893,7 @@ "preferences.h" "tinyxml/tinyxml.h" -1306942373 source:/home/mark/projects/git/sleepyhead/SleepyHeadMain.cpp +1306984959 source:/home/mark/projects/git/sleepyhead/SleepyHeadMain.cpp "wx_pch.h" "version.h" @@ -7927,7 +7927,7 @@ -1306942428 source:/home/mark/projects/git/sleepyhead/libs/sleeplib/machine.cpp +1306985082 source:/home/mark/projects/git/sleepyhead/libs/sleeplib/machine.cpp diff --git a/SleepyHead.layout b/SleepyHead.layout index a7b0ad1a..822b137d 100644 --- a/SleepyHead.layout +++ b/SleepyHead.layout @@ -1,6 +1,6 @@ - + @@ -10,17 +10,17 @@ - - + + - - + + - + - + @@ -29,10 +29,10 @@ - + - + @@ -47,13 +47,13 @@ - + - - + + diff --git a/SleepyHeadMain.cpp b/SleepyHeadMain.cpp index 024de64f..0ebea076 100644 --- a/SleepyHeadMain.cpp +++ b/SleepyHeadMain.cpp @@ -691,13 +691,6 @@ void Daily::RefreshData() } } - if (d) { - for (auto s=d->begin();s!=d->end();s++) { - (*s)->OpenEvents(); - (*s)->OpenWaveforms(); - } - - } UpdateGraphs(d); if (d) { @@ -898,6 +891,10 @@ void Daily::OnCalendarDay( wxCalendarEvent& event ) void Daily::UpdateGraphs(Day *day) { //if (!day) return; + if (day) { + day->OpenEvents(); + day->OpenWaveforms(); + } for (auto g=Data.begin();g!=Data.end();g++) { if (day==NULL) { diff --git a/libs/sleeplib/machine.cpp b/libs/sleeplib/machine.cpp index 2f42bd48..646778d0 100644 --- a/libs/sleeplib/machine.cpp +++ b/libs/sleeplib/machine.cpp @@ -551,6 +551,19 @@ const wxDateTime & Day::last(MachineCode code) return date; } +void Day::OpenEvents() +{ + for (auto s=begin();s!=end();s++) { + (*s)->OpenEvents(); + } + +} +void Day::OpenWaveforms() +{ + for (auto s=begin();s!=end();s++) { + (*s)->OpenWaveforms(); + } +} ////////////////////////////////////////////////////////////////////////////////////////// diff --git a/libs/sleeplib/machine.h b/libs/sleeplib/machine.h index 3aa3a221..ad8b3398 100644 --- a/libs/sleeplib/machine.h +++ b/libs/sleeplib/machine.h @@ -126,6 +126,9 @@ public: size_t size() { return sessions.size(); }; Machine *machine; + void OpenEvents(); + void OpenWaveforms(); + protected: vector sessions; wxDateTime d_first,d_last; diff --git a/version.h b/version.h index f333b595..f41f5278 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 = 2740; - static const long REVISION = 9616; + static const long BUILD = 2743; + static const long REVISION = 9632; //Miscellaneous Version Types - static const long BUILDS_COUNT = 8197; - #define RC_FILEVERSION 0,7,2740,9616 - #define RC_FILEVERSION_STRING "0, 7, 2740, 9616\0" - static const char FULLVERSION_STRING[] = "0.7.2740.9616"; + static const long BUILDS_COUNT = 8204; + #define RC_FILEVERSION 0,7,2743,9632 + #define RC_FILEVERSION_STRING "0, 7, 2743, 9632\0" + static const char FULLVERSION_STRING[] = "0.7.2743.9632"; //These values are to keep track of your versioning state, don't modify them. static const long BUILD_HISTORY = 62;