diff --git a/uppsrc/ScatterCtrl/Processing.cpp b/uppsrc/ScatterCtrl/Processing.cpp index 811310c01..923f427a7 100644 --- a/uppsrc/ScatterCtrl/Processing.cpp +++ b/uppsrc/ScatterCtrl/Processing.cpp @@ -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().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")); diff --git a/uppsrc/ScatterCtrl/ScatterCtrl.lay b/uppsrc/ScatterCtrl/ScatterCtrl.lay index 02406395f..941f056ac 100644 --- a/uppsrc/ScatterCtrl/ScatterCtrl.lay +++ b/uppsrc/ScatterCtrl/ScatterCtrl.lay @@ -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)