Subversion Repositories tpanel

Rev

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

Rev 111 Rev 118
Line 157... Line 157...
157
 
157
 
158
    if (pal.size() > 0)
158
    if (pal.size() > 0)
159
    {
159
    {
160
        vector<PALETTE_SETUP>::iterator iterPal;
160
        vector<PALETTE_SETUP>::iterator iterPal;
161
 
161
 
162
        for (iterPal = pal.begin(); iterPal != pal.end(); iterPal++)
162
        for (iterPal = pal.begin(); iterPal != pal.end(); ++iterPal)
163
            mPalette->initialize(iterPal->file);
163
            mPalette->initialize(iterPal->file);
164
    }
164
    }
165
 
165
 
166
    if (!TError::isError())
166
    if (!TError::isError())
167
        TColor::setPalette(mPalette);
167
        TColor::setPalette(mPalette);
Line 205... Line 205...
205
 
205
 
206
    if (popups.size() > 0)
206
    if (popups.size() > 0)
207
    {
207
    {
208
        vector<string>::iterator iter;
208
        vector<string>::iterator iter;
209
 
209
 
210
        for (iter = popups.begin(); iter != popups.end(); iter++)
210
        for (iter = popups.begin(); iter != popups.end(); ++iter)
211
        {
211
        {
212
            if (readSubPage(*iter))
212
            if (readSubPage(*iter))
213
            {
213
            {
214
                MSG_TRACE("Found power up popup " << *iter);
214
                MSG_TRACE("Found power up popup " << *iter);
215
 
215
 
Line 506... Line 506...
506
 
506
 
507
    if (pal.size() > 0)
507
    if (pal.size() > 0)
508
    {
508
    {
509
        vector<PALETTE_SETUP>::iterator iterPal;
509
        vector<PALETTE_SETUP>::iterator iterPal;
510
 
510
 
511
        for (iterPal = pal.begin(); iterPal != pal.end(); iterPal++)
511
        for (iterPal = pal.begin(); iterPal != pal.end(); ++iterPal)
512
            mPalette->initialize(iterPal->file);
512
            mPalette->initialize(iterPal->file);
513
    }
513
    }
514
 
514
 
515
    if (!TError::isError())
515
    if (!TError::isError())
516
        TColor::setPalette(mPalette);
516
        TColor::setPalette(mPalette);
Line 567... Line 567...
567
 
567
 
568
    if (popups.size() > 0)
568
    if (popups.size() > 0)
569
    {
569
    {
570
        vector<string>::iterator iter;
570
        vector<string>::iterator iter;
571
 
571
 
572
        for (iter = popups.begin(); iter != popups.end(); iter++)
572
        for (iter = popups.begin(); iter != popups.end(); ++iter)
573
        {
573
        {
574
            if (readSubPage(*iter))
574
            if (readSubPage(*iter))
575
            {
575
            {
576
                MSG_TRACE("Found power up popup " << *iter);
576
                MSG_TRACE("Found power up popup " << *iter);
577
 
577
 
Line 1175... Line 1175...
1175
 
1175
 
1176
    if (pageList.size() > 0)
1176
    if (pageList.size() > 0)
1177
    {
1177
    {
1178
        vector<PAGELIST_T>::iterator pgIter;
1178
        vector<PAGELIST_T>::iterator pgIter;
1179
 
1179
 
1180
        for (pgIter = pageList.begin(); pgIter != pageList.end(); pgIter++)
1180
        for (pgIter = pageList.begin(); pgIter != pageList.end(); ++pgIter)
1181
        {
1181
        {
1182
            TPage *page = new TPage(pgIter->name+".xml");
1182
            TPage *page = new TPage(pgIter->name+".xml");
1183
 
1183
 
1184
            if (TError::isError())
1184
            if (TError::isError())
1185
            {
1185
            {
Line 1202... Line 1202...
1202
 
1202
 
1203
    if (subPageList.size() > 0)
1203
    if (subPageList.size() > 0)
1204
    {
1204
    {
1205
        vector<SUBPAGELIST_T>::iterator spgIter;
1205
        vector<SUBPAGELIST_T>::iterator spgIter;
1206
 
1206
 
1207
        for (spgIter = subPageList.begin(); spgIter != subPageList.end(); spgIter++)
1207
        for (spgIter = subPageList.begin(); spgIter != subPageList.end(); ++spgIter)
1208
        {
1208
        {
1209
            TSubPage *page = new TSubPage(spgIter->name+".xml");
1209
            TSubPage *page = new TSubPage(spgIter->name+".xml");
1210
 
1210
 
1211
            if (TError::isError())
1211
            if (TError::isError())
1212
            {
1212
            {
Line 1391... Line 1391...
1391
 
1391
 
1392
    if (pageList.size() > 0)
1392
    if (pageList.size() > 0)
1393
    {
1393
    {
1394
        vector<PAGELIST_T>::iterator pgIter;
1394
        vector<PAGELIST_T>::iterator pgIter;
1395
 
1395
 
1396
        for (pgIter = pageList.begin(); pgIter != pageList.end(); pgIter++)
1396
        for (pgIter = pageList.begin(); pgIter != pageList.end(); ++pgIter)
1397
        {
1397
        {
1398
            if (pgIter->name.compare(name) == 0)
1398
            if (pgIter->name.compare(name) == 0)
1399
                return *pgIter;
1399
                return *pgIter;
1400
        }
1400
        }
1401
    }
1401
    }
Line 1411... Line 1411...
1411
 
1411
 
1412
    if (pageList.size() > 0)
1412
    if (pageList.size() > 0)
1413
    {
1413
    {
1414
        vector<PAGELIST_T>::iterator pgIter;
1414
        vector<PAGELIST_T>::iterator pgIter;
1415
 
1415
 
1416
        for (pgIter = pageList.begin(); pgIter != pageList.end(); pgIter++)
1416
        for (pgIter = pageList.begin(); pgIter != pageList.end(); ++pgIter)
1417
        {
1417
        {
1418
            if (pgIter->pageID == ID)
1418
            if (pgIter->pageID == ID)
1419
                return *pgIter;
1419
                return *pgIter;
1420
        }
1420
        }
1421
    }
1421
    }
Line 1431... Line 1431...
1431
 
1431
 
1432
    if (pageList.size() > 0)
1432
    if (pageList.size() > 0)
1433
    {
1433
    {
1434
        vector<SUBPAGELIST_T>::iterator pgIter;
1434
        vector<SUBPAGELIST_T>::iterator pgIter;
1435
 
1435
 
1436
        for (pgIter = pageList.begin(); pgIter != pageList.end(); pgIter++)
1436
        for (pgIter = pageList.begin(); pgIter != pageList.end(); ++pgIter)
1437
        {
1437
        {
1438
            if (pgIter->name.compare(name) == 0)
1438
            if (pgIter->name.compare(name) == 0)
1439
                return *pgIter;
1439
                return *pgIter;
1440
        }
1440
        }
1441
    }
1441
    }
Line 1451... Line 1451...
1451
 
1451
 
1452
    if (pageList.size() > 0)
1452
    if (pageList.size() > 0)
1453
    {
1453
    {
1454
        vector<SUBPAGELIST_T>::iterator pgIter;
1454
        vector<SUBPAGELIST_T>::iterator pgIter;
1455
 
1455
 
1456
        for (pgIter = pageList.begin(); pgIter != pageList.end(); pgIter++)
1456
        for (pgIter = pageList.begin(); pgIter != pageList.end(); ++pgIter)
1457
        {
1457
        {
1458
            if (pgIter->pageID == ID)
1458
            if (pgIter->pageID == ID)
1459
                return *pgIter;
1459
                return *pgIter;
1460
        }
1460
        }
1461
    }
1461
    }
Line 1855... Line 1855...
1855
        if (regions.size() > 0)
1855
        if (regions.size() > 0)
1856
        {
1856
        {
1857
            vector<RECT_T>::iterator iter;
1857
            vector<RECT_T>::iterator iter;
1858
            int zo = 0;
1858
            int zo = 0;
1859
 
1859
 
1860
            for (iter = regions.begin(); iter != regions.end(); iter++)
1860
            for (iter = regions.begin(); iter != regions.end(); ++iter)
1861
            {
1861
            {
1862
                if (doOverlap(*iter, r) && zPos > zo)
1862
                if (doOverlap(*iter, r) && zPos > zo)
1863
                    top = pg;
1863
                    top = pg;
1864
 
1864
 
1865
                zo++;
1865
                zo++;
Line 1895... Line 1895...
1895
    // Iterate in reverse order through array
1895
    // Iterate in reverse order through array
1896
    if (zOrder.size() > 0)
1896
    if (zOrder.size() > 0)
1897
    {
1897
    {
1898
        map<int, TSubPage *>::reverse_iterator iter;
1898
        map<int, TSubPage *>::reverse_iterator iter;
1899
 
1899
 
1900
        for (iter = zOrder.rbegin(); iter != zOrder.rend(); iter++)
1900
        for (iter = zOrder.rbegin(); iter != zOrder.rend(); ++iter)
1901
        {
1901
        {
1902
            RECT_T r = iter->second->getRegion();
1902
            RECT_T r = iter->second->getRegion();
1903
 
1903
 
1904
            if (r.left <= realX && (r.left + r.width) >= realX &&
1904
            if (r.left <= realX && (r.left + r.width) >= realX &&
1905
                r.top <= realY && (r.top + r.height) >= realY)
1905
                r.top <= realY && (r.top + r.height) >= realY)
Line 2263... Line 2263...
2263
 
2263
 
2264
    if (buttons.size() > 0)
2264
    if (buttons.size() > 0)
2265
    {
2265
    {
2266
        vector<Button::TButton *>::iterator mapIter;
2266
        vector<Button::TButton *>::iterator mapIter;
2267
        // Finaly we iterate through all found buttons and set the text
2267
        // Finaly we iterate through all found buttons and set the text
2268
        for (mapIter = buttons.begin(); mapIter != buttons.end(); mapIter++)
2268
        for (mapIter = buttons.begin(); mapIter != buttons.end(); ++mapIter)
2269
        {
2269
        {
2270
            Button::TButton *bt = *mapIter;
2270
            Button::TButton *bt = *mapIter;
2271
 
2271
 
2272
            int bst = bt->getNumberInstances();
2272
            int bst = bt->getNumberInstances();
2273
 
2273
 
Line 2286... Line 2286...
2286
    if (map.size() == 0)
2286
    if (map.size() == 0)
2287
        return buttons;
2287
        return buttons;
2288
 
2288
 
2289
    vector<MAP_T>::iterator iter;
2289
    vector<MAP_T>::iterator iter;
2290
 
2290
 
2291
    for (iter = map.begin(); iter != map.end(); iter++)
2291
    for (iter = map.begin(); iter != map.end(); ++iter)
2292
    {
2292
    {
2293
        if (iter->pg < 500)     // Main page?
2293
        if (iter->pg < 500)     // Main page?
2294
        {
2294
        {
2295
            TPage *page;
2295
            TPage *page;
2296
 
2296
 
Line 2820... Line 2820...
2820
 
2820
 
2821
    if (buttons.size() > 0)
2821
    if (buttons.size() > 0)
2822
    {
2822
    {
2823
        vector<Button::TButton *>::iterator mapIter;
2823
        vector<Button::TButton *>::iterator mapIter;
2824
 
2824
 
2825
        for (mapIter = buttons.begin(); mapIter != buttons.end(); mapIter++)
2825
        for (mapIter = buttons.begin(); mapIter != buttons.end(); ++mapIter)
2826
        {
2826
        {
2827
            Button::TButton *bt = *mapIter;
2827
            Button::TButton *bt = *mapIter;
2828
 
2828
 
2829
            if (bt->getButtonType() == Button::GENERAL)
2829
            if (bt->getButtonType() == Button::GENERAL)
2830
                bt->setActive(1);
2830
                bt->setActive(1);
Line 2861... Line 2861...
2861
 
2861
 
2862
    if (buttons.size() > 0)
2862
    if (buttons.size() > 0)
2863
    {
2863
    {
2864
        vector<Button::TButton *>::iterator mapIter;
2864
        vector<Button::TButton *>::iterator mapIter;
2865
 
2865
 
2866
        for (mapIter = buttons.begin(); mapIter != buttons.end(); mapIter++)
2866
        for (mapIter = buttons.begin(); mapIter != buttons.end(); ++mapIter)
2867
        {
2867
        {
2868
            Button::TButton *bt = *mapIter;
2868
            Button::TButton *bt = *mapIter;
2869
 
2869
 
2870
            if (bt->getButtonType() == Button::GENERAL)
2870
            if (bt->getButtonType() == Button::GENERAL)
2871
                bt->setActive(0);
2871
                bt->setActive(0);
Line 2906... Line 2906...
2906
 
2906
 
2907
    if (buttons.size() > 0)
2907
    if (buttons.size() > 0)
2908
    {
2908
    {
2909
        vector<Button::TButton *>::iterator mapIter;
2909
        vector<Button::TButton *>::iterator mapIter;
2910
 
2910
 
2911
        for (mapIter = buttons.begin(); mapIter != buttons.end(); mapIter++)
2911
        for (mapIter = buttons.begin(); mapIter != buttons.end(); ++mapIter)
2912
        {
2912
        {
2913
            Button::TButton *bt = *mapIter;
2913
            Button::TButton *bt = *mapIter;
2914
 
2914
 
2915
            if (bt->getButtonType() == Button::BARGRAPH)
2915
            if (bt->getButtonType() == Button::BARGRAPH)
2916
                bt->drawBargraph(bt->getActiveInstance(), level);
2916
                bt->drawBargraph(bt->getActiveInstance(), level);