github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-07-11 22:03:01 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

MathTools: Added new filters

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@14018 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
koldo 2020-02-16 09:50:49 +00:00
parent 56b34f031b
commit 3c3df5dda0
4 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
bazaar/MathTools/DataHandling.cpp
View file

@ -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();

4
bazaar/MathTools/MathTools.h
View file

@ -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;

2
bazaar/MathTools/MathTools.lay
View file

@ -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)

4
bazaar/MathTools/main.cpp
View file

@ -16,8 +16,8 @@ struct Example {
};
Array<Example>& Examples() {
static Array<Example> x;
Upp::Array<Example>& Examples() {
static Upp::Array<Example> x;
return x;
}