From 9717835e83fc941bfa30f1da4678aae96f8e0002 Mon Sep 17 00:00:00 2001
From: koldo <koldo@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Fri, 18 Dec 2015 20:58:44 +0000
Subject: [PATCH] ScatterCtrl: Included ZoomToFit. Some fixes

git-svn-id: svn://ultimatepp.org/upp/trunk@9299 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 uppsrc/ScatterCtrl/Properties.cpp  | 15 ++++++++-------
 uppsrc/ScatterCtrl/ScatterCtrl.cpp |  6 +++---
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/uppsrc/ScatterCtrl/Properties.cpp b/uppsrc/ScatterCtrl/Properties.cpp
index 29254f15a..52b9d5e38 100644
--- a/uppsrc/ScatterCtrl/Properties.cpp
+++ b/uppsrc/ScatterCtrl/Properties.cpp
@@ -25,12 +25,13 @@ void MeasuresTab::Init(ScatterCtrl& scatter) {
 	
 	pscatter = &scatter;
 	
-	xMin <<= scatter.GetXMin();
-	xMax <<= scatter.GetXRange() + scatter.GetXMin();
-	yMin <<= scatter.GetYMin();
-	yMax <<= scatter.GetYRange() + scatter.GetYMin();
-	yMin2 <<= scatter.GetYMin2();
-	yMax2 <<= scatter.GetY2Range() + scatter.GetYMin2();
+	double kkxMin = xMin <<= scatter.GetXMin();
+	double kkxMax = xMax <<= scatter.GetXRange() + scatter.GetXMin();
+	
+	double kkyMin = yMin <<= scatter.GetYMin();
+	double kkyMax = yMax <<= scatter.GetYRange() + scatter.GetYMin();
+	double kkyMin2 = yMin2 <<= scatter.GetYMin2();
+	double kkyMax2 = yMax2 <<= scatter.GetY2Range() + scatter.GetYMin2();
 	
 	butUpdate.WhenAction = THISBACK(Change);
 	
@@ -41,7 +42,7 @@ void MeasuresTab::Change() {
 	ScatterCtrl &scatter = *pscatter;
 	
     scatter.SetXYMin(xMin, yMin, yMin2);
-    scatter.SetMinUnits(xMin, yMin);
+    //scatter.SetMinUnits(xMin, yMin);
 	scatter.SetRange(xMax - xMin, yMax - yMin, yMax2 - yMin2);
 
 	scatter.SetModify();
diff --git a/uppsrc/ScatterCtrl/ScatterCtrl.cpp b/uppsrc/ScatterCtrl/ScatterCtrl.cpp
index f2ad473d5..426b2ee5c 100644
--- a/uppsrc/ScatterCtrl/ScatterCtrl.cpp
+++ b/uppsrc/ScatterCtrl/ScatterCtrl.cpp
@@ -378,7 +378,7 @@ bool ScatterCtrl::Key(dword key, int count)
 		else if (key == K_CTRL_D)
 			DoShowData();
 		else if (key == K_CTRL_C)
-			SaveToClipboard(false);
+			SaveToClipboard(true);
 		else if (key == K_CTRL_S)
 			SaveToFile(Null);
 		else
@@ -536,7 +536,7 @@ ScatterCtrl &ScatterCtrl::SetMouseHandling(bool valx, bool valy)
 void ScatterCtrl::ContextMenu(Bar& bar)
 {
 	if (mouseHandlingX || mouseHandlingY) {
-		bar.Add(t_("Fit to data"), 	ScatterImg::ShapeHandles(), THISBACK2(FitToData, mouseHandlingY, 0));
+		bar.Add(t_("Fit to data"), 	ScatterImg::ShapeHandles(), THISBACK3(ZoomToFit, mouseHandlingX, mouseHandlingY, 0));
 		bar.Add(t_("Zoom +"), 		ScatterImg::ZoomPlus(), 	THISBACK3(Zoom, 1/1.2, true, mouseHandlingY));
 		bar.Add(t_("Zoom -"), 		ScatterImg::ZoomMinus(), 	THISBACK3(Zoom, 1.2, true, mouseHandlingY));
 	}
@@ -560,7 +560,7 @@ void ScatterCtrl::ContextMenu(Bar& bar)
 		bar.Add(t_("Data"), ScatterImg::Database(), THISBACK(DoShowData)).Key(K_CTRL_D);		
 		bar.Separator();
 	}
-	bar.Add(t_("Copy"), ScatterImg::Copy(), 		THISBACK1(SaveToClipboard, false)).Key(K_CTRL_C);
+	bar.Add(t_("Copy"), ScatterImg::Copy(), 		THISBACK1(SaveToClipboard, true)).Key(K_CTRL_C);
 	bar.Add(t_("Save to file"), ScatterImg::Save(), THISBACK1(SaveToFile, Null)).Key(K_CTRL_S);
 }