1 files changed, 16 insertions, 18 deletions

diff --git a/src/canvastoolthreshold.cc b/src/canvastoolthreshold.cc
index a905766..65a195b 100644
--- a/src/canvastoolthreshold.cc
+++ b/src/canvastoolthreshold.cc
@@ -27,24 +27,23 @@
 #include "canvastoolthreshold.h"
 
 #include <math.h>
+#include <iostream>
 
+#include "canvas.h"
 #include "project.h"
 
-#define mapX(x) canvas->mapX(x)
-#define mapY(x) canvas->mapY(x)
-#define unmapX(x) canvas->unmapX(x)
-#define unmapY(x) canvas->unmapY(x)
+#define mapY(x) canvas.mapY(x)
+#define unmapY(x) canvas.unmapY(x)
 
-CanvasToolThreshold::CanvasToolThreshold(Canvas* c, Instrument& instrument)
-	: instrument(instrument)
+CanvasToolThreshold::CanvasToolThreshold(Canvas& canvas, double default_value,
+                                         QColor color, QColor moving_color)
+	: canvas(canvas)
+	, colThreshold(color)
+	, colThresholdMoving(moving_color)
 {
-	canvas = c;
-	threshold = instrument.getThreshold();
+	threshold = default_value;
 
 	threshold_is_moving = false;
-
-	colThreshold = QColor(255, 127, 127);
-	colThresholdMoving = QColor(180, 0, 0);
 }
 
 bool CanvasToolThreshold::mouseMoveEvent(QMouseEvent* event)
@@ -60,7 +59,7 @@ bool CanvasToolThreshold::mouseMoveEvent(QMouseEvent* event)
 		   abs(event->y() - mapY(-threshold)) < 2 )
 		{
 
-			canvas->setCursor(Qt::SplitVCursor);
+			canvas.setCursor(Qt::SplitVCursor);
 			return true;
 		}
 	}
@@ -73,10 +72,10 @@ bool CanvasToolThreshold::mouseMoveEvent(QMouseEvent* event)
 			val = 1.0;
 		}
 		threshold = fabs(val);
-		canvas->update();
+		canvas.update();
 
 		emit thresholdChanging(threshold);
-		instrument.setThreshold(threshold);
+		std::cout << threshold << "\n";
 		return true;
 	}
 
@@ -97,7 +96,7 @@ bool CanvasToolThreshold::mousePressEvent(QMouseEvent* event)
 		   abs(event->y() - mapY(-threshold)) < 2)
 		{
 			threshold_is_moving = true;
-			canvas->update();
+			canvas.update();
 			return true;
 		}
 	}
@@ -117,11 +116,10 @@ bool CanvasToolThreshold::mouseReleaseEvent(QMouseEvent* event)
 		if(threshold_is_moving)
 		{
 			threshold_is_moving = false;
-			canvas->setCursor(Qt::ArrowCursor);
-			canvas->update();
+			canvas.setCursor(Qt::ArrowCursor);
+			canvas.update();
 
 			emit thresholdChanged(threshold);
-			instrument.setThreshold(threshold);
 			return true;
 		}
 	}