Skip to content

Commit 32e8d47

Browse files
committed
fix ranges logic
1 parent cd859b4 commit 32e8d47

1 file changed

Lines changed: 16 additions & 7 deletions

File tree

backend/internal/adj/boards.go

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,12 @@ func getBoards(boardsList map[string]string) (map[string]Board, error) {
5656

5757
board.Structures = getBoardStructures(board)
5858

59+
// DEBUG
60+
for _, meas := range board.Measurements {
61+
println(meas.SafeRange[0], ", ", meas.SafeRange[1])
62+
println(meas.WarningRange[0], ", ", meas.WarningRange[1])
63+
}
64+
5965
boards[boardName] = board
6066
}
6167

@@ -157,35 +163,38 @@ func getRanges(measTMP Measurement) ([]*float64, []*float64, error) {
157163
warningRange := make([]*float64, 0)
158164

159165
if measTMP.OutOfRange.Safe == nil && measTMP.OutOfRange.Warning == nil {
160-
if measTMP.Below.Safe == nil {
161-
safeRange = nil
166+
if measTMP.Below.Safe == nil && measTMP.Below.Warning == nil && measTMP.Above.Safe == nil && measTMP.Above.Warning == nil {
167+
safeRange = append(safeRange, []*float64{nil, nil}...)
168+
warningRange = append(warningRange, []*float64{nil, nil}...)
169+
} else if measTMP.Below.Safe == nil {
170+
safeRange = append(safeRange, []*float64{nil}...)
162171
} else {
163172
safeRange = append(safeRange, measTMP.Below.Safe)
164173
}
165174

166175
if measTMP.Above.Safe == nil {
167-
safeRange = nil
176+
safeRange = append(safeRange, []*float64{nil}...)
168177
} else {
169178
safeRange = append(safeRange, measTMP.Above.Safe)
170179
}
171180

172181
if measTMP.Below.Warning == nil {
173-
warningRange = nil
182+
warningRange = append(warningRange, []*float64{nil}...)
174183
} else {
175184
warningRange = append(warningRange, measTMP.Below.Warning)
176185
}
177186

178187
if measTMP.Above.Warning == nil {
179-
warningRange = nil
188+
warningRange = append(warningRange, []*float64{nil}...)
180189
} else {
181190
warningRange = append(warningRange, measTMP.Above.Warning)
182191
}
183192
} else if measTMP.OutOfRange.Safe == nil {
184-
safeRange = nil
193+
safeRange = append(safeRange, []*float64{nil, nil}...)
185194
warningRange = append(warningRange, measTMP.OutOfRange.Warning...)
186195
} else if measTMP.OutOfRange.Warning == nil {
187196
safeRange = append(safeRange, measTMP.OutOfRange.Safe...)
188-
warningRange = nil
197+
warningRange = append(warningRange, []*float64{nil, nil}...)
189198
} else {
190199
safeRange = append(safeRange, measTMP.OutOfRange.Safe...)
191200
warningRange = append(warningRange, measTMP.OutOfRange.Warning...)

0 commit comments

Comments
 (0)