Move stuff for BasicBlockWidget out of the header file

diff --git a/src/gui/widgets/BasicBlockWidget.cxx b/src/gui/widgets/BasicBlockWidget.cxx
index b28b04f643122b019e912540f228c8ed20be9eeb..689223cbee4ec170a1b037cbad1a9a8733afaa72 100644 (file)
--- a/src/gui/widgets/BasicBlockWidget.cxx
+++ b/src/gui/widgets/BasicBlockWidget.cxx
@@ -1,3 +1,63 @@
+#include "BasicBlockWidget.hxx"
 
+BasicBlockWidget::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 BasicBlockWidget::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;
+}

diff --git a/src/gui/widgets/BasicBlockWidget.hxx b/src/gui/widgets/BasicBlockWidget.hxx
index 557f556a33edbb0424ce4baaa583ede926b4c473..10ea402267f5fc1dd1aa0088e3dc533b28644e0e 100644 (file)
--- a/src/gui/widgets/BasicBlockWidget.hxx
+++ b/src/gui/widgets/BasicBlockWidget.hxx
@@ -1,80 +1,25 @@
 #include "gui/qt.hxx"
+#include "disassembler/BasicBlock.hxx"
 
 class BasicBlockWidget : public QGraphicsItem
 {
 public:
-    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);
+    BasicBlockWidget(const QString& name);
 
-               _widget.resizeRowToContents(current_row);
+       void addItem(uint8_t* bytes, size_t num_bytes, const QString& line);
 
-               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
-    {
+    QRectF boundingRect() const  {
         qreal penWidth = 1;
         return QRectF(x - penWidth / 2, y - penWidth / 2,
                       dx + penWidth, dy + penWidth);
     }
 
+       QPointF getEntry() const {
+               return QPointF(x + dx/2, y);
+       }
+
     void paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
-               QWidget *widget)
-    {
+               QWidget *widget) {
         painter->fillRect(x, y, dx, dy, QColor(0xcc, 0xcc, 0xff, 0xff));
         painter->setPen(QColor(0x00, 0x00, 0xff, 0xff));
         painter->drawRect(x, y, dx, dy);
@@ -85,4 +30,5 @@ private:
     int x, y, dx, dy;
     QTableWidget _widget;
        QString name;
+       BasicBlock * block;
 };