Subversion Repositories tpanel

Rev

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

Rev 429 Rev 431
Line 5265... Line 5265...
5265 
    bt->setPassword(pass);
 5265 
    bt->setPassword(pass);
5266 
    bt->doClick(x, y, true);
 5266 
    bt->doClick(x, y, true);
5267 
    bt->doClick(x, y, false);
 5267 
    bt->doClick(x, y, false);
5268 
}
 5268 
}
5269 
 
 5269 
 
5270 
TButtonStates *TPageManager::addButtonState(int rap, int rad, int rch, int rcp, int rlp, int rlv)
 5270 
TButtonStates *TPageManager::addButtonState(BUTTONTYPE t, int rap, int rad, int rch, int rcp, int rlp, int rlv)
5271 
{
 5271 
{
5272 
    DECL_TRACER("TPageManager::addButtonState(int rap, int rad, int rch, int rcp, int rlp, int rlv)");
 5272 
    DECL_TRACER("TPageManager::addButtonState(BUTTONTYPE t, int rap, int rad, int rch, int rcp, int rlp, int rlv)");
- 
 
 5273 
 
- 
 
 5274 
    TButtonStates *pbs = new TButtonStates(t, rap, rad, rch, rcp, rlp, rlv);
- 
 
 5275 
    uint32_t id = pbs->getID();
5273 
 
 5276 
 
5274 
    if (!mButtonStates.empty())
 5277 
    if (!mButtonStates.empty())
5275 
    {
 5278 
    {
5276 
        vector<TButtonStates *>::iterator iter;
 5279 
        vector<TButtonStates *>::iterator iter;
5277 
 
 5280 
 
5278 
        for (iter = mButtonStates.begin(); iter != mButtonStates.end(); ++iter)
 5281 
        for (iter = mButtonStates.begin(); iter != mButtonStates.end(); ++iter)
5279 
        {
 5282 
        {
5280 
            TButtonStates *bs = *iter;
 5283 
            TButtonStates *bs = *iter;
5281 
 
 5284 
 
5282 
            if (bs->isButton(rap, rad, rch, rcp, rlp, rlv))
 5285 
            if (bs->isButton(t, id))
- 
 
 5286 
            {
- 
 
 5287 
                delete pbs;
5283 
                return bs;
 5288 
                return bs;
- 
 
 5289 
            }
5284 
        }
 5290 
        }
5285 
    }
 5291 
    }
5286 
 
 5292 
 
5287 
    TButtonStates *bs = new TButtonStates(rap, rad, rch, rcp, rlp, rlv);
 - 
 
5288 
    mButtonStates.push_back(bs);
 5293 
    mButtonStates.push_back(pbs);
5289 
    return bs;
 5294 
    return pbs;
5290 
}
 5295 
}
5291 
 
 5296 
 
5292 
TButtonStates *TPageManager::addButtonState(const TButtonStates& bs)
 5297 
TButtonStates *TPageManager::addButtonState(const TButtonStates& rbs)
5293 
{
 5298 
{
5294 
    DECL_TRACER("TPageManager::addButtonState(const TButtonStates& bs)");
 5299 
    DECL_TRACER("TPageManager::addButtonState(const TButtonStates& rbs)");
5295 
 
 5300 
 
5296 
    if (!mButtonStates.empty())
 5301 
    if (!mButtonStates.empty())
5297 
    {
 5302 
    {
5298 
        vector<TButtonStates *>::iterator iter;
 5303 
        vector<TButtonStates *>::iterator iter;
- 
 
 5304 
        TButtonStates bs = rbs;
- 
 
 5305 
        BUTTONTYPE type = bs.getType();
- 
 
 5306 
        uint32_t id = bs.getID();
5299 
 
 5307 
 
5300 
        for (iter = mButtonStates.begin(); iter != mButtonStates.end(); ++iter)
 5308 
        for (iter = mButtonStates.begin(); iter != mButtonStates.end(); ++iter)
5301 
        {
 5309 
        {
5302 
            TButtonStates *pbs = *iter;
 5310 
            TButtonStates *pbs = *iter;
5303 
 
 5311 
 
5304 
            if (pbs->isButton(bs))
 5312 
            if (pbs->isButton(type, id))
5305 
                return pbs;
 5313 
                return pbs;
5306 
        }
 5314 
        }
5307 
    }
 5315 
    }
5308 
 
 5316 
 
5309 
    TButtonStates *pbs = new TButtonStates(bs);
 5317 
    TButtonStates *pbs = new TButtonStates(rbs);
5310 
    mButtonStates.push_back(pbs);
 5318 
    mButtonStates.push_back(pbs);
5311 
    return pbs;
 5319 
    return pbs;
5312 
}
 5320 
}
5313 
 
 5321 
 
5314 
TButtonStates *TPageManager::getButtonState(int rap, int rad, int rch, int rcp, int rlp, int rlv)
 5322 
TButtonStates *TPageManager::getButtonState(BUTTONTYPE t, int rap, int rad, int rch, int rcp, int rlp, int rlv)
- 
 
 5323 
{
- 
 
 5324 
    DECL_TRACER("TPageManager::getButtonState(BUTTONTYPE t, int rap, int rad, int rch, int rcp, int rlp, int rlv)");
- 
 
 5325 
 
- 
 
 5326 
    if (mButtonStates.empty())
- 
 
 5327 
        return nullptr;
- 
 
 5328 
 
- 
 
 5329 
    vector<TButtonStates *>::iterator iter;
- 
 
 5330 
    MSG_DEBUG("Found " << mButtonStates.size() << " button states.");
- 
 
 5331 
 
- 
 
 5332 
    for (iter = mButtonStates.begin(); iter != mButtonStates.end(); ++iter)
- 
 
 5333 
    {
- 
 
 5334 
        TButtonStates *bs = *iter;
- 
 
 5335 
 
- 
 
 5336 
        if (bs->isButton(t, rap, rad, rch, rcp, rlp, rlv))
- 
 
 5337 
            return bs;
- 
 
 5338 
    }
- 
 
 5339 
 
- 
 
 5340 
    return nullptr;
- 
 
 5341 
}
- 
 
 5342 
 
- 
 
 5343 
TButtonStates *TPageManager::getButtonState(uint32_t id)
- 
 
 5344 
{
- 
 
 5345 
    DECL_TRACER("TPageManager::getButtonState(uint32_t id)");
- 
 
 5346 
 
- 
 
 5347 
    if (mButtonStates.empty())
- 
 
 5348 
        return nullptr;
- 
 
 5349 
 
- 
 
 5350 
    vector<TButtonStates *>::iterator iter;
- 
 
 5351 
    MSG_DEBUG("Found " << mButtonStates.size() << " button states.");
- 
 
 5352 
 
- 
 
 5353 
    for (iter = mButtonStates.begin(); iter != mButtonStates.end(); ++iter)
- 
 
 5354 
    {
- 
 
 5355 
        TButtonStates *bs = *iter;
- 
 
 5356 
 
- 
 
 5357 
        if (bs->isButton(id))
- 
 
 5358 
            return bs;
- 
 
 5359 
    }
- 
 
 5360 
 
- 
 
 5361 
    return nullptr;
- 
 
 5362 
}
- 
 
 5363 
 
- 
 
 5364 
TButtonStates *TPageManager::getButtonState(BUTTONTYPE t, uint32_t id)
5315 
{
 5365 
{
5316 
    DECL_TRACER("TPageManager::getButtonState(int rap, int rad, int rch, int rcp, int rlp, int rlv)");
 5366 
    DECL_TRACER("TPageManager::getButtonState(BUTTONTYPE t, uint32_t id)");
5317 
 
 5367 
 
5318 
    if (mButtonStates.empty())
 5368 
    if (mButtonStates.empty())
5319 
        return nullptr;
 5369 
        return nullptr;
5320 
 
 5370 
 
5321 
    vector<TButtonStates *>::iterator iter;
 5371 
    vector<TButtonStates *>::iterator iter;
Line 5323... Line 5373...
5323 
 
 5373 
 
5324 
    for (iter = mButtonStates.begin(); iter != mButtonStates.end(); ++iter)
 5374 
    for (iter = mButtonStates.begin(); iter != mButtonStates.end(); ++iter)
5325 
    {
 5375 
    {
5326 
        TButtonStates *bs = *iter;
 5376 
        TButtonStates *bs = *iter;
5327 
 
 5377 
 
5328 
        if (bs->isButton(rap, rad, rch, rcp, rlp, rlv))
 5378 
        if (bs->isButton(t, id))
5329 
            return bs;
 5379 
            return bs;
5330 
    }
 5380 
    }
5331 
 
 5381 
 
5332 
    return nullptr;
 5382 
    return nullptr;
5333 
}
 5383 
}