1 files changed, 63 insertions, 27 deletions

diff --git a/qtmips_gui/coreview/connection.cpp b/qtmips_gui/coreview/connection.cpp
index f2b730c..85f7a96 100644
--- a/qtmips_gui/coreview/connection.cpp
+++ b/qtmips_gui/coreview/connection.cpp
@@ -1,11 +1,16 @@
 #include "connection.h"
+#include <cmath>
 
 using namespace coreview;
 
+Connector::Connector(qreal angle) {
+    ang = angle;
+}
+
 void Connector::setPos(qreal x, qreal y) {
     qx = x;
     qy = y;
-    emit updated();
+    emit updated(QPointF(qx, qy));
 }
 
 qreal Connector::x() const {
@@ -16,16 +21,28 @@ qreal Connector::y() const {
     return qy;
 }
 
+QLineF Connector::vector() const {
+    return QLineF(point(), QPointF(x() + cos(ang), y() + sin(ang)));
+}
+
 QPointF Connector::point() const {
     return QPointF(qx, qy);
 }
 
+qreal Connector::angle() const {
+    return ang;
+}
+
 Connection::Connection(const Connector *a, const Connector *b) : QGraphicsObject(nullptr) {
-    connect(a, SIGNAL(updated()), this, SLOT(moved()));
-    connect(b, SIGNAL(updated()), this, SLOT(moved()));
-    this->a = a;
-    this->b = b;
-    update_pos();
+    pen_width = 1;
+
+    ang_start = a->angle();
+    ang_end = b->angle();
+
+    connect(a, SIGNAL(updated(QPointF)), this, SLOT(moved_start(QPointF)));
+    connect(b, SIGNAL(updated(QPointF)), this, SLOT(moved_end(QPointF)));
+    moved_start(a->point());
+    moved_end(b->point());
 }
 
 void Connection::setHasText(bool has) {
@@ -35,7 +52,6 @@ void Connection::setHasText(bool has) {
     } else if (!has && value != nullptr) {
         delete value;
     }
-    update_pos();
 }
 
 void Connection::setText(QString val) {
@@ -44,36 +60,56 @@ void Connection::setText(QString val) {
         value->setText(val);
 }
 
-void Connection::moved() {
-    update_pos();
+void Connection::setAxes(QVector<QLineF> axes) {
+    break_axes = axes;
+}
+
+void Connection::moved_start(QPointF p) {
+    p_start = p;
+    recalc_line();
+}
+
+void Connection::moved_end(QPointF p) {
+    p_end = p;
+    recalc_line();
 }
 
 QRectF Connection::boundingRect() const {
     QRectF rect;
     for (int i = 0; i < (points.size() - 1); i++) {
-        qreal x = points[i].x();
-        if (x > points[i+1].x())
-            x = points[i+1].x();
-        qreal y = points[i].y();
-        if (y > points[i+1].y())
-            y = points[i+1].y();
-        // TODO pen width
-        rect = rect.united(QRectF(x - 0.5, y - 0.5, fabs(points[i].x() - points[i+1].x()) + 1, fabs(points[i].y() - points[i+1].y()) + 1));
+        qreal x = points[i].x() > points[i+1].x() ? points[i].x() : points[i+1].x();
+        qreal y = points[i].y() > points[i+1].y() ? points[i].y() : points[i+1].y();
+        rect |= QRectF(x - pen_width/2.0, y - pen_width/2.0, fabs(points[i].x() - points[i+1].x()) + pen_width, fabs(points[i].y() - points[i+1].y()) + pen_width);
     }
-    //return rect;
-    return QRectF(0, 0, 300, 300);
+    return rect;
 }
 
 void Connection::paint(QPainter *painter, const QStyleOptionGraphicsItem *option __attribute__((unused)), QWidget *widget __attribute__((unused))) {
-    for (int i = 0; i < (points.size() - 1); i++)
-        painter->drawLine(points[i], points[i+1]);
-    // TODO meaby use QPath instead?
+    QPen pen;
+    pen.setWidth(pen_width);
+    // TODO color?
+    painter->setPen(pen);
+
+    painter->drawPolyline(QPolygonF(points));
 }
 
-void Connection::update_pos() {
+void Connection::recalc_line() {
     points.clear();
-    points.append(a->point());
-    points.append(b->point());
-    // TODO more than one line
-    // TODO update position of value
+
+    points.append(p_start);
+
+    QLineF cur_l(p_start, QPointF(p_start.x() + cos(ang_start), p_start.y() + sin(ang_start)));
+    for (int i = 0; i < break_axes.size(); i++) {
+        recalc_line_add_point(cur_l, break_axes[i]);
+        cur_l = break_axes[i];
+    }
+    recalc_line_add_point(cur_l, QLineF(QPoint(p_end.x() + cos(ang_end), p_end.y() + sin(ang_end)), p_end));
+
+    points.append(p_end);
+}
+
+void Connection::recalc_line_add_point(const QLineF &l1, const QLineF &l2) {
+    QPointF intersec;
+    if (l1.intersect(l2, &intersec) != QLineF::NoIntersection)
+        points.append(intersec);
 }