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

ScatterCtrl: Added staggered

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@13748 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
koldo 2019-12-09 21:00:56 +00:00
parent 6e683934d7
commit 28d5f63ae0
2 changed files with 13 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
uppsrc/ScatterCtrl/Processing.cpp
View file

@ -191,8 +191,11 @@ ProcessingTab::ProcessingTab()
tabHistRight.numVals <<= 30;
tabHistRight.valNormalize <<= 100;
//tabHistRight.opNormalize.WhenAction = [&] {tabHistRight.valNormalize.Enable(~tabHistRight.opNormalize);};
//tabHistRight.opNormalize.WhenAction();
tabHistRight.opNormalize.WhenAction = [&] {
tabHistRight.valNormalize.Enable(~tabHistRight.opNormalize);
tabHistRight.labNormalize.Enable(~tabHistRight.opNormalize);
};
tabHistRight.opNormalize.WhenAction();
tabFreqFirst = tabOpFirst = tabBestFitFirst = tabHistFirst = true;
avgFirst = linearFirst = cuadraticFirst = cubicFirst = sinusFirst = sinusTendFirst = splineFirst = true;
@ -795,7 +798,9 @@ void ProcessingTab::OnHist() {
histogram.Normalize(valNormalize);
String legend = tabFitLeft.scatter.GetLegend(0) + String("-") + t_("Histogram");
tabHistLeft.scatter.AddSeries(histogram).Legend(legend).Units("#", isY ? tabFitLeft.scatter.GetUnitsY(0) : tabFitLeft.scatter.GetUnitsX(0));
tabHistLeft.scatter.AddSeries(histogram).Legend(legend).Units(normalize ? "%" : "#", isY ? tabFitLeft.scatter.GetUnitsY(0) : tabFitLeft.scatter.GetUnitsX(0));
if (~tabHistRight.opStaggered)
tabHistLeft.scatter.PlotStyle<StaggeredSeriesPlot>().Dash("").NoMark().Fill(Blue()).Opacity(0.3).Stroke(2, LtBlue());
tabHistLeft.scatter.ShowInfo().ShowContextMenu().ShowProcessDlg().ShowPropertiesDlg().SetMouseHandlingLinked(true, true);
tabHistLeft.scatter.SetLabelX(isY ? tabFitLeft.scatter.GetLegend(0) : tabFitLeft.scatter.GetLabelX());
tabHistLeft.scatter.SetLabelY(t_("Number"));

8
uppsrc/ScatterCtrl/ScatterCtrl.lay
View file

@ -301,11 +301,13 @@ LAYOUT(ProcessingTabHistogramRight, 124, 424)
ITEM(EditInt, numVals, Min(1).HSizePosZ(56, 4).TopPosZ(48, 19))
ITEM(Label, dv___6, SetLabel(t_("Axis")).HSizePosZ(4, 4).TopPosZ(4, 19))
ITEM(DropList, axis, HSizePosZ(4, 4).TopPosZ(24, 19))
ITEM(Button, butHist, SetLabel(t_("Histogram")).HSizePosZ(4, 4).TopPosZ(200, 20))
ITEM(Label, dv___9, SetLabel(t_("Val:")).LeftPosZ(12, 36).TopPosZ(164, 19))
ITEM(Button, butHist, SetLabel(t_("Histogram")).HSizePosZ(4, 4).TopPosZ(224, 20))
ITEM(Label, labNormalize, SetLabel(t_("Val:")).LeftPosZ(12, 36).TopPosZ(164, 19))
ITEM(EditDouble, valNormalize, Min(0).HSizePosZ(56, 12).TopPosZ(164, 19))
ITEM(OptionBox, opNormalize, AutoBox(true).SetLabel(t_("Normalize")).HSizePosZ(4, 4).TopPosZ(144, 48))
ITEM(LabelBox, dv___11, SetLabel(t_(" ")).HSizePosZ(4, 4).TopPosZ(144, 48))
ITEM(Option, opStaggered, SetLabel(t_("Staggered")).LeftPosZ(4, 88).TopPosZ(200, 16))
ITEM(Option, opAccumulative, SetLabel(t_("Accumulative")).LeftPosZ(4, 88).TopPosZ(120, 16))
ITEM(Option, opNormalize, SetLabel(t_("Normalize")).LeftPosZ(12, 72).TopPosZ(144, 16))
END_LAYOUT
LAYOUT(FontSelector, 208, 76)