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 a loader bug I just added by C++0X conversion

Browse Source
This commit is contained in:
Mark Watkins 2011-06-02 20:10:43 +10:00
parent ae2cb136b7
commit de39de05dc
7 changed files with 39 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SleepyHead.cbp
View File

@ -42,7 +42,6 @@
<Add option="-march=i686" /> <Add option="-march=i686" />
<Add option="-O2" /> <Add option="-O2" />
<Add option="`i686-pc-mingw32-wx-config --version=2.9 --cflags`" /> <Add option="`i686-pc-mingw32-wx-config --version=2.9 --cflags`" />
<Add option="-std=gnu++0x" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add option="-s" /> <Add option="-s" />
@ -53,7 +52,6 @@
<Compiler> <Compiler>
<Add option="-Wall" /> <Add option="-Wall" />
<Add option="`wx-config --version=2.8 --cflags`" /> <Add option="`wx-config --version=2.8 --cflags`" />
<Add option="-std=gnu++0x" />
<Add directory="libs" /> <Add directory="libs" />
<Add directory="graphs" /> <Add directory="graphs" />
</Compiler> </Compiler>

9
SleepyHead.depend
View File

@ -7838,7 +7838,7 @@
"sleeplib/machine.h" "sleeplib/machine.h"
"graphs/graph.h" "graphs/graph.h"
1306991807 /home/mark/projects/git/sleepyhead/libs/sleeplib/machine.h 1307007107 /home/mark/projects/git/sleepyhead/libs/sleeplib/machine.h
<wx/string.h> <wx/string.h>
<wx/variant.h> <wx/variant.h>
<wx/dir.h> <wx/dir.h>
@ -7876,7 +7876,7 @@
<sleeplib/machine.h> <sleeplib/machine.h>
<list> <list>
1306991808 /home/mark/projects/git/sleepyhead/version.h 1307009363 /home/mark/projects/git/sleepyhead/version.h
1306724655 /home/mark/projects/git/sleepyhead/libs/sleeplib/prs1_loader.h 1306724655 /home/mark/projects/git/sleepyhead/libs/sleeplib/prs1_loader.h
"machine.h" "machine.h"
@ -7927,7 +7927,7 @@
<wx/ffile.h> <wx/ffile.h>
<wx/utils.h> <wx/utils.h>
1306991808 source:/home/mark/projects/git/sleepyhead/libs/sleeplib/machine.cpp 1307007829 source:/home/mark/projects/git/sleepyhead/libs/sleeplib/machine.cpp
<tr1/random> <tr1/random>
<wx/colour.h> <wx/colour.h>
<wx/log.h> <wx/log.h>
@ -7936,6 +7936,7 @@
"machine.h" "machine.h"
"profiles.h" "profiles.h"
<algorithm> <algorithm>
<initializer_list>
1306989502 source:/home/mark/projects/git/sleepyhead/libs/sleeplib/machine_loader.cpp 1306989502 source:/home/mark/projects/git/sleepyhead/libs/sleeplib/machine_loader.cpp
"machine_loader.h" "machine_loader.h"
@ -7960,7 +7961,7 @@
"machine_loader.h" "machine_loader.h"
"tinyxml/tinyxml.h" "tinyxml/tinyxml.h"
1306991577 source:/home/mark/projects/git/sleepyhead/libs/sleeplib/prs1_loader.cpp 1307009357 source:/home/mark/projects/git/sleepyhead/libs/sleeplib/prs1_loader.cpp
<wx/dir.h> <wx/dir.h>
<wx/filename.h> <wx/filename.h>
<wx/ffile.h> <wx/ffile.h>

18
SleepyHead.layout
View File

@ -1,19 +1,19 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<CodeBlocks_layout_file> <CodeBlocks_layout_file>
<ActiveTarget name="Windows" /> <ActiveTarget name="Debug" />
<File name="GUIFrame.cpp" open="0" top="0" tabpos="11"> <File name="GUIFrame.cpp" open="0" top="0" tabpos="11">
<Cursor position="8034" topLine="105" /> <Cursor position="8034" topLine="105" />
</File> </File>
<File name="GUIFrame.h" open="0" top="0" tabpos="10"> <File name="GUIFrame.h" open="0" top="0" tabpos="10">
<Cursor position="2555" topLine="27" /> <Cursor position="2555" topLine="27" />
</File> </File>
<File name="SleepyHeadApp.cpp" open="0" top="0" tabpos="9"> <File name="SleepyHeadApp.cpp" open="1" top="0" tabpos="10">
<Cursor position="1346" topLine="14" /> <Cursor position="1061" topLine="14" />
</File> </File>
<File name="SleepyHeadMain.cpp" open="1" top="0" tabpos="3"> <File name="SleepyHeadMain.cpp" open="1" top="0" tabpos="3">
<Cursor position="36337" topLine="796" /> <Cursor position="36337" topLine="796" />
</File> </File>
<File name="SleepyHeadMain.h" open="1" top="1" tabpos="4"> <File name="SleepyHeadMain.h" open="1" top="0" tabpos="4">
<Cursor position="550" topLine="0" /> <Cursor position="550" topLine="0" />
</File> </File>
<File name="graphs/graph.cpp" open="1" top="0" tabpos="6"> <File name="graphs/graph.cpp" open="1" top="0" tabpos="6">
@ -29,10 +29,10 @@
<Cursor position="0" topLine="0" /> <Cursor position="0" topLine="0" />
</File> </File>
<File name="libs/sleeplib/machine.cpp" open="1" top="0" tabpos="1"> <File name="libs/sleeplib/machine.cpp" open="1" top="0" tabpos="1">
<Cursor position="18088" topLine="629" /> <Cursor position="35662" topLine="1241" />
</File> </File>
<File name="libs/sleeplib/machine.h" open="1" top="0" tabpos="2"> <File name="libs/sleeplib/machine.h" open="1" top="1" tabpos="2">
<Cursor position="7729" topLine="251" /> <Cursor position="481" topLine="0" />
</File> </File>
<File name="libs/sleeplib/machine_loader.cpp" open="0" top="0" tabpos="8"> <File name="libs/sleeplib/machine_loader.cpp" open="0" top="0" tabpos="8">
<Cursor position="0" topLine="0" /> <Cursor position="0" topLine="0" />
@ -47,13 +47,13 @@
<Cursor position="31" topLine="0" /> <Cursor position="31" topLine="0" />
</File> </File>
<File name="libs/sleeplib/profiles.cpp" open="1" top="0" tabpos="7"> <File name="libs/sleeplib/profiles.cpp" open="1" top="0" tabpos="7">
<Cursor position="1125" topLine="52" /> <Cursor position="6582" topLine="216" />
</File> </File>
<File name="libs/sleeplib/profiles.h" open="1" top="0" tabpos="8"> <File name="libs/sleeplib/profiles.h" open="1" top="0" tabpos="8">
<Cursor position="628" topLine="5" /> <Cursor position="628" topLine="5" />
</File> </File>
<File name="libs/sleeplib/prs1_loader.cpp" open="1" top="0" tabpos="9"> <File name="libs/sleeplib/prs1_loader.cpp" open="1" top="0" tabpos="9">
<Cursor position="10261" topLine="276" /> <Cursor position="17629" topLine="473" />
</File> </File>
<File name="libs/sleeplib/prs1_loader.h" open="0" top="0" tabpos="8"> <File name="libs/sleeplib/prs1_loader.h" open="0" top="0" tabpos="8">
<Cursor position="1115" topLine="0" /> <Cursor position="1115" topLine="0" />

16
libs/sleeplib/machine.cpp
View File

@ -6,11 +6,23 @@
#include "machine.h" #include "machine.h"
#include "profiles.h" #include "profiles.h"
#include <algorithm> #include <algorithm>
#include <initializer_list>
extern wxProgressDialog *loader_progress; extern wxProgressDialog *loader_progress;
map<MachineID,Machine *> MachList; map<MachineType,ChannelCode> MachLastCode;
ChannelCode RegisterChannel(MachineType type)
{
if (MachLastCode.find(type)==MachLastCode.end()) {
return MachLastCode[type]=0;
}
return ++(MachLastCode[type]);
};
const int CPLAP_FLONG=RegisterChannel(MT_CPAP);
//map<MachineID,Machine *> MachList;
/*map<MachineType,wxString> MachineTypeString= { /*map<MachineType,wxString> MachineTypeString= {
{MT_UNKNOWN, wxT("Unknown")}, {MT_UNKNOWN, wxT("Unknown")},

2
libs/sleeplib/machine.h
View File

@ -36,6 +36,8 @@ enum MachineType//: short
// Could be implimented by MachineLoader's register function requesting a block of integer space, // Could be implimented by MachineLoader's register function requesting a block of integer space,
// and a map to name strings. // and a map to name strings.
typedef int ChannelCode;
// Be cautious when extending these.. add to the end of each groups to preserve file formats. // Be cautious when extending these.. add to the end of each groups to preserve file formats.
enum MachineCode//:wxInt16 enum MachineCode//:wxInt16
{ {

6
libs/sleeplib/prs1_loader.cpp
View File

@ -488,7 +488,7 @@ bool PRS1Loader::Parse002(Session *session,unsigned char *buffer,int size,time_t
pos+=2; pos+=2;
t+=wxTimeSpan::Seconds(size); t+=wxTimeSpan::Seconds(size);
} }
float data0,data1,data2; // float data0,data1,data2;
MachineCode cpapcode=Codes[(int)code]; MachineCode cpapcode=Codes[(int)code];
wxDateTime tt=t; wxDateTime tt=t;
cnt++; cnt++;
@ -521,7 +521,7 @@ bool PRS1Loader::Parse002(Session *session,unsigned char *buffer,int size,time_t
data[0]=buffer[pos++]; data[0]=buffer[pos++];
data[1]=buffer[pos++]; data[1]=buffer[pos++];
if (code==0x11) { if (code==0x11) {
session->AddEvent(new Event(t,cpapcode, data,1)); session->AddEvent(new Event(t,cpapcode, data,2));
if (data[1]>0) { if (data[1]>0) {
session->AddEvent(new Event(tt,PRS1_VSnore2, &data[1],1)); session->AddEvent(new Event(tt,PRS1_VSnore2, &data[1],1));
} }
@ -545,7 +545,7 @@ bool PRS1Loader::Parse002(Session *session,unsigned char *buffer,int size,time_t
data[0]=buffer[pos+1]<<8 | buffer[pos]; data[0]=buffer[pos+1]<<8 | buffer[pos];
pos+=2; pos+=2;
data[1]=buffer[pos++]; data[1]=buffer[pos++];
tt-=wxTimeSpan::Seconds(data1); tt-=wxTimeSpan::Seconds(data[1]);
session->AddEvent(new Event(tt,cpapcode, data, 2)); session->AddEvent(new Event(tt,cpapcode, data, 2));
break; break;
case 0x12: // Summary case 0x12: // Summary

12
version.h
View File

@ -16,14 +16,14 @@ namespace AutoVersion{
//Standard Version Type //Standard Version Type
static const long MAJOR = 0; static const long MAJOR = 0;
static const long MINOR = 7; static const long MINOR = 7;
static const long BUILD = 2807; static const long BUILD = 2821;
static const long REVISION = 9954; static const long REVISION = 10042;
//Miscellaneous Version Types //Miscellaneous Version Types
static const long BUILDS_COUNT = 8303; static const long BUILDS_COUNT = 8328;
#define RC_FILEVERSION 0,7,2807,9954 #define RC_FILEVERSION 0,7,2821,10042
#define RC_FILEVERSION_STRING "0, 7, 2807, 9954\0" #define RC_FILEVERSION_STRING "0, 7, 2821, 10042\0"
static const char FULLVERSION_STRING[] = "0.7.2807.9954"; static const char FULLVERSION_STRING[] = "0.7.2821.10042";
//These values are to keep track of your versioning state, don't modify them. //These values are to keep track of your versioning state, don't modify them.
static const long BUILD_HISTORY = 62; static const long BUILD_HISTORY = 62;