WebSVN – tpanel – Diff – /trunk/src/tsubpage.cpp

 #include "tresources.h"
 #include "texpat++.h"
 #include "tpagemanager.h"
 #include "tsubpage.h"
 #include "tdrawimage.h"
+#include "ttpinit.h"
 #include "tconfig.h"
 #include "terror.h"
 #if TESTMODE == 1
 #include "testmode.h"
 #endif
     if (mFName.empty())
         return;
     TError::clear();
     TExpat xml(mFName);
+    if (!TTPInit::isTP5())
-    xml.setEncoding(ENC_CP1250);
+        xml.setEncoding(ENC_CP1250);
+    else
+        xml.setEncoding(ENC_UTF8);
     if (!xml.parse())
         return;
     int depth = 0;
+                }
                 button->setHandle(((mSubpage.pageID << 16) & 0xffff0000) | button->getButtonIndex());
                 button->createButtons();
                 addButton(button);
+                string sType1 = xml.getElementTypeStr(index);
+                string sType2 = xml.getElementTypeStr(index+1);
+                MSG_DEBUG("Element type 1: " << sType1);
+                MSG_DEBUG("Element type 2: " << sType2);
+                if (xml.isElementTypeEnd(index+1))
-                index++;    // Jump over the end tag of the button.
+                    index++;        // Jump over the end tag of the button.
+            }
             catch (std::exception& e)
+            {
                 MSG_ERROR("Memory exception: " << e.what());
                 TError::setError();
                     sr.et = xml.convertElementToInt(content);
                 else if (ename.compare("ww") == 0)
                     sr.ww = xml.convertElementToInt(content);
                 else if (ename.compare("jt") == 0)
                     sr.jt = (Button::ORIENTATION)xml.convertElementToInt(content);
+                else if (ename.compare("bitmapEntry") == 0)
+                {
+                    string fname;
+                    BITMAPS_t bitmapEntry;
+                    MSG_DEBUG("Section: " << ename);
+                    while ((index = xml.getNextElementFromIndex(index, &fname, &content, &attrs)) != TExpat::npos)
+                    {
+                        if (fname.compare("fileName") == 0)
+                            bitmapEntry.fileName = content;
+                        else if (fname.compare("justification") == 0)
+                            bitmapEntry.justification = static_cast<ORIENTATION>(xml.convertElementToInt(content));
+                        else if (fname.compare("offsetX") == 0)
+                            bitmapEntry.offsetX = xml.convertElementToInt(content);
+                        else if (fname.compare("offsetY") == 0)
+                            bitmapEntry.offsetY = xml.convertElementToInt(content);
+                        oldIndex = index;
+                    }
+                    MSG_DEBUG("Found image: " << bitmapEntry.fileName << ", justification: " << bitmapEntry.justification << ", Offset: " << bitmapEntry.offsetX << "x" << bitmapEntry.offsetY);
+                    sr.bitmaps.push_back(bitmapEntry);
+                    if (index == TExpat::npos)
+                        index = oldIndex + 1;
+                }
                 oldIndex = index;
+            }
             mSubpage.sr.push_back(sr);
 #endif
             return;
+        }
+    }
+    bool noSr = mSubpage.sr.empty();
     bool haveImage = false;
     ulong handle = (mSubpage.pageID << 16) & 0xffff0000;
     MSG_DEBUG("Processing subpage " << mSubpage.pageID << ": " << mSubpage.name);
     SkBitmap target;
         mSubpage.top = mSubpage.topOrig;
         mSubpage.width = mSubpage.widthOrig;
         mSubpage.height = mSubpage.heightOrig;
+    }
+    if (!noSr)
-    target.eraseColor(TColor::getSkiaColor(mSubpage.sr[0].cf));
+        target.eraseColor(TColor::getSkiaColor(mSubpage.sr[0].cf));
+    else
+        target.eraseColor(SK_ColorTRANSPARENT);
+    MSG_DEBUG("Number TP5 images: " << mSubpage.sr[0].bitmaps.size());
     // Draw the background, if any
-    if (mSubpage.sr.size() > 0 && (!mSubpage.sr[0].bm.empty() || !mSubpage.sr[0].mi.empty()))
+    if (!noSr && (!mSubpage.sr[0].bm.empty() || !mSubpage.sr[0].mi.empty() || !mSubpage.sr[0].bitmaps.empty()))
+    {
         TDrawImage dImage;
         dImage.setWidth(mSubpage.width);
         dImage.setHeight(mSubpage.height);
+        dImage.setSr(mSubpage.sr);
-        if (!mSubpage.sr[0].bm.empty())
+        if (!TTPInit::isTP5() && !mSubpage.sr[0].bm.empty())
+        {
             MSG_DEBUG("Loading image " << mSubpage.sr[0].bm);
             sk_sp<SkData> rawImage = readImage(mSubpage.sr[0].bm);
             SkBitmap bm;
+                {
                     MSG_WARNING("BM image " << mSubpage.sr[0].bm << " seems to be empty!");
+                }
+            }
+        }
+        else if (TTPInit::isTP5() && mSubpage.sr[0].bitmaps.size() > 0)
+        {
+            MSG_DEBUG("Loading TP5 image(s) ...");
+            vector<Button::BITMAPS_t>::iterator iter;
+            for (iter = mSubpage.sr[0].bitmaps.begin(); iter != mSubpage.sr[0].bitmaps.end(); ++iter)
+            {
+                sk_sp<SkData> rawImage = readImage(iter->fileName);
+                SkBitmap bm;
+                if (rawImage)
+                {
+                    MSG_DEBUG("Decoding image BM ...");
+                    if (!DecodeDataToBitmap(rawImage, &bm))
+                    {
+                        MSG_WARNING("Problem while decoding image " << iter->fileName);
+                    }
+                    else if (!bm.empty())
+                    {
+                        dImage.setImageBm(bm);
+                        SkImageInfo info = bm.info();
+                        haveImage = true;
+                    }
+                    else
+                    {
+                        MSG_WARNING("BM image " << iter->fileName << " seems to be empty!");
+                    }
+                }
+            }
+        }
         if (!mSubpage.sr[0].mi.empty())
+        {
             MSG_DEBUG("Loading image " << mSubpage.sr[0].mi);
             sk_sp<SkData> rawImage = readImage(mSubpage.sr[0].mi);
+            }
 #endif
+        }
+    }
-    if (mSubpage.sr.size() > 0 && !mSubpage.sr[0].te.empty())
+    if (!noSr && !mSubpage.sr[0].te.empty())
+    {
         MSG_DEBUG("Drawing a text only on background image ...");
         if (drawText(mSubpage, &target))
             haveImage = true;
+    }
     // Check for a frame and draw it if there is one.
-    if (!mSubpage.sr[0].bs.empty())
+    if (!noSr && !mSubpage.sr[0].bs.empty())
+    {
         if (drawFrame(mSubpage, &target))
             haveImage = true;
+    }
-    if (haveImage)
+    if (!noSr && haveImage)
+    {
 #ifdef _OPAQUE_SKIA_
         if (mSubpage.sr[0].oo < 255)
             setOpacity(&target, mSubpage.sr[0].oo);
 #endif
         _setBackground(handle, image, target.info().width(), target.info().height(), TColor::getColor(mSubpage.sr[0].cf));
 #else
         _setBackground(handle, image, target.info().width(), target.info().height(), TColor::getColor(mSubpage.sr[0].cf), mSubpage.sr[0].oo);
 #endif
+    }
-    else if (mSubpage.sr.size() > 0 && !haveImage)
+    else if (!noSr && !haveImage)
+    {
         MSG_DEBUG("Calling \"setBackground\" with no image ...");
 #ifdef _OPAQUE_SKIA_
         _setBackground(handle, TBitmap(), 0, 0, TColor::getColor(mSubpage.sr[0].cf));
 #else
             button->button->regCallPlayVideo(_playVideo);
             button->button->setFonts(getFonts());
             button->button->setPalette(mPalette);
             button->button->createButtons();
-            if (mSubpage.sr.size() > 0)
+            if (!noSr)
                 button->button->setGlobalOpacity(mSubpage.sr[0].oo);
             if (mSubpage.resetPos != 0)
                 button->button->resetButton();
     if (mSubpage.sr.size() > 0 && (!mSubpage.sr[0].bm.empty() || !mSubpage.sr[0].mi.empty()))
+    {
         TDrawImage dImage;
         dImage.setWidth(mSubpage.width);
         dImage.setHeight(mSubpage.height);
+        dImage.setSr(mSubpage.sr);
         if (!mSubpage.sr[0].bm.empty())
+        {
             MSG_DEBUG("Loading image " << mSubpage.sr[0].bm);
             sk_sp<SkData> rawImage = readImage(mSubpage.sr[0].bm);

Subversion Repositories tpanel

(root)/trunk/src/tsubpage.cpp – Rev 479 → 486