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

 #include "tpage.h"
 #include "tdrawimage.h"
 #include "texpat++.h"
 #include "tconfig.h"
 #include "terror.h"
+#include "ttpinit.h"
 #if TESTMODE == 1
 #include "testmode.h"
 #endif
 #if __cplusplus < 201402L
     if (isValidFile())
         mPath = getFileName();
     TExpat xml(mPath);
+    if (!TTPInit::isTP5())
-    xml.setEncoding(ENC_CP1250);
+        xml.setEncoding(ENC_CP1250);
+    else
+        xml.setEncoding(ENC_UTF8);
     if (!xml.parse())
         return;
     int depth = 0;
         MSG_ERROR("Invalid page type \"" << type << "\"!");
         TError::setError();
         return;
+    }
+    TError::clear();
     depth++;
     string ename, content;
     while ((index = xml.getNextElementFromIndex(index, &ename, &content, &attrs)) != TExpat::npos)
+    {
         string e = ename;
+        MSG_DEBUG("Element: " << ename << " at index " << index);
         if (e.compare("pageID") == 0)
             mPage.pageID = xml.convertElementToInt(content);
         else if (e.compare("name") == 0)
             mPage.name = content;
             index = button->initialize(&xml, index);
             button->setParentSize(mPage.width, mPage.height);
             if (TError::isError())
+            {
-                MSG_WARNING("Button \"" << button->getButtonName() << "\" deleted because of an error!");
+                MSG_WARNING("Button \"" << button->getButtonName() << "\" deleted because of an error: " << TError::getErrorMsg());
                 delete button;
                 return;
+            }
             button->setHandle(((mPage.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.
+        }
         else if (e.compare("sr") == 0)
+        {
             SR_T bsr;
             bsr.number = xml.getAttributeInt("number", attrs);
+            MSG_DEBUG("Page " << mPage.name << " at State " << bsr.number);
             index++;
             while ((index = xml.getNextElementFromIndex(index, &ename, &content, &attrs)) != TExpat::npos)
+            {
                 if (ename.compare("bs") == 0)
                     bsr.ww = xml.convertElementToInt(content);
                 else if (ename.compare("jt") == 0)
                     bsr.jt = (Button::ORIENTATION)xml.convertElementToInt(content);
                 else if (ename.compare("jb") == 0)
                     bsr.jb = (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);
+                    bsr.bitmaps.push_back(bitmapEntry);
+                    if (index == TExpat::npos)
+                        index = oldIndex + 1;
+                }
                 oldIndex = index;
+            }
             sr.push_back(bsr);
             if (index == TExpat::npos)
                 index = oldIndex + 1;
+        }
+    }
+    MSG_DEBUG("Setting SR with " << sr.size() << " elements");
     setSR(sr);
     if (TPageInterface::getButtons())
         sortButtons();
+}
     if (mPage.sr.size() > 0 && (!mPage.sr[0].bm.empty() || !mPage.sr[0].mi.empty()))
+    {
         TDrawImage dImage;
         dImage.setWidth(mPage.width);
         dImage.setHeight(mPage.height);
+        dImage.setSr(mPage.sr);
         if (!mPage.sr[0].bm.empty())
+        {
             MSG_DEBUG("Loading image " << mPage.sr[0].bm);
             sk_sp<SkData> rawImage = readImage(mPage.sr[0].bm);
         setScreenDone();
 #endif
         return;
+    }
+    if (sr.empty())
+    {
+        MSG_WARNING("Page " << mPage.name << " (" << mPage.pageID << "): The SR is empty!");
+    }
+    if (sr.size() > 0)
-    target.eraseColor(TColor::getSkiaColor(sr[0].cf));
+        target.eraseColor(TColor::getSkiaColor(sr[0].cf));
+    else
+        target.eraseColor(SK_ColorTRANSPARENT);
     // Draw the background, if any
-    if (sr.size() > 0 && (!sr[0].bm.empty() || !sr[0].mi.empty()))
+    if (sr.size() > 0 && (!sr[0].bm.empty() || !sr[0].mi.empty() || sr[0].bitmaps.size() > 0))
+    {
         TDrawImage dImage;
         dImage.setWidth(mPage.width);
         dImage.setHeight(mPage.height);
+        dImage.setSr(sr);
-        if (!sr[0].bm.empty())
+        if (!TTPInit::isTP5() && !sr[0].bm.empty())
+        {
             MSG_DEBUG("Loading image " << sr[0].bm);
             sk_sp<SkData> rawImage = readImage(sr[0].bm);
             SkBitmap bm;
+                {
                     MSG_WARNING("BM image " << sr[0].bm << " seems to be empty!");
+                }
+            }
+        }
+        else if (TTPInit::isTP5() && sr[0].bitmaps.size() > 0)
+        {
+            vector<BITMAPS_t>::iterator iter;
+            SkBitmap image;
+            for (iter = sr[0].bitmaps.begin(); iter != sr[0].bitmaps.end(); ++iter)
+            {
+                MSG_DEBUG("Loading TP5 image " << iter->fileName);
+                sk_sp<SkData> rawImage = readImage(iter->fileName);
+                SkBitmap bm;
+                if (rawImage && !rawImage->isEmpty())
+                {
+                    MSG_DEBUG("Decoding image BM ...");
+                    if (!DecodeDataToBitmap(rawImage, &bm))
+                    {
+                        MSG_WARNING("Problem while decoding image " << iter->fileName);
+                    }
+                    else if (!bm.isNull() && !bm.empty())
+                    {
+                        dImage.setImageBm(bm);
+                        SkImageInfo info = bm.info();
+                        haveImage = true;
+                        MSG_DEBUG("Image " << iter->fileName << " has dimension " << bm.width() << " x " << bm.height());
+                    }
+                    else
+                    {
+                        MSG_WARNING("BM image " << sr[0].bm << " seems to be empty!");
+                    }
+                }
+            }
+        }
         MSG_DEBUG("haveImage: " << (haveImage ? "TRUE" : "FALSE"));
         if (!sr[0].mi.empty())
+        {
                 SkRect rect = SkRect::MakeXYWH(left, top, lwidth, lheight);
                 can.drawImageRect(im, rect, &paint);
                 MSG_DEBUG("Scaled size of background image: " << left << ", " << top << ", " << lwidth << ", " << lheight);
+            }
 #endif
-/*
-            TBitmap image((unsigned char *)target.getPixels(), target.info().width(), target.info().height());
-#ifdef _OPAQUE_SKIA_
-            if (sr[0].te.empty() && sr[0].bs.empty())
-                _setBackground(handle, image, target.info().width(), target.info().height(), TColor::getColor(sr[0].cf));
-#else
-            if (sr[0].te.empty() && sr[0].bs.empty())
-                _setBackground(handle, image, target.info().width(), target.info().height(), TColor::getColor(sr[0].cf), sr[0].oo);
-#endif
-*/
+        }
+    }
     if (sr.size() > 0 && !sr[0].te.empty())
+    {
         if (drawText(mPage, &target))
             haveImage = true;
+    }
     // Check for a frame and draw it if there is one.
-    if (!sr[0].bs.empty())
+    if (sr.size() > 0 && !sr[0].bs.empty())
+    {
         if (drawFrame(mPage, &target))
             haveImage = true;
+    }
     if (haveImage)
+    {
         SkImageInfo info = target.info();
         TBitmap image((unsigned char *)target.getPixels(), info.width(), info.height());
+        if (sr.size() > 0)
+        {
 #ifdef _OPAQUE_SKIA_
-        _setBackground(handle, image, target.info().width(), target.info().height(), TColor::getColor(sr[0].cf));
+            _setBackground(handle, image, target.info().width(), target.info().height(), TColor::getColor(sr[0].cf));
 #else
-        _setBackground(handle, image, target.info().width(), target.info().height(), TColor::getColor(sr[0].cf), sr[0].oo);
+            _setBackground(handle, image, target.info().width(), target.info().height(), TColor::getColor(sr[0].cf), sr[0].oo);
 #endif
+        }
+    }
     else if (sr.size() > 0 && !haveImage)
+    {
         MSG_DEBUG("Calling \"setBackground\" with no image ...");
 #ifdef _OPAQUE_SKIA_

Subversion Repositories tpanel

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