Merge pull request #43 from DougSchmidt-AI/feature/Issue-42-AddStationNumbers

Doug Schmidt · web-flow · commit 444176470f63 · 2020-03-15T12:02:39.000-07:00
Issue-42 - Add implicit vertical number
diff --git a/src/Flowtracker2Plugin/DataFileParser.cs b/src/Flowtracker2Plugin/DataFileParser.cs
@@ -138,7 +138,7 @@ private ParseFileResult AppendResults(LocationInfo locationInfo)
 
                 foreach (var station in DataFile.Stations)
                 {
-                    manualGauging.Verticals.Add(CreateVertical(station, startStation, endStation));
+                    manualGauging.Verticals.Add(CreateVertical(manualGauging.Verticals.Count, station, startStation, endStation));
                 }
 
                 AdjustUnknownTotalDischargePortion(manualGauging);
@@ -306,7 +306,7 @@ private DischargeMethodType CreateDischargeMethodType()
             throw new ArgumentException($"DischargeEquation='{dischargeEquation}' is not supported");
         }
 
-        private Vertical CreateVertical(Station station, Station startStation, Station endStation)
+        private Vertical CreateVertical(int sequenceNumber, Station station, Station startStation, Station endStation)
         {
             var verticalType = station == startStation && ValidBankTypes.Contains(station.StationType)
                 ? VerticalType.StartEdgeNoWaterBefore
@@ -316,6 +316,7 @@ private Vertical CreateVertical(Station station, Station startStation, Station e
 
             var vertical = new Vertical
             {
+                SequenceNumber = sequenceNumber,
                 TaglinePosition = UnitConverter.ConvertDistance(station.Location),
                 Comments = station.Comment,
                 MeasurementTime = station.CreationTime,

Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,7 @@ private ParseFileResult AppendResults(LocationInfo locationInfo)`
`138`	`138`
`139`	`139`	`foreach (var station in DataFile.Stations)`
`140`	`140`	`{`
`141`		`- manualGauging.Verticals.Add(CreateVertical(station, startStation, endStation));`
	`141`	`+ manualGauging.Verticals.Add(CreateVertical(manualGauging.Verticals.Count, station, startStation, endStation));`
`142`	`142`	`}`
`143`	`143`
`144`	`144`	`AdjustUnknownTotalDischargePortion(manualGauging);`
`@@ -306,7 +306,7 @@ private DischargeMethodType CreateDischargeMethodType()`
`306`	`306`	`throw new ArgumentException($"DischargeEquation='{dischargeEquation}' is not supported");`
`307`	`307`	`}`
`308`	`308`
`309`		`- private Vertical CreateVertical(Station station, Station startStation, Station endStation)`
	`309`	`+ private Vertical CreateVertical(int sequenceNumber, Station station, Station startStation, Station endStation)`
`310`	`310`	`{`
`311`	`311`	`var verticalType = station == startStation && ValidBankTypes.Contains(station.StationType)`
`312`	`312`	`? VerticalType.StartEdgeNoWaterBefore`
`@@ -316,6 +316,7 @@ private Vertical CreateVertical(Station station, Station startStation, Station e`
`316`	`316`
`317`	`317`	`var vertical = new Vertical`
`318`	`318`	`{`
	`319`	`+ SequenceNumber = sequenceNumber,`
`319`	`320`	`TaglinePosition = UnitConverter.ConvertDistance(station.Location),`
`320`	`321`	`Comments = station.Comment,`
`321`	`322`	`MeasurementTime = station.CreationTime,`