Results: 'Nr. meters in a group' bug fixes. Version 1.4.41.

This commit is contained in:
Milan Hanajik
2015-05-21 16:04:38 +02:00
parent 8afd487e87
commit e94b4f2655
2 changed files with 7 additions and 7 deletions
@@ -69,7 +69,7 @@ namespace TBF.Screens
MetersArrangement = Program.LocalSettings.ResultsConfigMeters;
TestsArrangement = Program.LocalSettings.ResultsConfigTests;
NrMetersInOneGroup = Program.LocalSettings.ResultsConfigMetersInOneGroup;
NrMetersInOneGroup = Math.Max(1, Program.LocalSettings.ResultsConfigMetersInOneGroup);
RsltItems_Screen_SingleWM = Forms.ResultItemSpec.FromStrArray(Program.LocalSettings.RsltItems_Screen_SingleWM);
RsltItems_Screen_CombinedWM = Forms.ResultItemSpec.FromStrArray(Program.LocalSettings.RsltItems_Screen_CombinedWM);
RsltItems_Printer_SingleWM = Forms.ResultItemSpec.FromStrArray(Program.LocalSettings.RsltItems_Printer_SingleWM);
@@ -160,22 +160,22 @@ namespace TBF.Screens
}
int metersInOneGroup = Math.Max(1, Math.Min(enabledWMsCount, NrMetersInOneGroup));
int nrGroups = Math.Max(1, (enabledWMsCount + NrMetersInOneGroup - 1) / NrMetersInOneGroup);
int nrGroups = Math.Max(1, (enabledWMsCount + NrMetersInOneGroup - 1) / metersInOneGroup);
if (MetersArrangement == Forms.ResultsConfig.Meters.Horizontally)
{
flowLayoutPanel.FlowDirection = FlowDirection.LeftToRight;
lvWidth = (lvWidth + 5) / metersInOneGroup - 5;
lvWidth = (flowLayoutPanel.Width + 5) / metersInOneGroup - 5;
lvHeight = (flowLayoutPanel.Height + 5) / nrGroups - 5;
}
else
{
flowLayoutPanel.FlowDirection = FlowDirection.TopDown;
lvWidth = (flowLayoutPanel.Width + 5) / nrGroups - 5;
lvHeight = (lvHeight + 5) /metersInOneGroup - 5;
lvHeight = (flowLayoutPanel.Height + 5) / metersInOneGroup - 5;
}
flowLayoutPanel.Controls.Clear();
flowLayoutPanel.WrapContents = false;
flowLayoutPanel.WrapContents = true;
flowLayoutPanel.AutoScroll = true;
bool first = true;