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

Fixed an evil plot bug with CMS50 data

Browse Source
This commit is contained in:
Mark Watkins 2011-06-07 13:26:15 +10:00
parent ff343d19b4
commit 87b7149ba6
4 changed files with 482 additions and 252 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

708
Projects/CodeBlocks/SleepyHead.depend
View File

File diff suppressed because it is too large Load Diff

11
Projects/CodeBlocks/SleepyHead.layout
View File

@ -1,17 +1,20 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<CodeBlocks_layout_file>
<ActiveTarget name="Debug" />
<File name="../../src/GUIFrame.cpp" open="1" top="0" tabpos="14">
<Cursor position="1300" topLine="24" />
</File>
<File name="../../src/SleepyHeadApp.cpp" open="1" top="0" tabpos="1">
<Cursor position="1042" topLine="7" />
</File>
<File name="../../src/SleepyHeadMain.cpp" open="1" top="1" tabpos="2">
<File name="../../src/SleepyHeadMain.cpp" open="1" top="0" tabpos="2">
<Cursor position="28432" topLine="739" />
</File>
<File name="../../src/SleepyHeadMain.h" open="1" top="0" tabpos="3">
<Cursor position="546" topLine="42" />
</File>
<File name="../../src/graphs/graph.cpp" open="1" top="0" tabpos="9">
<Cursor position="31458" topLine="1176" />
<File name="../../src/graphs/graph.cpp" open="1" top="1" tabpos="9">
<Cursor position="44361" topLine="1657" />
</File>
<File name="../../src/graphs/graph.h" open="1" top="0" tabpos="10">
<Cursor position="12935" topLine="338" />
@ -20,7 +23,7 @@
<Cursor position="7148" topLine="269" />
</File>
<File name="../../src/libs/sleeplib/loader_plugins/cms50_loader.cpp" open="1" top="0" tabpos="4">
<Cursor position="6650" topLine="205" />
<Cursor position="2222" topLine="82" />
</File>
<File name="../../src/libs/sleeplib/loader_plugins/cms50_loader.h" open="1" top="0" tabpos="5">
<Cursor position="579" topLine="0" />

3
src/graphs/graph.cpp
View File

@ -1222,6 +1222,7 @@ void gLineChart::Plot(wxDC & dc, gGraphWindow & w)
for (int n=0;n<data->VC();n++) {
if (!data->np[n]) continue;
dp=0;
bool done=false;
bool first=true;
@ -1668,7 +1669,7 @@ void EventData::Reload(Day *day)
if (r.y>max_y) max_y=r.y;
}
} else {
if (p!=lastp) { // There really should not be consecutive zeros.. just in case..
if ((p!=lastp) && (t>0)) { // There really should not be consecutive zeros.. just in case..
np[vc]=t;
tt+=t;
t=0;

12
src/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 = 3350;
static const long REVISION = 1424;
static const long BUILD = 3352;
static const long REVISION = 1440;
//Miscellaneous Version Types
static const long BUILDS_COUNT = 539;
#define RC_FILEVERSION 0,7,3350,1424
#define RC_FILEVERSION_STRING "0, 7, 3350, 1424\0"
static const char FULLVERSION_STRING[] = "0.7.3350.1424";
static const long BUILDS_COUNT = 547;
#define RC_FILEVERSION 0,7,3352,1440
#define RC_FILEVERSION_STRING "0, 7, 3352, 1440\0"
static const char FULLVERSION_STRING[] = "0.7.3352.1440";
//These values are to keep track of your versioning state, don't modify them.
static const long BUILD_HISTORY = 0;