Refactors, mostly to remove warnings under qmake and set the stage fo…

…r resurfacing

arcball.cpp

@@ -147,7 +147,8 @@ void Arcball::mouse_up()
 
 /********************************** Arcball::mouse_motion() **********/
 
-void Arcball::mouse_motion(int x, int y, int shift, int ctrl, int alt)
+void Arcball::mouse_motion(int x, int y, int , //shift,
+                           int ctrl, int alt)
 {
     /* Set the X constraint if CONTROL key is pressed, Y if ALT key */
     set_constraints( ctrl != 0, alt != 0 );

gcode.cpp

@@ -286,8 +286,14 @@ void gcodeModel::loadGcodeLine(const char* lineStr)
 
 
 
-void addPointsFromPolygon(const Polygon &poly, float xOff, float yOff, float z, PointKind kind, int nb, float feedrate, float flowrate, vector<point> &points, layerMap& map)
+void addPointsFromPolygon(const Polygon &poly,
+                          float xOff,
+                          float yOff,
+                          float z,
+                          PointKind kind, int nb, float feedrate, float flowrate, vector<point> &points,
+                          layerMap& )
 {
+
     for(unsigned int i=0; i < poly.size(); i++)
     {
         Vector2 p = poly[i];
@@ -317,8 +323,6 @@ void addPointsFromSurface(const GridRanges& gridRanges, const Grid & grid, float
 {
     float feedrate = 10;
     float flowrate = 5;
-    int nb =0;
-
 
 
     map.recordHeight(z);
@@ -399,7 +403,6 @@ void gcodeModel::loadSliceData(const Tomograph& tomograph,
     feedrateBounds.evaluate(feedrate);
     flowrateBounds.evaluate(flowrate);
 
-    float xOff = -1.1 * tomograph.grid.readXvalues()[0] + tomograph.grid.readXvalues().back();
     for (unsigned int i = 0; i < slices.size(); i++)
     {
         const SliceData &sliceData = slices[i];
@@ -466,9 +469,8 @@ void gcodeModel::loadGCode(QString q)
     string extension = filename.substr(filename.find_last_of('.'), filename.size());
     std::transform(extension.begin(), extension.end(), extension.begin(), ::tolower);
     cout << "extension "<< extension << endl;
-    int r = extension.find("stl");
 
-    if(extension.find("gcode") >= 0)
+    if(extension.find("gcode") != string::npos)
     {
         cout << "loading gcode: " << filename << endl;
         ifstream file;

gcodeview.cpp

@@ -290,7 +290,7 @@ void GcodeView::mouseMoveEvent(QMouseEvent *event)
 
 }
 
-void GcodeView::mouseReleaseEvent(QMouseEvent *event) {
+void GcodeView::mouseReleaseEvent(QMouseEvent *) {
     arcball.mouse_up();
 
     // Start an animation timer if the arcball is still spinning
@@ -353,7 +353,7 @@ void GcodeView::toggleSurfs(bool v)
     updateGL();
 }
 
-void GcodeView::mouseDoubleClickEvent(QMouseEvent event) {
+void GcodeView::mouseDoubleClickEvent(QMouseEvent ) {
     // TODO: We never get here.
     resetView();
     updateGL();

mainwindow.cpp

@@ -377,15 +377,6 @@ void MainWindow::loadFile(const QString &fileName) {
 
 }
 
-void MainWindow::on_LayerMin_destroyed(QObject *arg1)
-{
-
-}
-
-void MainWindow::on_actionSaveGcode_triggered()
-{
-    cout << "hello save menu!" << endl;
-}
 
 
 void MainWindow::on_pushButtonSaveGcode_clicked()
@@ -406,11 +397,6 @@ void MainWindow::on_actionSave_gcode_triggered()
     ui->graphicsView->exportModel(filename, &progress);
 }
 
-void MainWindow::on_radioButtonSurfs_toggled(bool checked)
-{
-    cout << "Toggle surfs" << endl;
-}
-
 void MainWindow::on_checkBoxSurfs_toggled(bool checked)
 {
      cout << "Toggle surfs" << endl;

mainwindow.h

@@ -50,17 +50,17 @@ private slots:
 
     void on_buttonSlice_clicked();
 
-    void on_LayerMin_destroyed(QObject *arg1);
+    // void on_LayerMin_destroyed(QObject *arg1);
 
     void on_LayerMin_valueChanged(int value);
 
-    void on_actionSaveGcode_triggered();
+    // void on_actionSaveGcode_triggered();
 
     void on_pushButtonSaveGcode_clicked();
 
     void on_actionSave_gcode_triggered();
 
-    void on_radioButtonSurfs_toggled(bool checked);
+
 
     void on_checkBoxSurfs_toggled(bool checked);
 

quaternion.cpp

@@ -112,7 +112,8 @@ quat operator - (const quat &a )
 
 quat operator * ( const quat &a, const quat &b)
 {
-    return quat( a.s*b.s - a.v*b.v, a.s*b.v + b.s*a.v + a.v^b.v );
+    //return quat( a.s*b.s - a.v*b.v, a.s*b.v + b.s*a.v + a.v^b.v );
+    return quat( a.s*b.s - a.v*b.v, a.s*b.v + b.s*a.v + (a.v^b.v) );
 }
 
 quat operator * ( const quat &a, const float t)