WebSVN – tpanel – Diff – /trunk/tpage.cpp

         delete p;
         p = next;
+    }
     setButtons(nullptr);
+    mSubPages.clear();
+/*
     PAGECHAIN_T *pc = mSubPages;
     PAGECHAIN_T *pc_next = nullptr;
     // We're not allowd to delete the subpages here, because they're managed
     // by the TPageManager.
         delete pc;
         pc = pc_next;
+    }
     mSubPages = nullptr;
+*/
+}
 void TPage::initialize(const string& nm)
+{
     DECL_TRACER("TPage::initialize(const string& name)");
                 index = oldIndex + 1;
+        }
+    }
     setSR(sr);
+/*
     if (TStreamError::checkFilter(HLOG_DEBUG))
+    {
         MSG_DEBUG("PageID: " << mPage.pageID);
         MSG_DEBUG("Name  : " << mPage.name);
         MSG_DEBUG("Width : " << mPage.width);
             MSG_DEBUG("   " << pos << ": mi: " << iter->mi);
             MSG_DEBUG("   " << pos << ": fi: " << iter->fi);
             pos++;
+        }
+    }
+*/
     if (TPageInterface::getButtons())
         sortButtons();
+}
 void TPage::addProgress()
     if (gPageManager && gPageManager->getPageFinished())
         gPageManager->getPageFinished()(handle);
+}
-PAGECHAIN_T *TPage::addSubPage(TSubPage* pg)
+bool TPage::addSubPage(TSubPage* pg)
+{
     DECL_TRACER("TPage::addSubPage(TSubPage* pg)");
     if (!pg)
+    {
         MSG_ERROR("Parameter is NULL!");
         TError::setError();
-        return nullptr;
+        return false;
+    }
-    PAGECHAIN_T *chain = new PAGECHAIN_T;
-    chain->subpage = pg;
+    if (mSubPages.empty())
-    chain->next = nullptr;
-    chain->prev = nullptr;
-    PAGECHAIN_T *spg = mSubPages;
-    if (spg)
-    {
-        // First make sure that the new page is not already in the chain.
-        PAGECHAIN_T *p = spg;
-        while (p)
+        mZOrder = 0;
-        {
-            if (p->subpage && p->subpage->getNumber() == pg->getNumber())
-            {
-                MSG_TRACE("Page " << pg->getNumber() << " is already in chain. Don't add it again.");
-                delete chain;
-                return p;
-            }
-            p = p->next;
-        }
-        // The subpage is not in chain. So we add it now.
-        p = spg;
+#if __cplusplus < 201703L
-        // Find the last element in chain
+    map<int, TSubPage *>::iterator iter = mSubPages.find(pg->getNumber());
-        while (p && p->next)
-            p = p->next;
-        p->next = chain;
+    if (iter != mSubPages.end() && iter->second != pg)
-        chain->prev = p;
+        iter->second = pg;
-    }
     else
+        mSubPages.insert(pair<int, TSubPage *>(pg->getNumber(), pg));
-    {
+#else
-        mZOrder = 0;
-        mSubPages = chain;
+    mSubPages.insert_or_assign(pg->getNumber(), pg);
-    }
+#endif
     mLastSubPage = 0;
-    return chain;
+    return true;
+}
 bool TPage::removeSubPage(int ID)
+{
     DECL_TRACER("TPage::removeSubPage(int ID)");
-    PAGECHAIN_T *p = mSubPages;
+    map<int, TSubPage *>::iterator iter = mSubPages.find(ID);
-    PAGECHAIN_T *prev = nullptr;
-    while (p)
+    if (iter != mSubPages.end())
+    {
-        if (p->subpage->getNumber() == ID)
-        {
-            PAGECHAIN_T *next = p->next;
-            if (prev)
-            {
-                prev->next = next;
-                next->prev = prev;
-            }
-            else
-            {
-                mSubPages = next;
+        mSubPages.erase(iter);
-                mSubPages->prev = nullptr;
-            }
-            delete p;
-            mLastSubPage = 0;
-            return true;
+        return true;
-        }
-        prev = p;
-        p = p->next;
+    }
     return false;
+}
 bool TPage::removeSubPage(const std::string& nm)
+{
     DECL_TRACER("TPage::removeSubPage(const std::string& nm)");
-    PAGECHAIN_T *p = mSubPages;
+    if (mSubPages.empty())
-    PAGECHAIN_T *prev = nullptr;
+        return false;
-    while (p)
+    map<int, TSubPage *>::iterator iter;
+    for (iter = mSubPages.begin(); iter != mSubPages.end(); ++iter)
+    {
-        if (p->subpage->getName().compare(nm) == 0)
+        if (iter->second->getName() == nm)
+        {
-            PAGECHAIN_T *next = p->next;
-            if (prev)
-            {
-                prev->next = next;
-                next->prev = prev;
-            }
-            else
-            {
-                mSubPages = next;
+            mSubPages.erase(iter);
-                mSubPages->prev = nullptr;
-            }
-            delete p;
-            mLastSubPage = 0;
             return true;
+        }
-        prev = p;
-        p = p->next;
+    }
     return false;
+}
 TSubPage *TPage::getSubPage(int pageID)
+{
     DECL_TRACER("TPage::getSubPage(int pageID)");
-    PAGECHAIN_T *pg = mSubPages;
-    while (pg)
-    {
-        if (pg->subpage->getNumber() == pageID)
+    map<int, TSubPage *>::iterator iter = mSubPages.find(pageID);
-        {
-            mLastSubPage = pageID;
-            return pg->subpage;
-        }
-        pg = pg->next;
+    if (iter != mSubPages.end())
-    }
+        return iter->second;
     mLastSubPage = 0;
     return nullptr;
+}
 TSubPage *TPage::getSubPage(const std::string& name)
+{
     DECL_TRACER("TPage::getSubPage(const std::string& name)");
-    PAGECHAIN_T *pg = mSubPages;
+    if (mSubPages.empty())
+        return nullptr;
-    while (pg)
-    {
-        if (pg->subpage->getName().compare(name) == 0)
-        {
-            mLastSubPage = pg->subpage->getNumber();
+    map<int, TSubPage *>::iterator iter;
-            return pg->subpage;
-        }
+    for (iter = mSubPages.begin(); iter != mSubPages.end(); ++iter)
+    {
+        if (iter->second->getName() == name)
-        pg = pg->next;
+            return iter->second;
+    }
     mLastSubPage = 0;
     return nullptr;
+}
 TSubPage *TPage::getFirstSubPage()
+{
     DECL_TRACER("TPage::getFirstSubPage()");
+    if (mSubPages.empty())
+    {
+        MSG_DEBUG("No subpages in chain.");
+        mLastSubPage = 0;
+        return nullptr;
+    }
-    PAGECHAIN_T *pg = mSubPages;
+    TSubPage *pg = mSubPages.begin()->second;
-    if (pg && pg->subpage)
+    if (!pg)
+    {
-        mLastSubPage = pg->subpage->getNumber();
-        MSG_DEBUG("Subpage (Z: " << pg->subpage->getZOrder() << "): " << pg->subpage->getNumber() << ". " << pg->subpage->getName());
+        MSG_ERROR("The pointer to the subpage " << mSubPages.begin()->first << " is NULL!");
-        return pg->subpage;
+        return nullptr;
+    }
-    MSG_DEBUG("No subpages in chain.");
-    mLastSubPage = 0;
+    mLastSubPage = pg->getNumber();
+    MSG_DEBUG("Subpage (Z: " << pg->getZOrder() << "): " << pg->getNumber() << ". " << pg->getName());
-    return nullptr;
+    return pg;
+}
 TSubPage *TPage::getNextSubPage()
+{
     DECL_TRACER("TPage::getNextSubPage()");
-    if (mLastSubPage > 0 && mSubPages)
+    if (mSubPages.empty())
+    {
-        PAGECHAIN_T *p = mSubPages;
+        MSG_DEBUG("No subpages in chain.");
+        mLastSubPage = 0;
+        return nullptr;
+    }
-        while (p)
+    if (mLastSubPage <= 0)
-        {
-            if (p->subpage && p->subpage->getNumber() == mLastSubPage)
-            {
-                if (p->next && p->next->subpage)
-                {
-                    TSubPage *page = p->next->subpage;
-                    mLastSubPage = page->getNumber();
+        mLastSubPage = mSubPages.begin()->second->getNumber();
-                    MSG_DEBUG("Subpage (Z: " << page->getZOrder() << "): " << page->getNumber() << ". " << page->getName());
-                    return page;
-                }
-            }
+    map<int, TSubPage *>::iterator iter = mSubPages.find(mLastSubPage);
+    if (iter != mSubPages.end())
+        iter++;
+    else
+    {
+        MSG_DEBUG("No more subpages in chain.");
+        mLastSubPage = 0;
-            p = p->next;
+        return nullptr;
-        }
+    }
+    if (iter != mSubPages.end())
+    {
+        TSubPage *page = iter->second;
+        mLastSubPage = page->getNumber();
+        MSG_DEBUG("Subpage (Z: " << page->getZOrder() << "): " << page->getNumber() << ". " << page->getName());
+        return page;
+    }
     MSG_DEBUG("No more subpages in chain.");
     mLastSubPage = 0;
     return nullptr;
 TSubPage *TPage::getPrevSubPage()
+{
     DECL_TRACER("TPage::getPrevSubPage()");
+    if (mSubPages.empty())
+    {
+        MSG_DEBUG("No last subpage or no subpages at all!");
-    if (mLastSubPage < MAX_PAGE_ID || !mSubPages)
+        mLastSubPage = 0;
         return nullptr;
+    }
-    PAGECHAIN_T *pg = mSubPages;
+    if (mLastSubPage < MAX_PAGE_ID)
-    while (pg)
+    {
-        if (pg->subpage->getNumber() == mLastSubPage)
+        map<int, TSubPage *>::iterator iter = mSubPages.end();
-        {
-            if (!pg->prev)
-            {
+        iter--;
-                mLastSubPage = 0;
+        mLastSubPage = iter->first;
-                MSG_DEBUG("No more subpages in chain.");
-                return nullptr;
-            }
+    }
-            mLastSubPage = pg->prev->subpage->getNumber();
+    map<int, TSubPage *>::iterator iter = mSubPages.find(mLastSubPage);
-            return pg->prev->subpage;
-        }
+    if (iter != mSubPages.end() && iter != mSubPages.begin())
+        iter--;
+    else
+    {
+        MSG_DEBUG("No more subpages in chain.");
+        mLastSubPage = 0;
-        pg = pg->next;
+        return nullptr;
+    }
-    MSG_DEBUG("No more subpages in chain.");
+    TSubPage *page = iter->second;
-    mLastSubPage = 0;
+    mLastSubPage = page->getNumber();
+    MSG_DEBUG("Subpage (Z: " << page->getZOrder() << "): " << page->getNumber() << ". " << page->getName());
-    return nullptr;
+    return page;
+}
 TSubPage *TPage::getLastSubPage()
+{
     DECL_TRACER("TPage::getLastSubPage()");
-    if (!mSubPages)
+    if (mSubPages.empty())
+    {
         mLastSubPage = 0;
         MSG_DEBUG("No subpages in cache!");
         return nullptr;
+    }
-    PAGECHAIN_T *pg = mSubPages;
+    map<int, TSubPage *>::iterator iter = mSubPages.end();
-    while (pg && pg->next)
+    iter--;
-        pg = pg->next;
+    TSubPage *pg = iter->second;
-    mLastSubPage = pg->subpage->getNumber();
+    mLastSubPage = pg->getNumber();
+    MSG_DEBUG("Subpage (Z: " << pg->getZOrder() << "): " << pg->getNumber() << ". " << pg->getName());
-    return pg->subpage;
+    return pg;
+}
 void TPage::drop()
+{
     DECL_TRACER("TPage::drop()");
-    PAGECHAIN_T *pc = mSubPages;
     // remove all subpages, if there are any
 #if TESTMODE == 1
     _block_screen = true;
 #endif
-    while (pc)
+    if (!mSubPages.empty())
+    {
-        if (pc->subpage)
+        map<int, TSubPage *>::iterator iter;
+        for (iter = mSubPages.begin(); iter != mSubPages.end(); ++iter)
+        {
-            MSG_DEBUG("Dropping popup " << pc->subpage->getNumber() << ": " << pc->subpage->getName());
+            if (iter->second)
-            pc->subpage->drop();
+                iter->second->drop();
+        }
-        pc = pc->next;
+    }
 #if TESTMODE == 1
     _block_screen = false;
 #endif
 void TPage::sortSubpages()
+{
     DECL_TRACER("TPage::sortSubpage()");
-    PAGECHAIN_T *pages = nullptr;
-    bool turned = false;
+    mSubPagesSorted.clear();
-    // Here we do a simple bubble sort to bring the subpages in ascending Z-order
+    if (mSubPages.empty())
-    do
+        return;
-    {
-        turned = false;
-        pages = mSubPages;
+    map<int, TSubPage *>::iterator iter;
+    for (iter = mSubPages.begin(); iter != mSubPages.end(); ++iter)
+    {
-        while (pages && pages->next)
+        if (iter->second->getZOrder() >= 0)
+        {
-            int actZ = 0;
+            mSubPagesSorted.insert(pair<int, TSubPage *>(iter->second->getZOrder(), iter->second));
+            MSG_DEBUG("Page " << iter->second->getNumber() << " (" << iter->second->getName() << "): sorted in with Z-Order " << iter->second->getZOrder());
-            int nextZ = 0;
+        }
+    }
+}
-            if (pages->next->subpage && pages->subpage)
+map<int, TSubPage *>& TPage::getSortedSubpages(bool force)
-            {
+{
-                nextZ = pages->next->subpage->getZOrder();
+    DECL_TRACER("TPage::getSortedSubpages(bool force)");
-                actZ = pages->subpage->getZOrder();
-            }
-            if (actZ > nextZ)   // Turn?
+    if (mSubPagesSorted.empty() || force)
-            {                   // Yes, then change only pointers to subpages
-                TSubPage *sp = pages->next->subpage;
-                pages->next->subpage = pages->subpage;
-                pages->subpage = sp;
+        sortSubpages();
-                turned = true;
-            }
-            pages = pages->next;
+    return mSubPagesSorted;
-        }
-    }
-    while (turned);
+}
 int TPage::getNextZOrder()
+{
     DECL_TRACER("TPage::getNextZOrder()");
     // Find highest z-order number
-    PAGECHAIN_T *pages = mSubPages;
     int cnt = 0;
+    map<int, TSubPage *>::iterator iter;
-    while(pages)
+    for (iter = mSubPages.begin(); iter != mSubPages.end(); ++iter)
+    {
+        int zo = iter->second->getZOrder();
-        if (pages->subpage && pages->subpage->getZOrder() != ZORDER_INVALID)
+        if (iter->second && zo != ZORDER_INVALID)
+        {
-            cnt++;
+            if (cnt < zo)
-            pages->subpage->setZOrder(cnt);
+                cnt = zo;
+        }
-        pages = pages->next;
+    }
     mZOrder = cnt + 1;
     MSG_DEBUG("New Z-order: " << mZOrder);
     return mZOrder;
 int TPage::decZOrder()
+{
     DECL_TRACER("TPage::decZOrder()");
     // Find highest z-order number
-    PAGECHAIN_T *pages = mSubPages;
-    int z = 0;
+    int cnt = 0;
+    map<int, TSubPage *>::iterator iter;
-    while(pages)
+    for (iter = mSubPages.begin(); iter != mSubPages.end(); ++iter)
+    {
+        int zo = iter->second->getZOrder();
-        if (pages->subpage && pages->subpage->getZOrder() != ZORDER_INVALID)
+        if (iter->second && zo != ZORDER_INVALID)
+        {
-            z++;
+            if (cnt < zo)
-            pages->subpage->setZOrder(z);
+                cnt = zo;
+        }
-        pages = pages->next;
+    }
-    mZOrder = z;
+    mZOrder = cnt;
     return mZOrder;
+}

Subversion Repositories tpanel

(root)/trunk/tpage.cpp @ 363 – Rev 348 → 349