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

Make the Channel ID consistantly of Type Channel ID

Browse Source 
Signed-off-by: Mark Watkins <jedimark@users.sourceforge.net>
This commit is contained in:
Alec Clews 2013-12-16 11:46:01 +11:00 committed by Mark Watkins
parent 0e03e4deef
commit 36b9cc8e16
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sleepyhead/SleepLib/schema.cpp
View File

@ -305,7 +305,7 @@ void init()
ZEO_TimeToZ=schema::channel["TimeToZ"].id(); ZEO_TimeToZ=schema::channel["TimeToZ"].id();
} }
Channel::Channel(int id, ChanType type, ScopeType scope, QString code, QString fullname, QString description, QString label, QString unit, DataType datatype, QColor color, int link): Channel::Channel(ChannelID id, ChanType type, ScopeType scope, QString code, QString fullname, QString description, QString label, QString unit, DataType datatype, QColor color, int link):
m_id(id), m_id(id),
m_type(type), m_type(type),
m_scope(scope), m_scope(scope),

2
sleepyhead/SleepLib/schema.h
View File

@ -53,7 +53,7 @@ class Channel
{ {
public: public:
Channel() { m_id=0; } Channel() { m_id=0; }
Channel(int id, ChanType type, ScopeType scope, QString code, QString fullname, QString description, QString label, QString unit,DataType datatype=DEFAULT, QColor=Qt::black, int link=0); Channel(ChannelID id, ChanType type, ScopeType scope, QString code, QString fullname, QString description, QString label, QString unit,DataType datatype=DEFAULT, QColor=Qt::black, int link=0);
void addColor(Function f, QColor color) { m_colors[f]=color; } void addColor(Function f, QColor color) { m_colors[f]=color; }
void addOption(int i, QString option) { m_options[i]=option; } void addOption(int i, QString option) { m_options[i]=option; }