X-Git-Url: https://git.siccegge.de//index.cgi?p=frida%2Ffrida.git;a=blobdiff_plain;f=src%2Fgui%2Fwidgets%2FBasicBlockWidget.hxx;h=557f556a33edbb0424ce4baaa583ede926b4c473;hp=8c5ef1af415b5dc05761fdcaeee67db2993b0854;hb=2ac7c08ca9536a5b0c08c6ff331241ce6b082af0;hpb=541e815a0f27feb84ad4bbb24d79c24b867a3a4e

diff --git a/src/gui/widgets/BasicBlockWidget.hxx b/src/gui/widgets/BasicBlockWidget.hxx
index 8c5ef1a..557f556 100644
--- a/src/gui/widgets/BasicBlockWidget.hxx
+++ b/src/gui/widgets/BasicBlockWidget.hxx
@@ -3,18 +3,68 @@
 class BasicBlockWidget : public QGraphicsItem
 {
 public:
-    BasicBlockWidget() {
-        x = -5;
-        y = -20;
-        dx = 250;
-        dy = 270;
-        _widget.addItem("THIS");
-        _widget.addItem("IS");
-        _widget.addItem("A");
-        _widget.addItem("TEST");
-		_widget.resize(dx-20, dy-20);
+    BasicBlockWidget(const QString& name)
+		: x(-5), y(-20)
+		, dx(270), dy(45)
+		, name(name) {
+		_widget.setGridStyle(Qt::NoPen);
+		_widget.setMinimumHeight(_widget.rowHeight(0) + 10);
+		_widget.setMaximumHeight(20);
+		_widget.resizeColumnToContents(0);
+		_widget.resizeColumnToContents(1);
+		_widget.resizeColumnToContents(2);
+		_widget.updateGeometry();
+		_widget.setMaximumWidth(260);
+		_widget.setColumnCount(3);
+		_widget.verticalHeader()->hide();
+		_widget.horizontalHeader()->hide();
+		dx = _widget.rowHeight(0) + 20;
+		if (dx < 270) dx = 270;
     }
 
+	void addItem(uint8_t* bytes, size_t num_bytes,
+				 const QString& line) {
+		size_t current_row = _widget.rowCount();
+		int column_width;
+
+		QString bytestring;
+
+		for (size_t i(0); i < num_bytes; ++i) {
+			const char * hexdigits = "0123456789ABCDEF";
+			bytestring += hexdigits[(bytes[i] >> 4) & 0xF];
+			bytestring += hexdigits[bytes[i] & 0xF];
+			bytestring += ' ';
+		}
+
+		_widget.setRowCount(current_row + 1);
+
+		_widget.setItem(current_row, 0, new QTableWidgetItem(bytestring));
+		_widget.setItem(current_row, 1, new QTableWidgetItem(line));
+		_widget.setItem(current_row, 2, new QTableWidgetItem(""));
+		_widget.updateGeometry();
+
+		_widget.resizeColumnToContents(0);
+		_widget.resizeColumnToContents(1);
+		_widget.resizeColumnToContents(2);
+
+		_widget.resizeRowToContents(current_row);
+
+		column_width =
+			_widget.columnWidth(0) +
+			_widget.columnWidth(1) +
+			_widget.columnWidth(2) +
+			2;
+
+		_widget.setMinimumWidth(column_width);
+		_widget.setMinimumHeight(_widget.rowHeight(1) * (_widget.rowCount()) + 2);
+		_widget.setMaximumHeight(_widget.rowHeight(1) * (_widget.rowCount()) + 2);
+
+
+		dy = _widget.rowHeight(0) * (_widget.rowCount()) + 25;
+		dx = column_width + 10;
+		if (dx < 270) dx = 270;
+	}
+
     QRectF boundingRect() const
     {
         qreal penWidth = 1;
@@ -28,10 +78,11 @@ public:
         painter->fillRect(x, y, dx, dy, QColor(0xcc, 0xcc, 0xff, 0xff));
         painter->setPen(QColor(0x00, 0x00, 0xff, 0xff));
         painter->drawRect(x, y, dx, dy);
-        painter->drawText(0, -5, "BLOCK");
+        painter->drawText(0, -5, name);
         _widget.render(painter);
     }
 private:
     int x, y, dx, dy;
-    QListWidget _widget;
+    QTableWidget _widget;
+	QString name;
 };