Changes to test area

Author: ebrunt

area.cpp

@@ -16,9 +16,15 @@ double areaTrapezoid(double l1, double l2, double l3, double l4) {
         l2 = l3;
         l3 = temp;
     }
-    area = (l2+l3) / (4 * (l2-l3));
-    temp = (l2 + l1 - l3 + l4) * (l2 - l1 - l3 + l4) * (l2 + l1 - l3 - l4) * (-l2 + l1 + l3 + l4);
-    area = area * sqrt(temp);
+    double temp1 = (l2 + l1 - l3 + l4);
+    double temp2 = (l2 - l1 - l3 + l4);
+    double temp3 = (l2 + l1 - l3 - l4);
+    double temp4 = (-l2 + l1 + l3 + l4);
+    if (abs(temp1*temp2*temp3*temp4) < 0.00001) {
+        qDebug() << "Area is less than 0";
+    }
+    area = sqrt(temp1*temp2*temp3*temp4);
+    area = area*(l2+l3)/(4*(l2-l3));
     return area;
 }
 
@@ -29,42 +35,4 @@ double areaTriangle(double l1, double l2, double l3) {
     area = sqrt(area);
     return area;
 }
-double chestArea(Vertex minx, Vertex maxx, QVector<QPair<Vertex, Vertex>> sliceSegments) {
-    double area = 0.0;
-
-    for (long i = 0; i < sliceSegments.size(); ++i) {
-        Vertex slice_v1 = sliceSegments[i].first;
-        Vertex slice_v2 = sliceSegments[i].second;
-
-        double slope = (minx.x - maxx.x) / (minx.y - maxx.y);
-        double z_v1 = slope * (slice_v1.x - maxx.x) + maxx.y;
-        double z_v2 = slope * (slice_v2.x - maxx.x) + maxx.y;
-
-        //Size of the segment on the chest
-        double line1 = distance(slice_v1.x, slice_v1.z, slice_v2.x, slice_v2.z);
-        //From vertex on the chest to the horizontal line
-        double line2 = distance(slice_v1.x, slice_v1.z, slice_v1.x, z_v1);
-        double line3 = distance(slice_v2.x, slice_v2.z, slice_v2.x, z_v2);
-        //length on the horizontal line
-        double line4 = distance(slice_v1.x, z_v1, slice_v2.x, z_v2);
-
-        double temp_area = areaTrapezoid(line1, line2, line3, line4);
-        area += temp_area;
-    }
-    return area;
-}
-
-double defectArea(Vertex v1, Vertex v2, QVector<QPair<Vertex, Vertex>> defectSegments) {
-    double area = 0.0;
-    double x = (v1.x + v2.x) / 2;
-    double y = (v1.y + v2.y) / 2;
 
-    for (int i = 0; i < defectSegments.size(); ++i) {
-        double l1 = distance(x, defectSegments[i].first.x, y, defectSegments[i].first.y);
-        double l2 = distance(x, defectSegments[i].second.x, y, defectSegments[i].second.y);
-        double l3 = distance(defectSegments[i].second.x, defectSegments[i].first.x,
-                             defectSegments[i].second.y, defectSegments[i].first.y);
-        area += areaTriangle(l1, l2, l3);
-    }
-    return area;
-}

area.h

@@ -6,12 +6,9 @@
 #include <QtMath>
 #include <QDebug>
 #include <QFile>
-#include "pectusprocessor.h"
 
 double distance(double x1, double x2, double y1, double y2);
 double areaTrapezoid(double l1, double l2, double l3, double l4);
 double areaTriangle(double l1, double l2, double l3);
-double defectArea(Vertex v1, Vertex v2, QVector<QPair<Vertex, Vertex>> defectSegments);
-double chestArea(Vertex minx, Vertex maxx, QVector<QPair<Vertex, Vertex>> sliceSegments);
 
 #endif // AREA_H

main.qml

@@ -297,6 +297,19 @@ ApplicationWindow {
                 }
             }
 
+            Rectangle {
+                id: indiceBox
+                anchors.top: renderScanButton.bottom
+
+                Text {
+                    id: hallerText
+                    visible: myProcessor.hallerIndexVisible
+                    text: "Haller Index: " + myProcessor.hallerIndex
+                    anchors.top: indiceBox.top
+                    anchors.topMargin: 10
+                }
+            }
+
             FileDialog {
                 id: fileDialog
                 title: "Choose a 3D Model File"
@@ -333,6 +346,43 @@ ApplicationWindow {
             anchors.rightMargin: 20
 
             height: 300
+            Row {
+                id: indexButtonRow
+                anchors.bottom: sliceButtonRow.top
+                anchors.bottomMargin: 5
+                spacing: 3
+                Button {
+                    id: hallerIndex
+                    text: "Haller Index"
+                    onClicked: {
+                        myProcessor.calculateHallerIndex();
+                    }
+                }
+                Button {
+                    id: defectLine
+                    text: "Defect"
+                    onClicked: {
+                        myProcessor.findDefectPoint();
+                    }
+                }
+                Button {
+                    id:fixedIntersection
+                    text: "Fixed"
+                    onClicked: {
+                        myProcessor.getFixedIntersection();
+                        console.log("Drawing fixed intersection");
+                        myProcessor.drawLineSegments();
+                    }
+                }
+                Button {
+                    id: chestArea
+                    text: "Area"
+                    onClicked: {
+                        myProcessor.chestArea();
+
+                    }
+                }
+            }
 
             Row {
                 id: sliceButtonRow
@@ -377,45 +427,6 @@ ApplicationWindow {
                         myProcessor.eraseArms(sliceCanvas.width, sliceCanvas.height)
                    }
                 }
-                Button {
-                    id: hallerIndex
-                    text: "Haller Index"
-                    onClicked: {
-                        myProcessor.calculateHallerIndex();
-                    }
-                }
-                Button {
-                    id: defectLine
-                    text: "Defect"
-                    onClicked: {
-                        myProcessor.findDefectPoint();
-                    }
-                }
-                Button {
-                    id:fixedIntersection
-                    text: "Fixed"
-                    onClicked: {
-                        myProcessor.getFixedIntersection();
-                        console.log("Drawing fixed intersection");
-                        myProcessor.drawLineSegments();
-                    }
-                }
-                Button {
-                    id: chestArea
-                    text: "Area"
-                    onClicked: {
-
-                    }
-                }
-
-            }
-            Text {
-                id: hallerText
-                visible: myProcessor.hallerIndexVisible
-                text: "Haller Index: " + myProcessor.hallerIndex
-                anchors.right: sliceButtonRow.right
-                anchors.bottom: sliceButtonRow.top
-                anchors.topMargin: 10
             }
 
             SliceCanvas {

pectusprocessor.cpp

@@ -712,30 +712,47 @@ QVector<QPair<Vertex,Vertex>> PectusProcessor::findLargestSet(){
     return connected;
 }
 
-using namespace QtDataVisualization;
-void PectusProcessor::createSurfaceModel(const QVector<Vertex> & vertices, const QVector<Face> & faces) {
-    int i = 0;
-    QSurfaceDataArray *model_data = new QSurfaceDataArray;
-    while (i < faces.size()){
-        float v1x = vertices[faces[i].vertex1Index].x;
-        float v1y = vertices[faces[i].vertex1Index].y;
-        float v1z = vertices[faces[i].vertex1Index].z;
-        float v2x = vertices[faces[i].vertex2Index].x;
-        float v2y = vertices[faces[i].vertex2Index].y;
-        float v2z = vertices[faces[i].vertex2Index].z;
-        float v3x = vertices[faces[i].vertex3Index].x;
-        float v3y = vertices[faces[i].vertex3Index].y;
-        float v3z = vertices[faces[i].vertex3Index].z;
-
-        QSurfaceDataRow * face = new QSurfaceDataRow;
-        QVector3D * v1 = new QVector3D(v1x, v1y, v1z);
-        QVector3D * v2 = new QVector3D(v2x, v2y, v2z);
-        QVector3D * v3 = new QVector3D(v3x, v3y, v3z);
-
-        *face << *v1 << *v2 << *v3;
-        *model_data << face;
+double PectusProcessor::chestArea() {
+    double area = 0.0;
+    for (long i = 0; i < sliceSegments.size(); ++i) {
+        Vertex slice_v1 = sliceSegments[i].first;
+        Vertex slice_v2 = sliceSegments[i].second;
+
+        double slope = (minx.z - maxx.z) / (minx.x - maxx.x);
+
+        double z_v1 = slope * (slice_v1.x - maxx.x) + maxx.z;
+        double z_v2 = slope * (slice_v2.x - maxx.x) + maxx.z;
+
+        //qDebug() << slope << z_v1 << z_v2;
+        //Size of the segment on the chest
+        double line1 = distance(slice_v1.x, slice_v1.z, slice_v2.x, slice_v2.z);
+        //From vertex on the chest to the horizontal line
+        double line2 = distance(slice_v1.x, slice_v1.z, slice_v1.x, z_v1);
+        double line3 = distance(slice_v2.x, slice_v2.z, slice_v2.x, z_v2);
+        //length on the horizontal line
+        double line4 = distance(slice_v1.x, z_v1, slice_v2.x, z_v2);
+
+        qDebug() << line1 << line2 << line3 << line4;
+
+        double temp_area = areaTrapezoid(line1, line2, line3, line4);
+        //qDebug() << temp_area;
+        area += temp_area;
     }
-    // need to bind this data to a surface like:
-    //model_surface->resetArray(model_data);
+    qDebug() << "Chest Area: " << area;
+    return area;
 }
 
+double PectusProcessor::defectArea(Vertex v1, Vertex v2, QVector<QPair<Vertex, Vertex>> defectSegments) {
+    double area = 0.0;
+    double x = (v1.x + v2.x) / 2;
+    double y = (v1.y + v2.y) / 2;
+
+    for (int i = 0; i < defectSegments.size(); ++i) {
+        double l1 = distance(x, defectSegments[i].first.x, y, defectSegments[i].first.y);
+        double l2 = distance(x, defectSegments[i].second.x, y, defectSegments[i].second.y);
+        double l3 = distance(defectSegments[i].second.x, defectSegments[i].first.x,
+                             defectSegments[i].second.y, defectSegments[i].first.y);
+        area += areaTriangle(l1, l2, l3);
+    }
+    return area;
+}

pectusprocessor.h

@@ -11,6 +11,7 @@
 #include <QtDataVisualization/QSurface3DSeries>
 #include <QtWidgets/QSlider>
 #include <cmath>
+#include "area.h"
 
 struct Vertex {
     double x,y,z;
@@ -67,6 +68,8 @@ class PectusProcessor : public QObject
     Q_INVOKABLE bool getHallerIndexVisible();
     Q_INVOKABLE void calculateHallerIndex();
     Q_INVOKABLE void getFixedIntersection();
+    Q_INVOKABLE double chestArea();
+    Q_INVOKABLE double defectArea(Vertex v1, Vertex v2, QVector<QPair<Vertex, Vertex>> defectSegments);
 
     // Erases arms that are completely disconnected from the drawing
     Q_INVOKABLE void eraseArms(int canvasWidth, int canvasHeight);
@@ -129,6 +132,8 @@ class PectusProcessor : public QObject
     void fileNameChanged(const QString & arg);
     void hallerIndexChanged(const double & arg);
     void hallerIndexVisibleChanged(const bool arg);
+    void volumeDefectIndexChanged(const double & arg);
+    void volumeDefectIndexVisibleChanged(const bool arg);
 
 public slots: