From 3c3df5dda096fce532f628cd887acfdbd9f5154d Mon Sep 17 00:00:00 2001
From: koldo <koldo@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Sun, 16 Feb 2020 09:50:49 +0000
Subject: [PATCH] MathTools: Added new filters

git-svn-id: svn://ultimatepp.org/upp/trunk@14018 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 bazaar/MathTools/DataHandling.cpp | 2 +-
 bazaar/MathTools/MathTools.h      | 4 ++--
 bazaar/MathTools/MathTools.lay    | 2 +-
 bazaar/MathTools/main.cpp         | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/bazaar/MathTools/DataHandling.cpp b/bazaar/MathTools/DataHandling.cpp
index 749d66ecf..90a55f630 100644
--- a/bazaar/MathTools/DataHandling.cpp
+++ b/bazaar/MathTools/DataHandling.cpp
@@ -321,7 +321,7 @@ void TabData::OnChangeFile(int delta) {
 	
 	String ext = GetFileExt(fileName);
 	FindFile ff(AppendFileName(GetFileFolder(fileName), "*" + ext));
-	Index<String> fileList;
+	Upp::Index<String> fileList;
 	do {
 		if (ff.IsFile()) 
 			fileList << ff.GetPath();
diff --git a/bazaar/MathTools/MathTools.h b/bazaar/MathTools/MathTools.h
index 0657cad6a..a05ecde13 100644
--- a/bazaar/MathTools/MathTools.h
+++ b/bazaar/MathTools/MathTools.h
@@ -106,10 +106,10 @@ private:
 	WithTabData_Down_L<StaticRect> downL;
 	WithTabData_Down_R<StaticRect> downR;
 	
-	Array<EditString> editGrid;
+	Upp::Array<EditString> editGrid;
 	EditInt xCell, xFrom, xTo, yCell, yFrom, yTo;
 	Option option;
-	Array<GridCtrlSource> ds;
+	Upp::Array<GridCtrlSource> ds;
 	bool notFirstTime;
 	
 	OpenFileButton openMenuButton;
diff --git a/bazaar/MathTools/MathTools.lay b/bazaar/MathTools/MathTools.lay
index dbe9f4ba2..600dc1bcb 100644
--- a/bazaar/MathTools/MathTools.lay
+++ b/bazaar/MathTools/MathTools.lay
@@ -20,7 +20,7 @@ LAYOUT(TabCalculator, 712, 360)
 END_LAYOUT
 
 LAYOUT(TabData_Up, 472, 332)
-	ITEM(ScatterCtrl, scatter, SetPlotAreaLeftMargin(60).SetPlotAreaTopMargin(20).SetPlotAreaColor(Color(229, 229, 229)).SetAxisWidth(12).SetTitleFont(SansSerifZ(14).Bold()).SetLegendAnchor(4).HSizePosZ(0, 0).VSizePosZ(0, 0))
+	ITEM(ScatterCtrl, scatter, SetPlotAreaLeftMargin(60).SetPlotAreaTopMargin(20).SetPlotAreaColor(Color(229, 229, 229)).SetTitleFont(SansSerifZ(14).Bold()).SetLegendAnchor(4).HSizePosZ(0, 0).VSizePosZ(0, 0))
 END_LAYOUT
 
 LAYOUT(TabData_Down, 564, 288)
diff --git a/bazaar/MathTools/main.cpp b/bazaar/MathTools/main.cpp
index a9ed92b28..c880e0426 100644
--- a/bazaar/MathTools/main.cpp
+++ b/bazaar/MathTools/main.cpp
@@ -16,8 +16,8 @@ struct Example {
 };
 
 	
-Array<Example>& Examples() {
-	static Array<Example> x;
+Upp::Array<Example>& Examples() {
+	static Upp::Array<Example> x;
 	return x;
 }