From be77ab6c14071ca8d9a96f00898466f67a08e697 Mon Sep 17 00:00:00 2001 From: koldo Date: Fri, 5 Apr 2019 06:27:24 +0000 Subject: [PATCH] ScatterCtrl: removed warnings git-svn-id: svn://ultimatepp.org/upp/trunk@12947 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppsrc/ScatterCtrl/Processing.cpp | 12 +++++++-- uppsrc/ScatterCtrl/Properties.h | 2 +- uppsrc/ScatterCtrl/ScatterCtrl.cpp | 4 +-- uppsrc/ScatterCtrl/ScatterCtrl.h | 2 +- uppsrc/ScatterCtrl/ScatterCtrl.lay | 39 +++++++++++++++--------------- 5 files changed, 34 insertions(+), 25 deletions(-) diff --git a/uppsrc/ScatterCtrl/Processing.cpp b/uppsrc/ScatterCtrl/Processing.cpp index 612729706..6873b3586 100644 --- a/uppsrc/ScatterCtrl/Processing.cpp +++ b/uppsrc/ScatterCtrl/Processing.cpp @@ -111,7 +111,7 @@ ProcessingTab::ProcessingTab() CtrlLayout(tabBestFitRight); splitterTabBestFit.Horz(tabBestFitLeft.SizePos(), tabBestFitRight.SizePos()); splitterTabBestFit.SetPos(6000, 0); - tab.Add(splitterTabFit.SizePos(), t_("Data fit")); + tab.Add(splitterTabFit.SizePos(), t_("Processing")); tab.Add(splitterTabFreq.SizePos(), t_("Frequency")); tab.Add(splitterTabOp.SizePos(), t_("Operations")); tab.Add(splitterTabBestFit.SizePos(), t_("Best fit")); @@ -143,6 +143,7 @@ ProcessingTab::ProcessingTab() tabFitRight.opMin.WhenAction = THISBACK(OnOp); tabFitRight.opMovAvg.WhenAction = THISBACK(OnOp); tabFitRight.opSecAvg.WhenAction = THISBACK(OnOp); + tabFitRight.opCumAvg.WhenAction = THISBACK(OnOp); tabFitRight.butAutoSensSector.WhenAction = THISBACK(OnAutoSensSector); tabFitRight.width.WhenLostFocus = THISBACK(OnUpdateSensitivity); tabFitRight.width.WhenAction = THISBACK(OnUpdateSensitivity); @@ -316,6 +317,7 @@ void ProcessingTab::OnOp() tabFitLeft.scatter.ScatterDraw::Show(9, tabFitRight.opMin); tabFitLeft.scatter.ScatterDraw::Show(10,tabFitRight.opMovAvg); tabFitLeft.scatter.ScatterDraw::Show(11,tabFitRight.opSecAvg); + tabFitLeft.scatter.ScatterDraw::Show(12,tabFitRight.opCumAvg); UpdateEquations(); OnShowEquation(); @@ -435,6 +437,7 @@ void ProcessingTab::UpdateField(const String _name, int _id) .NoMark().Dash(LINE_DASHED).SetSequentialX(true); tabFitLeft.scatter.AddSeries(movAvg).Stroke(1.5).Legend(pscatter->GetLegend(id) + String("-") + t_("MovAvg")).NoMark(); tabFitLeft.scatter.AddSeries(secAvg).Stroke(1.5).Legend(pscatter->GetLegend(id) + String("-") + t_("SecAvg")).NoMark(); + tabFitLeft.scatter.AddSeries(cumAvg).Stroke(1.5).Legend(pscatter->GetLegend(id) + String("-") + t_("CumAvg")).NoMark(); OnOp(); } else { @@ -450,6 +453,7 @@ void ProcessingTab::UpdateField(const String _name, int _id) tabFitRight.opMin.Enable(false); tabFitRight.opMovAvg.Enable(false); tabFitRight.opSecAvg.Enable(false); + tabFitRight.opCumAvg.Enable(false); } Show(); @@ -490,7 +494,11 @@ void ProcessingTab::OnUpdateSensitivity() secAvg = data.SectorAverageY(tabFitRight.width); refresh = true; } - + if (tabFitRight.opCumAvg) { + cumAvg = data.CumulativeAverageY(); + refresh = true; + } + if (refresh) tabFitLeft.scatter.Refresh(); } diff --git a/uppsrc/ScatterCtrl/Properties.h b/uppsrc/ScatterCtrl/Properties.h index 4523cf94d..0b681432b 100644 --- a/uppsrc/ScatterCtrl/Properties.h +++ b/uppsrc/ScatterCtrl/Properties.h @@ -282,7 +282,7 @@ private: SinEquation sinus, sinusTend; SplineEquation spline; Vector upperEnvelope, lowerEnvelope; - Vector movAvg, secAvg; + Vector movAvg, secAvg, cumAvg; DataXRange dataXRange; bool exclamationOpened; double newWidthMax, newWidthMin, newWidthMovAvg; diff --git a/uppsrc/ScatterCtrl/ScatterCtrl.cpp b/uppsrc/ScatterCtrl/ScatterCtrl.cpp index cbbc9fa9f..510ff065a 100644 --- a/uppsrc/ScatterCtrl/ScatterCtrl.cpp +++ b/uppsrc/ScatterCtrl/ScatterCtrl.cpp @@ -380,13 +380,13 @@ void ScatterCtrl::ProcessPopUp(const Point &pt) popTextEnd.Hide(); } -void ScatterCtrl::ProcessClickSeries(const Point &pt) +/*void ScatterCtrl::ProcessClickSeries(const Point &pt) { double posx = GetRealPosX(pt.x); double posy = GetRealPosY(pt.y); double dx = 2*GetPixelThickX(); double dy = 2*GetPixelThickY(); -} +}*/ void ScatterCtrl::DoMouseAction(bool down, Point pt, ScatterAction action, int wheel) { diff --git a/uppsrc/ScatterCtrl/ScatterCtrl.h b/uppsrc/ScatterCtrl/ScatterCtrl.h index 02d222938..513b016e5 100644 --- a/uppsrc/ScatterCtrl/ScatterCtrl.h +++ b/uppsrc/ScatterCtrl/ScatterCtrl.h @@ -370,7 +370,7 @@ private: void Paint0(Draw& w, const Size &sz); void ProcessPopUp(const Point &pt); - void ProcessClickSeries(const Point &pt); + //void ProcessClickSeries(const Point &pt); void DoMouseAction(bool down, Point pt, ScatterAction action, int wheel); void DoKeyAction(ScatterAction action); diff --git a/uppsrc/ScatterCtrl/ScatterCtrl.lay b/uppsrc/ScatterCtrl/ScatterCtrl.lay index 7a36f0b96..bc935d6fb 100644 --- a/uppsrc/ScatterCtrl/ScatterCtrl.lay +++ b/uppsrc/ScatterCtrl/ScatterCtrl.lay @@ -173,7 +173,7 @@ LAYOUT(ProcessingTabFitLeft, 356, 281) ITEM(ScatterCtrl, scatter, SetPlotAreaLeftMargin(60).SetPlotAreaBottomMargin(50).ShowContextMenu(true).ShowPropertiesDlg(true).ShowProcessDlg(true).ShowButtons(true).HSizePosZ(0, 1).VSizePosZ(0, 0)) END_LAYOUT -LAYOUT(ProcessingTabFitRight, 232, 436) +LAYOUT(ProcessingTabFitRight, 232, 452) ITEM(Option, opSeries, SetLabel(t_("Series")).LeftPosZ(4, 84).TopPosZ(3, 16)) ITEM(Option, opAverage, SetLabel(t_("Average")).LeftPosZ(4, 64).TopPosZ(23, 16)) ITEM(Option, opLinear, SetLabel(t_("Linear")).LeftPosZ(4, 64).TopPosZ(43, 16)) @@ -187,16 +187,17 @@ LAYOUT(ProcessingTabFitRight, 232, 436) ITEM(Option, opMax, SetLabel(t_("Max curve")).LeftPosZ(4, 128).TopPosZ(187, 16)) ITEM(Option, opMin, SetLabel(t_("Min curve")).LeftPosZ(4, 128).TopPosZ(207, 16)) ITEM(Option, opMovAvg, SetLabel(t_("Moving Average")).LeftPosZ(4, 128).TopPosZ(227, 16)) + ITEM(Option, opCumAvg, SetLabel(t_("Cumulative Average")).LeftPosZ(4, 128).TopPosZ(268, 16)) ITEM(Option, opSecAvg, SetLabel(t_("Sector Average")).LeftPosZ(4, 128).TopPosZ(247, 16)) ITEM(Button, butAutoSensSector, SetLabel(t_("Autosens")).LeftPosZ(136, 64).TopPosZ(247, 15)) ITEM(EditDoubleLostFocusSpin, width, LeftPosZ(136, 60).TopPosZ(211, 19)) - ITEM(Label, dv___16, SetLabel(t_("Max imp.:")).HSizePosZ(4, 144).TopPosZ(315, 19)) - ITEM(Label, dv___17, SetLabel(t_("R2 coeff.")).LeftPosZ(156, 48).TopPosZ(3, 19)) - ITEM(Label, dv___18, SetLabel(t_("Num decimals:")).LeftPosZ(4, 80).TopPosZ(163, 19)) - ITEM(Label, dv___19, SetLabel(t_("Max:")).HSizePosZ(4, 144).TopPosZ(291, 19)) - ITEM(Label, dv___20, SetLabel(t_("StdDev:")).LeftPosZ(4, 56).TopPosZ(411, 19)) - ITEM(EditString, eMaxImp, SetEditable(false).HSizePosZ(64, 4).TopPosZ(315, 19)) - ITEM(EditDouble, eStdDev, SetEditable(false).HSizePosZ(64, 4).TopPosZ(411, 19)) + ITEM(Label, dv___17, SetLabel(t_("Max imp.:")).HSizePosZ(4, 144).TopPosZ(332, 19)) + ITEM(Label, dv___18, SetLabel(t_("R2 coeff.")).RightPosZ(0, 48).TopPosZ(4, 19)) + ITEM(Label, dv___19, SetLabel(t_("Num decimals:")).LeftPosZ(4, 80).TopPosZ(163, 19)) + ITEM(Label, dv___20, SetLabel(t_("Max:")).HSizePosZ(4, 144).TopPosZ(308, 19)) + ITEM(Label, dv___21, SetLabel(t_("StdDev:")).LeftPosZ(4, 56).TopPosZ(428, 19)) + ITEM(EditString, eMaxImp, SetEditable(false).HSizePosZ(64, 4).TopPosZ(332, 19)) + ITEM(EditDouble, eStdDev, SetEditable(false).HSizePosZ(64, 4).TopPosZ(428, 19)) ITEM(EditString, eqSinusTend, SetEditable(false).HSizePosZ(68, 52).TopPosZ(123, 19)) ITEM(EditDouble, r2Linear, SetEditable(false).RightPosZ(4, 44).TopPosZ(43, 19)) ITEM(EditDouble, r2Cuadratic, SetEditable(false).RightPosZ(4, 44).TopPosZ(63, 19)) @@ -205,18 +206,18 @@ LAYOUT(ProcessingTabFitRight, 232, 436) ITEM(EditDouble, r2Sinus, SetEditable(false).RightPosZ(4, 44).TopPosZ(103, 19)) ITEM(EditString, eqCubic, SetEditable(false).HSizePosZ(68, 52).TopPosZ(83, 19)) ITEM(EditDouble, r2Cubic, SetEditable(false).RightPosZ(4, 44).TopPosZ(83, 19)) - ITEM(EditString, eMax, SetEditable(false).HSizePosZ(64, 4).TopPosZ(291, 19)) - ITEM(Label, dv___32, SetLabel(t_("Average:")).HSizePosZ(4, 144).TopPosZ(363, 19)) - ITEM(EditDouble, eAverage, SetEditable(false).HSizePosZ(64, 4).TopPosZ(363, 19)) + ITEM(EditString, eMax, SetEditable(false).HSizePosZ(64, 4).TopPosZ(308, 19)) + ITEM(Label, dv___33, SetLabel(t_("Average:")).HSizePosZ(4, 144).TopPosZ(380, 19)) + ITEM(EditDouble, eAverage, SetEditable(false).HSizePosZ(64, 4).TopPosZ(380, 19)) ITEM(EditString, eqLinear, SetEditable(false).HSizePosZ(68, 52).TopPosZ(43, 19)) ITEM(EditString, eqCuadratic, SetEditable(false).HSizePosZ(68, 52).TopPosZ(63, 19)) ITEM(EditString, eqAverage, SetEditable(false).HSizePosZ(68, 52).TopPosZ(23, 19)) - ITEM(Label, dv___37, SetLabel(t_("Sensitivity")).LeftPosZ(136, 60).TopPosZ(195, 19)) - ITEM(LabelBox, dv___38, SetLabel(t_("Statistical data")).HSizePosZ(0, 4).TopPosZ(267, 24)) - ITEM(Label, dv___39, SetLabel(t_("RMS:")).LeftPosZ(4, 56).TopPosZ(387, 19)) - ITEM(EditDouble, eRMS, SetEditable(false).HSizePosZ(64, 4).TopPosZ(387, 19)) - ITEM(Label, dv___41, SetLabel(t_("Min:")).HSizePosZ(4, 144).TopPosZ(339, 19)) - ITEM(EditString, eMin, SetEditable(false).HSizePosZ(64, 4).TopPosZ(339, 19)) + ITEM(Label, dv___38, SetLabel(t_("Sensitivity")).LeftPosZ(136, 60).TopPosZ(195, 19)) + ITEM(LabelBox, dv___39, SetLabel(t_("Statistical data")).HSizePosZ(0, 4).TopPosZ(284, 24)) + ITEM(Label, dv___40, SetLabel(t_("RMS:")).LeftPosZ(4, 56).TopPosZ(404, 19)) + ITEM(EditDouble, eRMS, SetEditable(false).HSizePosZ(64, 4).TopPosZ(404, 19)) + ITEM(Label, dv___42, SetLabel(t_("Min:")).HSizePosZ(4, 144).TopPosZ(356, 19)) + ITEM(EditString, eMin, SetEditable(false).HSizePosZ(64, 4).TopPosZ(356, 19)) END_LAYOUT LAYOUT(ProcessingTabOpLeft, 428, 328) @@ -268,8 +269,8 @@ LAYOUT(ProcessingTabBestFitLeft, 432, 428) ITEM(ScatterCtrl, scatter, SetPlotAreaLeftMargin(60).SetPlotAreaBottomMargin(50).ShowContextMenu(true).ShowPropertiesDlg(true).ShowProcessDlg(true).ShowButtons(true).HSizePosZ(0, 0).VSizePosZ(0, 0)) END_LAYOUT -LAYOUT(ProcessingTabBestFitRight, 268, 428) - ITEM(Switch, coefficients, SetLabel(t_("Normal\nFull\nText")).LeftPosZ(12, 148).TopPosZ(24, 15)) +LAYOUT(ProcessingTabBestFitRight, 332, 428) + ITEM(Switch, coefficients, SetLabel(t_("Normal\nFull\nText")).HSizePosZ(12, 108).TopPosZ(24, 15)) ITEM(EditDouble, minR2, RightPosZ(4, 44).TopPosZ(28, 19)) ITEM(Button, butFit, SetLabel(t_("Fit")).RightPosZ(4, 88).TopPosZ(4, 20)) ITEM(ArrayCtrl, gridTrend, HSizePosZ(4, 4).VSizePosZ(56, 28))