Subversion Repositories tpanel

Rev

Rev 431 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 431 Rev 433
Line 30... Line 30...
30 
    ch = bs.ch;
 30 
    ch = bs.ch;
31 
    cp = bs.cp;
 31 
    cp = bs.cp;
32 
    lp = bs.lp;
 32 
    lp = bs.lp;
33 
    lv = bs.lv;
 33 
    lv = bs.lv;
34 
 
 34 
 
35 
    switch(type)
 35 
    init();
36 
    {
 - 
 
37 
        case GENERAL:               mID = createButtonID(type, ap, ad, ad, cp, lp, lv); break;
 - 
 
38 
        case MULTISTATE_GENERAL:    mID = createButtonID(type, ap, ad, ad, cp); break;
 - 
 
39 
        case BARGRAPH:              mID = createButtonID(type, -1, -1, -1, -1, lp, lv); break;
 - 
 
40 
        case MULTISTATE_BARGRAPH:   mID = createButtonID(type, -1, -1, -1, -1, lp, lv); break;
 - 
 
41 
        case JOYSTICK:              mID = createButtonID(type, -1, -1, -1, -1, lp, lv); break;
 - 
 
42 
        case TEXT_INPUT:            mID = createButtonID(type, ap, ad, ad, cp); break;
 - 
 
43 
        case LISTBOX:               mID = createButtonID(type, ap, ad, ad, cp); break;
 - 
 
44 
        case SUBPAGE_VIEW:          mID = createButtonID(type, ap, ad, ad, cp); break;
 - 
 
45 
        default:
 - 
 
46 
            mID = createButtonID(type, ap, ad, ad, cp, lp, lv);
 - 
 
47 
    }
 - 
 
48 
}
 36 
}
49 
 
 37 
 
50 
TButtonStates::TButtonStates(BUTTONTYPE t, int rap, int rad, int rch, int rcp, int rlp, int rlv)
 38 
TButtonStates::TButtonStates(BUTTONTYPE t, int rap, int rad, int rch, int rcp, int rlp, int rlv)
51 
    : type(t),
 39 
    : type(t),
52 
      ap(rap),
 40 
      ap(rap),
Line 56... Line 44...
56 
      lp(rlp),
 44 
      lp(rlp),
57 
      lv(rlv)
 45 
      lv(rlv)
58 
{
 46 
{
59 
    DECL_TRACER("TButtonStates::TButtonStates(BUTTONTYPE t, int rap, int rad, int rch, int rcp, int rlp, int rlv)");
 47 
    DECL_TRACER("TButtonStates::TButtonStates(BUTTONTYPE t, int rap, int rad, int rch, int rcp, int rlp, int rlv)");
60 
 
 48 
 
- 
 
 49 
    init();
- 
 
 50 
}
- 
 
 51 
 
- 
 
 52 
TButtonStates::~TButtonStates()
- 
 
 53 
{
- 
 
 54 
    DECL_TRACER("TButtonStates::~TButtonStates()");
- 
 
 55 
}
- 
 
 56 
 
- 
 
 57 
void TButtonStates::init()
- 
 
 58 
{
- 
 
 59 
    DECL_TRACER("TButtonStates::init()");
- 
 
 60 
 
61 
    switch(type)
 61 
    switch(type)
62 
    {
 62 
    {
63 
        case GENERAL:               mID = createButtonID(type, ap, ad, ad, cp, lp, lv); break;
 63 
        case GENERAL:               mID = createButtonID(type, ap, ad, cp, ch, lp, lv); break;
64 
        case MULTISTATE_GENERAL:    mID = createButtonID(type, ap, ad, ad, cp); break;
 64 
        case MULTISTATE_GENERAL:    mID = createButtonID(type, ap, ad, cp, ch); break;
65 
        case BARGRAPH:              mID = createButtonID(type, -1, -1, -1, -1, lp, lv); break;
 65 
        case BARGRAPH:              mID = createButtonID(type, -1, -1, -1, -1, lp, lv); break;
66 
        case MULTISTATE_BARGRAPH:   mID = createButtonID(type, -1, -1, -1, -1, lp, lv); break;
 66 
        case MULTISTATE_BARGRAPH:   mID = createButtonID(type, -1, -1, cp, ch, lp, lv); break;
67 
        case JOYSTICK:              mID = createButtonID(type, -1, -1, -1, -1, lp, lv); break;
 67 
        case JOYSTICK:              mID = createButtonID(type, -1, -1, -1, -1, lp, lv); break;
68 
        case TEXT_INPUT:            mID = createButtonID(type, ap, ad, ad, cp); break;
 68 
        case TEXT_INPUT:            mID = createButtonID(type, ap, ad, cp, ch); break;
69 
        case LISTBOX:               mID = createButtonID(type, ap, ad, ad, cp); break;
 69 
        case LISTBOX:               mID = createButtonID(type, ap, ad, cp, ch); break;
70 
        case SUBPAGE_VIEW:          mID = createButtonID(type, ap, ad, ad, cp); break;
 70 
        case SUBPAGE_VIEW:          mID = createButtonID(type, ap, ad, cp, ch); break;
71 
        default:
 71 
        default:
72 
            mID = createButtonID(type, ap, ad, ad, cp, lp, lv);
 72 
            mID = createButtonID(type, ap, ad, cp, ch, lp, lv);
73 
    }
 73 
    }
74 
}
 74 
}
75 
 
 75 
 
76 
TButtonStates::~TButtonStates()
 - 
 
77 
{
 - 
 
78 
    DECL_TRACER("TButtonStates::~TButtonStates()");
 - 
 
79 
}
 - 
 
80 
 
 - 
 
81 
bool TButtonStates::isButton(BUTTONTYPE t, uint32_t ID)
 76 
bool TButtonStates::isButton(BUTTONTYPE t, uint32_t ID)
82 
{
 77 
{
83 
    DECL_TRACER("TButtonStates::isButton(BUTTONTYPE t, uint32_t ID)");
 78 
//    DECL_TRACER("TButtonStates::isButton(BUTTONTYPE t, uint32_t ID)");
84 
 
 79 
 
85 
    if (type == t && ID == mID)
 80 
    if (type == t && ID == mID)
86 
        return true;
 81 
        return true;
87 
 
 82 
 
88 
    return false;
 83 
    return false;
Line 91... Line 86...
91 
bool TButtonStates::isButton(BUTTONTYPE t, int rap, int rad, int rch, int rcp, int rlp, int rlv)
 86 
bool TButtonStates::isButton(BUTTONTYPE t, int rap, int rad, int rch, int rcp, int rlp, int rlv)
92 
{
 87 
{
93 
//    DECL_TRACER("TButtonStates::isButton(int rap, int rad, int rch, int rcp, int rlp, int rlv)");
 88 
//    DECL_TRACER("TButtonStates::isButton(int rap, int rad, int rch, int rcp, int rlp, int rlv)");
94 
 
 89 
 
95 
    if (type == t && rap == ap && rad == ad && rch == ch && rcp == cp && rlp == lp && rlv == lv)
 90 
    if (type == t && rap == ap && rad == ad && rch == ch && rcp == cp && rlp == lp && rlv == lv)
96 
    {
 - 
 
97 
        MSG_DEBUG("Found button: ap=" << ap << ", ad=" << ad << ", ch=" << ch << ", cp=" << cp << ", lp=" << lp << ", lv=" << lv);
 - 
 
98 
        return true;
 91 
        return true;
99 
    }
 - 
 
100 
 
 92 
 
101 
    return false;
 93 
    return false;
102 
}
 94 
}
103 
 
 95 
 
104 
bool TButtonStates::isButton(const TButtonStates& bs)
 96 
bool TButtonStates::isButton(const TButtonStates& bs)
105 
{
 97 
{
106 
//    DECL_TRACER("TButtonStates::isButton(const TButtonStates& bs)");
 98 
//    DECL_TRACER("TButtonStates::isButton(const TButtonStates& bs)");
107 
 
 99 
 
108 
    if (bs.type == type && bs.ad == ad && bs.ap == ap && bs.ch == ch && bs.cp == cp && bs.lp == lp && bs.lv == lv)
 100 
    if (bs.type == type && bs.ad == ad && bs.ap == ap && bs.ch == ch && bs.cp == cp && bs.lp == lp && bs.lv == lv)
109 
    {
 - 
 
110 
        MSG_DEBUG("Found button: ap=" << ap << ", ad=" << ad << ", ch=" << ch << ", cp=" << cp << ", lp=" << lp << ", lv=" << lv);
 - 
 
111 
        return true;
 101 
        return true;
112 
    }
 - 
 
113 
 
 102 
 
114 
    return false;
 103 
    return false;
115 
}
 104 
}