add setItemImage method to Table widget

Author: fferri

UIFunctions.cpp

@@ -156,6 +156,7 @@ void UIFunctions::connectSignals()
 #endif
 #if WIDGET_TABLE
     connect(this, &UIFunctions::setItem, uiproxy, &UIProxy::onSetItem, Qt::BlockingQueuedConnection);
+    connect(this, &UIFunctions::setItemImage, uiproxy, &UIProxy::onSetItemImage, Qt::BlockingQueuedConnection);
     connect(this, &UIFunctions::setRowHeaderText, uiproxy, &UIProxy::onSetRowHeaderText, Qt::BlockingQueuedConnection);
     connect(this, &UIFunctions::setColumnHeaderTextTable, uiproxy, &UIProxy::onSetColumnHeaderTextTable, Qt::BlockingQueuedConnection);
 #endif

UIFunctions.h

@@ -174,6 +174,7 @@ private slots:
     void setRowCount(Table *table, int count, bool suppressSignals);
     void setColumnCountTable(Table *table, int count, bool suppressSignals);
     void setItem(Table *table, int row, int col, std::string text, bool suppressSignals);
+    void setItemImage(Table *table, int row, int col, std::string data, int width, int height, bool suppressSignals);
     void setRowHeaderText(Table *table, int row, std::string text);
     void setColumnHeaderTextTable(Table *table, int col, std::string text);
     void setItemEditable(Table *table, int row, int col, bool editable);

UIProxy.cpp

@@ -1063,6 +1063,11 @@ void UIProxy::onSetItem(Table *table, int row, int column, std::string text, boo
     table->setItem(row, column, text, suppressSignals);
 }
 
+void UIProxy::onSetItemImage(Table *table, int row, int column, std::string data, int width, int height, bool suppressSignals)
+{
+    table->setItemImage(row, column, data, width, height, suppressSignals);
+}
+
 void UIProxy::onSetRowHeaderText(Table *table, int row, std::string text)
 {
     table->setRowHeaderText(row, text);

UIProxy.h

@@ -179,6 +179,7 @@ public slots:
     void onSetRowCount(Table *table, int count, bool suppressSignals);
     void onSetColumnCountTable(Table *table, int count, bool suppressSignals);
     void onSetItem(Table *table, int row, int column, std::string text, bool suppressSignals);
+    void onSetItemImage(Table *table, int row, int column, std::string data, int width, int height, bool suppressSignals);
     void onSetRowHeaderText(Table *table, int row, std::string text);
     void onSetColumnHeaderTextTable(Table *table, int column, std::string text);
     void onSetItemEditable(Table *table, int row, int column, bool editable);

callbacks.xml

@@ -1652,6 +1652,41 @@
         <return>
         </return>
     </command>
+    <command name="setItemImage">
+        <description>Change item image in the specified table widget.</description>
+        <categories>
+            <category name="table" />
+            <category name="widgets" indirect="true" />
+        </categories>
+        <params>
+            <param name="handle" type="int">
+                <description>ui handle</description>
+            </param>
+            <param name="id" type="int">
+                <description>widget id</description>
+            </param>
+            <param name="row" type="int">
+                <description>row index</description>
+            </param>
+            <param name="column" type="int">
+                <description>column index</description>
+            </param>
+            <param name="data" type="string">
+                <description>image data</description>
+            </param>
+            <param name="width" type="int">
+                <description>image width</description>
+            </param>
+            <param name="height" type="int">
+                <description>image height</description>
+            </param>
+            <param name="suppressEvents" type="bool" default="true">
+                <description>if true, no event will be generated from this call</description>
+            </param>
+        </params>
+        <return>
+        </return>
+    </command>
     <command name="getRowCount">
         <description>Get the table widget number of rows.</description>
         <categories>

tests/test-table-image.ttt

@@ -841,6 +841,14 @@ void setItem(SScriptCallBack *p, const char *cmd, setItem_in *in, setItem_out *o
 #endif
 }
 
+void setItemImage(SScriptCallBack *p, const char *cmd, setItemImage_in *in, setItemImage_out *out)
+{
+#if WIDGET_TABLE
+    Table *table = getWidget<Table>(in->handle, in->id, cmd, "table");
+    UIFunctions::getInstance()->setItemImage(table, in->row, in->column, in->data, in->width, in->height, in->suppressEvents);
+#endif
+}
+
 void getRowCount(SScriptCallBack *p, const char *cmd, getRowCount_in *in, getRowCount_out *out)
 {
 #if WIDGET_TABLE

v_repExtCustomUI.cpp

@@ -48,7 +48,7 @@ void Table::parse(Widget *parent, std::map<int, Widget*>& widgets, tinyxml2::XML
                 std::string tag2(e2->Value() ? e2->Value() : "");
                 if(tag2 != "item") continue;
                 TableItem item;
-                item.text = std::string(e2->GetText());
+                item.text = std::string(e2->GetText() ? e2->GetText() : "");
                 item.editable = xmlutils::getAttrBool(e2, "editable", true);
                 rows[rows.size()-1].push_back(item);
             }
@@ -177,7 +177,22 @@ void Table::setItem(int row, int column, std::string text, bool suppressSignals)
 {
     QTableWidget *tablewidget = static_cast<QTableWidget*>(getQWidget());
     bool oldSignalsState = tablewidget->blockSignals(suppressSignals);
-    tablewidget->setItem(row, column, new QTableWidgetItem(QString::fromStdString(text)));
+    QTableWidgetItem *item = new QTableWidgetItem;
+    item->setText(QString::fromStdString(text));
+    tablewidget->setItem(row, column, item);
+    tablewidget->blockSignals(oldSignalsState);
+}
+
+void Table::setItemImage(int row, int column, std::string data, int width, int height, bool suppressSignals)
+{
+    QTableWidget *tablewidget = static_cast<QTableWidget*>(getQWidget());
+    bool oldSignalsState = tablewidget->blockSignals(suppressSignals);
+    QTableWidgetItem *item = new QTableWidgetItem;
+    QImage::Format format = QImage::Format_RGB888;
+    int bpp = 3; // bytes per pixel
+    QImage image((unsigned char *)data.data(), width, height, bpp * width, format);
+    item->setData(Qt::DecorationRole, QPixmap::fromImage(image));
+    tablewidget->setItem(row, column, item);
     tablewidget->blockSignals(oldSignalsState);
 }
 

widgets/Table.cpp

@@ -53,6 +53,7 @@ class Table : public Widget, public EventOnKeyPress
     void setRowCount(int count, bool suppressSignals);
     void setColumnCount(int count, bool suppressSignals);
     void setItem(int row, int column, std::string text, bool suppressSignals);
+    void setItemImage(int row, int column, std::string data, int width, int height, bool suppressSignals);
     int getRowCount();
     int getColumnCount();
     std::string getItem(int row, int column);