FlightDisplayViewWidgets.qml 21.7 KB
Newer Older
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38
/*=====================================================================

QGroundControl Open Source Ground Control Station

(c) 2009, 2015 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>

This file is part of the QGROUNDCONTROL project

    QGROUNDCONTROL is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation, either version 3 of the License, or
    (at your option) any later version.

    QGROUNDCONTROL is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.

    You should have received a copy of the GNU General Public License
    along with QGROUNDCONTROL. If not, see <http://www.gnu.org/licenses/>.

======================================================================*/

import QtQuick                  2.4
import QtQuick.Controls         1.3
import QtQuick.Controls.Styles  1.2
import QtQuick.Dialogs          1.2
import QtLocation               5.3
import QtPositioning            5.2

import QGroundControl               1.0
import QGroundControl.ScreenTools   1.0
import QGroundControl.Controls      1.0
import QGroundControl.Palette       1.0
import QGroundControl.Vehicle       1.0
import QGroundControl.FlightMap     1.0

Item {
39
    id: _root
40

Don Gagne's avatar
Don Gagne committed
41 42
    property alias guidedModeBar: _guidedModeBar

43
    property var    _activeVehicle: QGroundControl.multiVehicleManager.activeVehicle
44
    property bool   _isSatellite:   _mainIsMap ? _flightMap ? _flightMap.isSatelliteMap : true : true
dogmaphobic's avatar
dogmaphobic committed
45

Don Gagne's avatar
Don Gagne committed
46 47
    readonly property real _margins: ScreenTools.defaultFontPixelHeight / 2

48 49
    QGCMapPalette { id: mapPal; lightColors: !isBackgroundDark }

50 51 52 53 54 55 56 57 58 59
    function getGadgetWidth() {
        if(ScreenTools.isMobile) {
            if(ScreenTools.isTinyScreen)
                return mainWindow.width * 0.2
            return mainWindow.width * 0.15
        }
        var w = mainWindow.width * 0.15
        return Math.min(w, 200)
    }

60 61 62 63
    ExclusiveGroup {
        id: _dropButtonsExclusiveGroup
    }

Don Gagne's avatar
Don Gagne committed
64
    //-- Map warnings
65
    Column {
Don Gagne's avatar
Don Gagne committed
66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85
        anchors.horizontalCenter:   parent.horizontalCenter
        anchors.verticalCenter:     parent.verticalCenter
        spacing:                    ScreenTools.defaultFontPixelHeight

        QGCLabel {
            anchors.horizontalCenter:   parent.horizontalCenter
            visible:                    _activeVehicle && !_activeVehicle.coordinateValid
            z:                          QGroundControl.zOrderTopMost
            color:                      mapPal.text
            font.pixelSize:             ScreenTools.largeFontPixelSize
            text:                       "No GPS Lock for Vehicle"
        }

        QGCLabel {
            anchors.horizontalCenter:   parent.horizontalCenter
            visible:                    _activeVehicle && !_activeVehicle.coordinateValid
            z:                          QGroundControl.zOrderTopMost
            color:                      mapPal.text
            font.pixelSize:             ScreenTools.largeFontPixelSize
            text:                       _activeVehicle ? _activeVehicle.prearmError : ""
86 87 88 89 90 91 92 93 94 95 96 97 98 99
        }
    }

    //-- Dismiss Drop Down (if any)
    MouseArea {
        anchors.fill:   parent
        enabled:        _dropButtonsExclusiveGroup.current != null
        onClicked: {
            if(_dropButtonsExclusiveGroup.current)
                _dropButtonsExclusiveGroup.current.checked = false
            _dropButtonsExclusiveGroup.current = null
        }
    }

dogmaphobic's avatar
dogmaphobic committed
100
    //-- Instrument Panel
101
    QGCInstrumentWidget {
102
        id:                     instrumentGadget
103
        anchors.margins:        ScreenTools.defaultFontPixelHeight / 2
Don Gagne's avatar
Don Gagne committed
104
        anchors.right:          altitudeSlider.visible ? altitudeSlider.left : parent.right
105
        anchors.verticalCenter: parent.verticalCenter
106
        visible:                !QGroundControl.virtualTabletJoystick
107
        size:                   getGadgetWidth()
108 109 110 111
        active:                 _activeVehicle != null
        heading:                _heading
        rollAngle:              _roll
        pitchAngle:             _pitch
Don Gagne's avatar
Don Gagne committed
112 113
        groundSpeedFact:        _groundSpeedFact
        airSpeedFact:           _airSpeedFact
114
        isSatellite:            _isSatellite
115
        z:                      QGroundControl.zOrderWidgets
116
        qgcView:                parent.parent.qgcView
117
        maxHeight:              parent.height - (anchors.margins * 2)
dogmaphobic's avatar
dogmaphobic committed
118 119
    }

120 121
    QGCInstrumentWidgetAlternate {
        id:                     instrumentGadgetAlternate
122
        anchors.margins:        ScreenTools.defaultFontPixelHeight / 2
123
        anchors.top:            parent.top
Don Gagne's avatar
Don Gagne committed
124
        anchors.right:          altitudeSlider.visible ? altitudeSlider.left : parent.right
125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143
        visible:                QGroundControl.virtualTabletJoystick
        width:                  getGadgetWidth()
        active:                 _activeVehicle != null
        heading:                _heading
        rollAngle:              _roll
        pitchAngle:             _pitch
        groundSpeedFact:        _groundSpeedFact
        airSpeedFact:           _airSpeedFact
        isSatellite:            _isSatellite
        z:                      QGroundControl.zOrderWidgets
    }

    ValuesWidget {
        anchors.topMargin:  ScreenTools.defaultFontPixelHeight
        anchors.top:        instrumentGadgetAlternate.bottom
        anchors.left:       instrumentGadgetAlternate.left
        width:              getGadgetWidth()
        qgcView:            parent.parent.qgcView
        textColor:          _isSatellite ? "white" : "black"
dogmaphobic's avatar
dogmaphobic committed
144
        visible:            QGroundControl.virtualTabletJoystick
145
        maxHeight:          multiTouchItem.y - y
dogmaphobic's avatar
dogmaphobic committed
146 147
    }

148 149 150
    //-- Vertical Tool Buttons
    Column {
        id:                         toolColumn
dogmaphobic's avatar
dogmaphobic committed
151
        visible:                    _mainIsMap
152 153
        anchors.margins:            ScreenTools.defaultFontPixelHeight
        anchors.left:               parent.left
154
        anchors.top:                parent.top
155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186
        spacing:                    ScreenTools.defaultFontPixelHeight

        //-- Map Center Control
        DropButton {
            id:                     centerMapDropButton
            dropDirection:          dropRight
            buttonImage:            "/qmlimages/MapCenter.svg"
            viewportMargins:        ScreenTools.defaultFontPixelWidth / 2
            exclusiveGroup:         _dropButtonsExclusiveGroup
            z:                      QGroundControl.zOrderWidgets

            dropDownComponent: Component {
                Row {
                    spacing: ScreenTools.defaultFontPixelWidth

                    QGCCheckBox {
                        id:                 followVehicleCheckBox
                        text:               "Follow Vehicle"
                        checked:            _flightMap ? _flightMap._followVehicle : false
                        anchors.baseline:   centerMapButton.baseline

                        onClicked: {
                            _dropButtonsExclusiveGroup.current = null
                            _flightMap._followVehicle = !_flightMap._followVehicle
                        }
                    }

                    QGCButton {
                        id:         centerMapButton
                        text:       "Center map on Vehicle"
                        enabled:    _activeVehicle && !followVehicleCheckBox.checked

187
                        property var activeVehicle: QGroundControl.multiVehicleManager.activeVehicle
188 189 190

                        onClicked: {
                            _dropButtonsExclusiveGroup.current = null
191
                            _flightMap.center = activeVehicle.coordinate
192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207
                        }
                    }
                }
            }
        }

        //-- Map Type Control
        DropButton {
            id:                     mapTypeButton
            dropDirection:          dropRight
            buttonImage:            "/qmlimages/MapType.svg"
            viewportMargins:        ScreenTools.defaultFontPixelWidth / 2
            exclusiveGroup:         _dropButtonsExclusiveGroup
            z:                      QGroundControl.zOrderWidgets

            dropDownComponent: Component {
Don Gagne's avatar
Don Gagne committed
208
                Column {
209 210
                    spacing: ScreenTools.defaultFontPixelWidth

Don Gagne's avatar
Don Gagne committed
211 212 213 214 215
                    Row {
                        spacing: ScreenTools.defaultFontPixelWidth

                        Repeater {
                            model: QGroundControl.flightMapSettings.mapTypes
216

Don Gagne's avatar
Don Gagne committed
217 218 219 220
                            QGCButton {
                                checkable:  true
                                checked:    _flightMap ? _flightMap.mapType == text : false
                                text:       modelData
221

Don Gagne's avatar
Don Gagne committed
222 223 224 225
                                onClicked: {
                                    _flightMap.mapType = text
                                    _dropButtonsExclusiveGroup.current = null
                                }
226 227 228
                            }
                        }
                    }
Don Gagne's avatar
Don Gagne committed
229 230 231 232 233 234 235 236 237 238

                    QGCButton {
                        text:       "Clear flight trails"
                        enabled:    QGroundControl.multiVehicleManager.activeVehicle

                        onClicked: {
                            QGroundControl.multiVehicleManager.activeVehicle.clearTrajectoryPoints()
                            _dropButtonsExclusiveGroup.current = null
                        }
                    }
239 240 241 242 243 244 245
                }
            }
        }

        //-- Zoom Map In
        RoundButton {
            id:                 mapZoomPlus
dogmaphobic's avatar
dogmaphobic committed
246
            visible:            _mainIsMap && !ScreenTools.isTinyScreen
247 248 249 250 251 252 253 254 255 256 257 258 259
            buttonImage:        "/qmlimages/ZoomPlus.svg"
            exclusiveGroup:     _dropButtonsExclusiveGroup
            z:                  QGroundControl.zOrderWidgets
            onClicked: {
                if(_flightMap)
                    _flightMap.zoomLevel += 0.5
                checked = false
            }
        }

        //-- Zoom Map Out
        RoundButton {
            id:                 mapZoomMinus
dogmaphobic's avatar
dogmaphobic committed
260
            visible:            _mainIsMap && !ScreenTools.isTinyScreen
261 262 263 264 265 266 267 268 269 270 271
            buttonImage:        "/qmlimages/ZoomMinus.svg"
            exclusiveGroup:     _dropButtonsExclusiveGroup
            z:                  QGroundControl.zOrderWidgets
            onClicked: {
                if(_flightMap)
                    _flightMap.zoomLevel -= 0.5
                checked = false
            }
        }
    }

Don Gagne's avatar
Don Gagne committed
272 273 274
    //-- Guided mode buttons
    Rectangle {
        id:                         _guidedModeBar
Don Gagne's avatar
Don Gagne committed
275
        anchors.margins:            _barMargin
Don Gagne's avatar
Don Gagne committed
276 277
        anchors.bottom:             parent.bottom
        anchors.horizontalCenter:   parent.horizontalCenter
Don Gagne's avatar
Don Gagne committed
278 279 280
        width:                      guidedModeColumn.width + (_margins * 2)
        height:                     guidedModeColumn.height + (_margins * 2)
        radius:                     _margins
Don Gagne's avatar
Don Gagne committed
281 282 283 284
        color:                      qgcPal.window
        visible:                    _activeVehicle
        opacity:                    0.9
        z:                          QGroundControl.zOrderWidgets
Don Gagne's avatar
Don Gagne committed
285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324
        state:                      "Shown"

        states: [
            State {
                name: "Shown"
                PropertyChanges { target: showAnimation; running: true  }
                PropertyChanges { target: guidedModeHideTimer; running: true }
            },
            State {
                name: "Hidden"
                PropertyChanges { target: hideAnimation; running: true  }
            }
        ]

        PropertyAnimation {
            id:             hideAnimation
            target:         _guidedModeBar
            property:       "_barMargin"
            duration:       1000
            easing.type:    Easing.InOutQuad
            from:           _guidedModeBar._showMargin
            to:             _guidedModeBar._hideMargin
        }

        PropertyAnimation {
            id:             showAnimation
            target:         _guidedModeBar
            property:       "_barMargin"
            duration:       250
            easing.type:    Easing.InOutQuad
            from:           _guidedModeBar._hideMargin
            to:             _guidedModeBar._showMargin
        }

        Timer {
            id:             guidedModeHideTimer
            interval:       7000
            running:        true
            onTriggered:    _guidedModeBar.state = "Hidden"
        }
Don Gagne's avatar
Don Gagne committed
325 326 327 328 329 330 331 332 333

        readonly property int confirmHome:          1
        readonly property int confirmLand:          2
        readonly property int confirmTakeoff:       3
        readonly property int confirmArm:           4
        readonly property int confirmDisarm:        5
        readonly property int confirmEmergencyStop: 6
        readonly property int confirmChangeAlt:     7
        readonly property int confirmGoTo:          8
334
        readonly property int confirmRetask:        9
Don Gagne's avatar
Don Gagne committed
335 336

        property int    confirmActionCode
Don Gagne's avatar
Don Gagne committed
337 338 339
        property real   _showMargin:    _margins
        property real   _hideMargin:    _margins - _guidedModeBar.height
        property real   _barMargin:     _showMargin
Don Gagne's avatar
Don Gagne committed
340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372

        function actionConfirmed() {
            switch (confirmActionCode) {
            case confirmHome:
                _activeVehicle.guidedModeRTL()
                break;
            case confirmLand:
                _activeVehicle.guidedModeLand()
                break;
            case confirmTakeoff:
                var altitude = altitudeSlider.getValue()
                if (!isNaN(altitude)) {
                    _activeVehicle.guidedModeTakeoff(altitude)
                }
                break;
            case confirmArm:
                _activeVehicle.armed = true
                break;
            case confirmDisarm:
                _activeVehicle.armed = false
                break;
            case confirmEmergencyStop:
                _activeVehicle.emergencyStop()
                break;
            case confirmChangeAlt:
                var altitude = altitudeSlider.getValue()
                if (!isNaN(altitude)) {
                    _activeVehicle.guidedModeChangeAltitude(altitude)
                }
                break;
            case confirmGoTo:
                _activeVehicle.guidedModeGotoLocation(_flightMap._gotoHereCoordinate)
                break;
373 374 375
            case confirmRetask:
                _activeVehicle.setCurrentMissionSequence(_flightMap._retaskSequence)
                break;
Don Gagne's avatar
Don Gagne committed
376 377 378 379 380
            default:
                console.warn("Internal error: unknown confirmActionCode", confirmActionCode)
            }
        }

381 382 383 384 385
        function rejectGuidedModeConfirm() {
            guidedModeConfirm.visible = false
            guidedModeBar.visible = true
            altitudeSlider.visible = false
            _flightMap._gotoHereCoordinate = QtPositioning.coordinate()
Don Gagne's avatar
Don Gagne committed
386
            guidedModeHideTimer.restart()
387 388
        }

Don Gagne's avatar
Don Gagne committed
389
        function confirmAction(actionCode) {
Don Gagne's avatar
Don Gagne committed
390
            guidedModeHideTimer.stop()
Don Gagne's avatar
Don Gagne committed
391 392 393
            confirmActionCode = actionCode
            switch (confirmActionCode) {
            case confirmArm:
394
                guidedModeConfirm.confirmText = "arm"
Don Gagne's avatar
Don Gagne committed
395 396
                break;
            case confirmDisarm:
397
                guidedModeConfirm.confirmText = "disarm"
Don Gagne's avatar
Don Gagne committed
398 399
                break;
            case confirmEmergencyStop:
400
                guidedModeConfirm.confirmText = "STOP ALL MOTORS!"
Don Gagne's avatar
Don Gagne committed
401 402 403
                break;
            case confirmTakeoff:
                altitudeSlider.visible = true
404
                altitudeSlider.setInitialValueMeters(10)
405
                guidedModeConfirm.confirmText = "takeoff"
Don Gagne's avatar
Don Gagne committed
406 407
                break;
            case confirmLand:
408
                guidedModeConfirm.confirmText = "land"
Don Gagne's avatar
Don Gagne committed
409
                break;
Don Gagne's avatar
Don Gagne committed
410 411 412
            case confirmHome:
                guidedModeConfirm.confirmText = "return to launch"
                break;
Don Gagne's avatar
Don Gagne committed
413 414
            case confirmChangeAlt:
                altitudeSlider.visible = true
415
                altitudeSlider.setInitialValueAppSettingsDistanceUnits(_activeVehicle.altitudeAMSL.value)
416
                guidedModeConfirm.confirmText = "change altitude"
Don Gagne's avatar
Don Gagne committed
417 418
                break;
            case confirmGoTo:
419
                guidedModeConfirm.confirmText = "move vehicle"
Don Gagne's avatar
Don Gagne committed
420
                break;
421 422 423
            case confirmRetask:
                _guidedModeBar.confirmText = "active waypoint change"
                break;
Don Gagne's avatar
Don Gagne committed
424
            }
425
            guidedModeBar.visible = false
Don Gagne's avatar
Don Gagne committed
426 427 428
            guidedModeConfirm.visible = true
        }

Don Gagne's avatar
Don Gagne committed
429 430
        Column {
            id:                 guidedModeColumn
Don Gagne's avatar
Don Gagne committed
431 432 433 434 435
            anchors.margins:    _margins
            anchors.top:        parent.top
            anchors.left:       parent.left
            spacing:            _margins

Don Gagne's avatar
Don Gagne committed
436 437 438 439 440 441
            Row {
                spacing: _margins

                QGCButton {
                    text:       _activeVehicle.armed ? (_activeVehicle.flying ? "Emergency Stop" : "Disarm") : "Arm"
                    onClicked:  _guidedModeBar.confirmAction(_activeVehicle.armed ? (_activeVehicle.flying ? _guidedModeBar.confirmEmergencyStop : _guidedModeBar.confirmDisarm) : _guidedModeBar.confirmArm)
442
                }
Don Gagne's avatar
Don Gagne committed
443

Don Gagne's avatar
Don Gagne committed
444 445 446 447
                QGCButton {
                    text:       "RTL"
                    visible:    _activeVehicle.guidedModeSupported && _activeVehicle.flying
                    onClicked:  _guidedModeBar.confirmAction(_guidedModeBar.confirmHome)
448
                }
Don Gagne's avatar
Don Gagne committed
449

Don Gagne's avatar
Don Gagne committed
450 451 452 453
                QGCButton {
                    text:        _activeVehicle.flying ? "Land" : "Takeoff"
                    visible:    _activeVehicle.guidedModeSupported && _activeVehicle.armed
                    onClicked:  _guidedModeBar.confirmAction(_activeVehicle.flying ? _guidedModeBar.confirmLand : _guidedModeBar.confirmTakeoff)
454
                }
Don Gagne's avatar
Don Gagne committed
455

Don Gagne's avatar
Don Gagne committed
456 457 458 459 460
                QGCButton {
                    text:       "Pause"
                    visible:    _activeVehicle.pauseVehicleSupported && _activeVehicle.flying
                    onClicked:  {
                        guidedModeHideTimer.restart()
461 462 463
                        _activeVehicle.pauseVehicle()
                    }
                }
Don Gagne's avatar
Don Gagne committed
464

Don Gagne's avatar
Don Gagne committed
465 466 467 468
                QGCButton {
                    text:       "Change Altitude"
                    visible:    _activeVehicle.guidedModeSupported && _activeVehicle.armed
                    onClicked:  _guidedModeBar.confirmAction(_guidedModeBar.confirmChangeAlt)
469
                }
Don Gagne's avatar
Don Gagne committed
470 471 472 473 474 475
            } // Row

            QGCLabel {
                anchors.horizontalCenter: parent.horizontalCenter
                text:       "Click in map to move vehicle"
                visible:    _activeVehicle && _activeVehicle.guidedMode && _activeVehicle.flying
Don Gagne's avatar
Don Gagne committed
476
            }
Don Gagne's avatar
Don Gagne committed
477
        } // Column
478 479
    } // Rectangle - Guided mode buttons

480
    MouseArea {
Don Gagne's avatar
Don Gagne committed
481 482 483
        anchors.fill:   parent
        enabled:        guidedModeConfirm.visible
        onClicked:      _guidedModeBar.rejectGuidedModeConfirm()
484 485
    }

486 487 488
    // Action confirmation control
    SliderSwitch {
        id:                         guidedModeConfirm
Don Gagne's avatar
Don Gagne committed
489 490
        anchors.bottomMargin:       _margins
        anchors.bottom:             parent.bottom
491
        anchors.horizontalCenter:   parent.horizontalCenter
Don Gagne's avatar
Don Gagne committed
492
        height:                     ScreenTools.defaultFontPixelHeight * 3
493 494 495 496 497 498 499 500
        visible:                    false
        z:                          QGroundControl.zOrderWidgets

        onAccept: {
            guidedModeConfirm.visible = false
            guidedModeBar.visible = true
            _guidedModeBar.actionConfirmed()
            altitudeSlider.visible = false
Don Gagne's avatar
Don Gagne committed
501
            guidedModeHideTimer.restart()
Don Gagne's avatar
Don Gagne committed
502
        }
503

Don Gagne's avatar
Don Gagne committed
504
        onReject: _guidedModeBar.rejectGuidedModeConfirm()
505
    }
Don Gagne's avatar
Don Gagne committed
506 507 508 509 510 511 512 513 514 515 516 517 518

    //-- Altitude slider
    Rectangle {
        id:                 altitudeSlider
        anchors.margins:    _margins
        anchors.right:      parent.right
        anchors.top:        parent.top
        anchors.bottom:     parent.bottom
        color:              qgcPal.window
        width:              ScreenTools.defaultFontPixelWidth * 10
        opacity:            0.8
        visible:            false

519 520 521 522 523 524 525
        function setInitialValueMeters(meters) {
            altSlider.value = QGroundControl.metersToAppSettingsDistanceUnits(meters)
        }

        function setInitialValueAppSettingsDistanceUnits(height) {
            altSlider.value = height
        }
Don Gagne's avatar
Don Gagne committed
526 527 528

        /// Returns NaN for bad value
        function getValue() {
529 530 531 532 533 534
            var value =  parseFloat(altField.text)
            if (!isNaN(value)) {
                return QGroundControl.appSettingsDistanceUnitsToMeters(value);
            } else {
                return value;
            }
Don Gagne's avatar
Don Gagne committed
535 536 537 538 539 540 541 542 543 544 545
        }

        Column {
            id:                 headerColumn
            anchors.margins:    _margins
            anchors.top:        parent.top
            anchors.left:       parent.left
            anchors.right:      parent.right

            QGCLabel {
                anchors.horizontalCenter: parent.horizontalCenter
546
                text: "Alt (rel)"
Don Gagne's avatar
Don Gagne committed
547 548 549 550
            }

            QGCLabel {
                anchors.horizontalCenter: parent.horizontalCenter
551
                text: QGroundControl.appSettingsDistanceUnitsString
Don Gagne's avatar
Don Gagne committed
552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570
            }

            QGCTextField {
                id:             altField
                anchors.left:   parent.left
                anchors.right:  parent.right
                text:           altSlider.value.toFixed(1)
            }
        }

        Slider {
            id:                 altSlider
            anchors.margins:    _margins
            anchors.top:        headerColumn.bottom
            anchors.bottom:     parent.bottom
            anchors.left:       parent.left
            anchors.right:      parent.right
            orientation:        Qt.Vertical
            minimumValue:       0
571
            maximumValue:       QGroundControl.metersToAppSettingsDistanceUnits(100)
Don Gagne's avatar
Don Gagne committed
572 573
        }
    }
574
}