FlightDisplayView.qml 25.3 KB
Newer Older
1 2 3 4 5 6 7 8
/****************************************************************************
 *
 *   (c) 2009-2016 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
 *
 * QGroundControl is licensed according to the terms in the file
 * COPYING.md in the root of the source code directory.
 *
 ****************************************************************************/
9 10


11 12
import QtQuick                  2.3
import QtQuick.Controls         1.2
13
import QtQuick.Controls.Styles  1.4
14
import QtQuick.Dialogs          1.2
15 16 17
import QtLocation               5.3
import QtPositioning            5.3
import QtMultimedia             5.5
18
import QtQuick.Layouts          1.2
19

20
import QGroundControl               1.0
Don Gagne's avatar
Don Gagne committed
21
import QGroundControl.FlightDisplay 1.0
22 23 24 25
import QGroundControl.FlightMap     1.0
import QGroundControl.ScreenTools   1.0
import QGroundControl.Controls      1.0
import QGroundControl.Palette       1.0
26
import QGroundControl.Vehicle       1.0
27
import QGroundControl.Controllers   1.0
Don Gagne's avatar
Don Gagne committed
28
import QGroundControl.FactSystem    1.0
29 30

/// Flight Display View
31 32 33
QGCView {
    id:             root
    viewPanel:      _panel
34

35
    QGCPalette { id: qgcPal; colorGroupEnabled: enabled }
36

Don Gagne's avatar
Don Gagne committed
37 38
    property alias  guidedController:   guidedActionsController

39 40
    property bool activeVehicleJoystickEnabled: _activeVehicle ? _activeVehicle.joystickEnabled : false

41 42 43 44 45 46 47 48 49 50 51 52
    property var    _planMasterController:  masterController
    property var    _missionController:     _planMasterController.missionController
    property var    _geoFenceController:    _planMasterController.geoFenceController
    property var    _rallyPointController:  _planMasterController.rallyPointController
    property var    _activeVehicle:         QGroundControl.multiVehicleManager.activeVehicle
    property bool   _mainIsMap:             QGroundControl.videoManager.hasVideo ? QGroundControl.loadBoolGlobalSetting(_mainIsMapKey,  true) : true
    property bool   _isPipVisible:          QGroundControl.videoManager.hasVideo ? QGroundControl.loadBoolGlobalSetting(_PIPVisibleKey, true) : false
    property real   _savedZoomLevel:        0
    property real   _margins:               ScreenTools.defaultFontPixelWidth / 2
    property real   _pipSize:               mainWindow.width * 0.2
    property alias  _guidedController:      guidedActionsController
    property alias  _altitudeSlider:        altitudeSlider
53

54

Don Gagne's avatar
Don Gagne committed
55 56 57 58 59 60 61 62 63 64 65 66
    readonly property bool      isBackgroundDark:       _mainIsMap ? (_flightMap ? _flightMap.isSatelliteMap : true) : true
    readonly property real      _defaultRoll:           0
    readonly property real      _defaultPitch:          0
    readonly property real      _defaultHeading:        0
    readonly property real      _defaultAltitudeAMSL:   0
    readonly property real      _defaultGroundSpeed:    0
    readonly property real      _defaultAirSpeed:       0
    readonly property string    _mapName:               "FlightDisplayView"
    readonly property string    _showMapBackgroundKey:  "/showMapBackground"
    readonly property string    _mainIsMapKey:          "MainFlyWindowIsMap"
    readonly property string    _PIPVisibleKey:         "IsPIPVisible"

67
    function setStates() {
68
        QGroundControl.saveBoolGlobalSetting(_mainIsMapKey, _mainIsMap)
69
        if(_mainIsMap) {
70 71 72 73 74 75 76 77
            //-- Adjust Margins
            _flightMapContainer.state   = "fullMode"
            _flightVideo.state          = "pipMode"
            //-- Save/Restore Map Zoom Level
            if(_savedZoomLevel != 0)
                _flightMap.zoomLevel = _savedZoomLevel
            else
                _savedZoomLevel = _flightMap.zoomLevel
78
        } else {
79 80 81 82 83 84
            //-- Adjust Margins
            _flightMapContainer.state   = "pipMode"
            _flightVideo.state          = "fullMode"
            //-- Set Map Zoom Level
            _savedZoomLevel = _flightMap.zoomLevel
            _flightMap.zoomLevel = _savedZoomLevel - 3
85
        }
Don Gagne's avatar
Don Gagne committed
86 87
    }

88 89 90
    function setPipVisibility(state) {
        _isPipVisible = state;
        QGroundControl.saveBoolGlobalSetting(_PIPVisibleKey, state)
91 92
    }

93
    function px4JoystickCheck() {
94
        if ( _activeVehicle && !_activeVehicle.supportsManualControl && (QGroundControl.settingsManager.appSettings.virtualJoystick.value || _activeVehicle.joystickEnabled)) {
95 96 97 98
            px4JoystickSupport.open()
        }
    }

99 100
    PlanElemementMasterController {
        id:                     masterController
101
        Component.onCompleted:  start(false /* editMode */)
102 103
    }

104 105 106
    Connections {
        target:                 _missionController
        onResumeMissionReady:   guidedActionsController.confirmAction(guidedActionsController.actionResumeMissionReady)
107 108
    }

109 110
    MessageDialog {
        id:     px4JoystickSupport
111 112 113
        text:   qsTr("Joystick support requires MAVLink MANUAL_CONTROL support. ") +
                qsTr("The firmware you are running does not normally support this. ") +
                qsTr("It will only work if you have modified the firmware to add MANUAL_CONTROL support.")
114 115 116
    }

    Connections {
117
        target:                 QGroundControl.multiVehicleManager
118 119 120 121
        onActiveVehicleChanged: px4JoystickCheck()
    }

    Connections {
122 123
        target:         QGroundControl.settingsManager.appSettings.virtualJoystick
        onValueChanged: px4JoystickCheck()
124 125 126 127
    }

    onActiveVehicleJoystickEnabledChanged: px4JoystickCheck()

128 129
    Component.onCompleted: {
        setStates()
130
        px4JoystickCheck()
131 132 133
        if(QGroundControl.corePlugin.options.flyViewOverlay.toString().length) {
            flyViewOverlay.source = QGroundControl.corePlugin.options.flyViewOverlay
        }
134
    }
dogmaphobic's avatar
dogmaphobic committed
135

136 137 138 139 140 141 142 143 144 145 146 147 148 149
    // The following code is used to track vehicle states such that we prompt to remove mission from vehicle when mission completes

    property bool vehicleArmed:                 _activeVehicle ? _activeVehicle.armed : true // true here prevents pop up from showing during shutdown
    property bool vehicleWasArmed:              false
    property bool vehicleInMissionFlightMode:   _activeVehicle ? (_activeVehicle.flightMode === _activeVehicle.missionFlightMode) : false
    property bool promptForMissionRemove:       false

    onVehicleArmedChanged: {
        if (vehicleArmed) {
            if (!promptForMissionRemove) {
                promptForMissionRemove = vehicleInMissionFlightMode
                vehicleWasArmed = true
            }
        } else {
150
            if (promptForMissionRemove && (_missionController.containsItems || _geoFenceController.containsItems || _rallyPointController.containsItems)) {
151
                root.showDialog(missionCompleteDialogComponent, qsTr("Flight Plan complete"), showDialogDefaultWidth, StandardButton.Close)
152 153 154 155 156 157 158 159 160 161 162 163
            }
            promptForMissionRemove = false
        }
    }

    onVehicleInMissionFlightModeChanged: {
        if (!promptForMissionRemove && vehicleArmed) {
            promptForMissionRemove = true
        }
    }

    Component {
164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192
        id: missionCompleteDialogComponent

        QGCViewDialog {
            QGCFlickable {
                anchors.fill:   parent
                contentHeight:  column.height

                Column {
                    id:                 column
                    anchors.margins:    _margins
                    anchors.left:       parent.left
                    anchors.right:      parent.right
                    spacing:            ScreenTools.defaultFontPixelHeight

                    QGCLabel {
                        text:                       qsTr("%1 Images Taken").arg(_activeVehicle.cameraTriggerPoints.count)
                        anchors.horizontalCenter:   parent.horizontalCenter
                        visible:                    _activeVehicle.cameraTriggerPoints.count != 0
                    }

                    QGCButton {
                        text:                       qsTr("Remove plan from vehicle")
                        anchors.horizontalCenter:   parent.horizontalCenter
                        onClicked: {
                            _planMasterController.removeAllFromVehicle()
                            hideDialog()
                        }
                    }
                }
193 194 195 196
            }
        }
    }

197 198
    QGCMapPalette { id: mapPal; lightColors: _mainIsMap ? _flightMap.isSatelliteMap : true }

199 200 201 202 203 204 205 206 207 208 209 210 211
    QGCViewPanel {
        id:             _panel
        anchors.fill:   parent

        //-- Map View
        //   For whatever reason, if FlightDisplayViewMap is the _panel item, changing
        //   width/height has no effect.
        Item {
            id: _flightMapContainer
            z:  _mainIsMap ? _panel.z + 1 : _panel.z + 2
            anchors.left:   _panel.left
            anchors.bottom: _panel.bottom
            visible:        _mainIsMap || _isPipVisible
212 213
            width:          _mainIsMap ? _panel.width  : _pipSize
            height:         _mainIsMap ? _panel.height : _pipSize * (9/16)
214 215 216 217 218 219 220 221 222 223 224 225 226 227
            states: [
                State {
                    name:   "pipMode"
                    PropertyChanges {
                        target:             _flightMapContainer
                        anchors.margins:    ScreenTools.defaultFontPixelHeight
                    }
                },
                State {
                    name:   "fullMode"
                    PropertyChanges {
                        target:             _flightMapContainer
                        anchors.margins:    0
                    }
228
                }
229 230
            ]
            FlightDisplayViewMap {
231 232
                id:                         _flightMap
                anchors.fill:               parent
233
                planMasterController:       masterController
234 235 236 237 238
                guidedActionsController:    _guidedController
                flightWidgets:              flightDisplayViewWidgets
                rightPanelWidth:            ScreenTools.defaultFontPixelHeight * 9
                qgcView:                    root
                scaleState:                 (_mainIsMap && flyViewOverlay.item) ? (flyViewOverlay.item.scaleState ? flyViewOverlay.item.scaleState : "bottomMode") : "bottomMode"
239
            }
240
        }
241

242
        //-- Video View
243
        Item {
244 245
            id:             _flightVideo
            z:              _mainIsMap ? _panel.z + 2 : _panel.z + 1
246 247
            width:          !_mainIsMap ? _panel.width  : _pipSize
            height:         !_mainIsMap ? _panel.height : _pipSize * (9/16)
248 249
            anchors.left:   _panel.left
            anchors.bottom: _panel.bottom
250
            visible:        QGroundControl.videoManager.hasVideo && (!_mainIsMap || _isPipVisible)
251 252 253 254 255 256 257 258 259 260 261 262 263 264
            states: [
                State {
                    name:   "pipMode"
                    PropertyChanges {
                        target: _flightVideo
                        anchors.margins:    ScreenTools.defaultFontPixelHeight
                    }
                },
                State {
                    name:   "fullMode"
                    PropertyChanges {
                        target: _flightVideo
                        anchors.margins:    0
                    }
265
                }
266
            ]
267
            //-- Video Streaming
268 269 270 271 272
            FlightDisplayViewVideo {
                anchors.fill:   parent
                visible:        QGroundControl.videoManager.isGStreamer
            }
            //-- UVC Video (USB Camera or Video Device)
273 274
            Loader {
                id:             cameraLoader
275 276
                anchors.fill:   parent
                visible:        !QGroundControl.videoManager.isGStreamer
277
                source:         QGroundControl.videoManager.uvcEnabled ? "qrc:/qml/FlightDisplayViewUVC.qml" : "qrc:/qml/FlightDisplayViewDummy.qml"
278
            }
dogmaphobic's avatar
dogmaphobic committed
279
        }
280 281 282 283

        QGCPipable {
            id:                 _flightVideoPipControl
            z:                  _flightVideo.z + 3
284 285
            width:              _pipSize
            height:             _pipSize * (9/16)
286 287 288
            anchors.left:       _panel.left
            anchors.bottom:     _panel.bottom
            anchors.margins:    ScreenTools.defaultFontPixelHeight
289
            visible:            QGroundControl.videoManager.hasVideo
290 291 292 293 294 295 296 297 298
            isHidden:           !_isPipVisible
            isDark:             isBackgroundDark
            onActivated: {
                _mainIsMap = !_mainIsMap
                setStates()
            }
            onHideIt: {
                setPipVisibility(!state)
            }
dogmaphobic's avatar
dogmaphobic committed
299
        }
Don Gagne's avatar
Don Gagne committed
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 325 326 327
        Row {
            id:                     singleMultiSelector
            anchors.topMargin:      ScreenTools.toolbarHeight + _margins
            anchors.rightMargin:    _margins
            anchors.right:          parent.right
            anchors.top:            parent.top
            spacing:                ScreenTools.defaultFontPixelWidth
            z:                      _panel.z + 4
            visible:                QGroundControl.multiVehicleManager.vehicles.count > 1

            ExclusiveGroup { id: multiVehicleSelectorGroup }

            QGCRadioButton {
                id:             singleVehicleView
                exclusiveGroup: multiVehicleSelectorGroup
                text:           qsTr("Single")
                checked:        true
                color:          mapPal.text
            }

            QGCRadioButton {
                exclusiveGroup: multiVehicleSelectorGroup
                text:           qsTr("Multi-Vehicle (WIP)")
                color:          mapPal.text
            }
        }

328
        FlightDisplayViewWidgets {
329 330 331 332
            id:                 flightDisplayViewWidgets
            z:                  _panel.z + 4
            height:             ScreenTools.availableHeight
            anchors.left:       parent.left
333
            anchors.right:      altitudeSlider.visible ? altitudeSlider.left : parent.right
334 335
            anchors.bottom:     parent.bottom
            qgcView:            root
336
            useLightColors:     isBackgroundDark
337
            missionController:  _missionController
338 339 340
            visible:            singleVehicleView.checked
        }

341 342 343 344 345 346 347 348 349
        //-------------------------------------------------------------------------
        //-- Loader helper for plugins to overlay elements over the fly view
        Loader {
            id:                 flyViewOverlay
            z:                  flightDisplayViewWidgets.z + 1
            height:             ScreenTools.availableHeight
            anchors.left:       parent.left
            anchors.right:      altitudeSlider.visible ? altitudeSlider.left : parent.right
            anchors.bottom:     parent.bottom
350 351

            property var qgcView: root
352 353
        }

354 355 356 357 358 359 360 361
        // Button to start/stop video recording
        Item {
            z:                  _flightVideoPipControl.z + 1
            anchors.margins:    ScreenTools.defaultFontPixelHeight / 2
            anchors.bottom:     _flightVideo.bottom
            anchors.right:      _flightVideo.right
            height:             ScreenTools.defaultFontPixelHeight * 2
            width:              height
362
            visible:            QGroundControl.videoManager.videoRunning && QGroundControl.settingsManager.videoSettings.showRecControl.rawValue
363 364 365 366 367 368
            opacity:            0.75

            Rectangle {
                anchors.top:        parent.top
                anchors.bottom:     parent.bottom
                width:              height
369
                radius:             QGroundControl.videoManager && QGroundControl.videoManager.videoReceiver && QGroundControl.videoManager.videoReceiver.recording ? 0 : height
370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385
                color:              "red"
            }

            QGCColoredImage {
                anchors.top:                parent.top
                anchors.bottom:             parent.bottom
                anchors.horizontalCenter:   parent.horizontalCenter
                width:                      height * 0.625
                sourceSize.width:           width
                source:                     "/qmlimages/CameraIcon.svg"
                fillMode:                   Image.PreserveAspectFit
                color:                      "white"
            }

            MouseArea {
                anchors.fill:   parent
386
                onClicked:      QGroundControl.videoManager.videoReceiver && QGroundControl.videoManager.videoReceiver.recording ? QGroundControl.videoManager.videoReceiver.stopRecording() : QGroundControl.videoManager.videoReceiver.startRecording()
387 388 389
            }
        }

390 391 392 393 394 395 396 397
        MultiVehicleList {
            anchors.margins:    _margins
            anchors.top:        singleMultiSelector.bottom
            anchors.right:      parent.right
            anchors.bottom:     parent.bottom
            width:              ScreenTools.defaultFontPixelWidth * 30
            visible:            !singleVehicleView.checked
            z:                  _panel.z + 4
398
        }
dogmaphobic's avatar
dogmaphobic committed
399

400

401
        //-- Virtual Joystick
402
        Loader {
403
            id:                         virtualJoystickMultiTouch
404 405
            z:                          _panel.z + 5
            width:                      parent.width  - (_flightVideoPipControl.width / 2)
406
            height:                     Math.min(ScreenTools.availableHeight * 0.25, ScreenTools.defaultFontPixelWidth * 16)
407
            visible:                    _virtualJoystick ? _virtualJoystick.value : false
408 409
            anchors.bottom:             _flightVideoPipControl.top
            anchors.bottomMargin:       ScreenTools.defaultFontPixelHeight * 2
410
            anchors.horizontalCenter:   flightDisplayViewWidgets.horizontalCenter
411
            source:                     "qrc:/qml/VirtualJoystick.qml"
412
            active:                     _virtualJoystick ? _virtualJoystick.value : false
Don Gagne's avatar
Don Gagne committed
413

414
            property bool useLightColors: isBackgroundDark
415 416

            property Fact _virtualJoystick: QGroundControl.settingsManager.appSettings.virtualJoystick
Don Gagne's avatar
Don Gagne committed
417
        }
418 419

        ToolStrip {
420
            visible:            _activeVehicle ? _activeVehicle.guidedModeSupported : true
421 422 423
            id:                 toolStrip
            anchors.leftMargin: ScreenTools.defaultFontPixelWidth
            anchors.left:       _panel.left
424
            anchors.topMargin:  ScreenTools.toolbarHeight + (_margins * 2)
425 426 427 428
            anchors.top:        _panel.top
            z:                  _panel.z + 4
            title:              qsTr("Fly")
            maxHeight:          (_flightVideo.visible ? _flightVideo.y : parent.height) - toolStrip.y
429 430
            buttonVisible:      [ _guidedController.showTakeoff || !_guidedController.showLand, _guidedController.showLand && !_guidedController.showTakeoff, true, true, true, _guidedController.smartShotsAvailable ]
            buttonEnabled:      [ _guidedController.showTakeoff, _guidedController.showLand, _guidedController.showRTL, _guidedController.showPause, _anyActionAvailable, _anySmartShotAvailable ]
431

432
            property bool _anyActionAvailable: _guidedController.showStartMission || _guidedController.showResumeMission || _guidedController.showChangeAlt || _guidedController.showLandAbort
433
            property bool _anySmartShotAvailable: _guidedController.showOrbit
434 435
            property var _actionModel: [
                {
436 437 438 439
                    title:      _guidedController.startMissionTitle,
                    text:       _guidedController.startMissionMessage,
                    action:     _guidedController.actionStartMission,
                    visible:    _guidedController.showStartMission
440
                },
Don Gagne's avatar
Don Gagne committed
441 442 443 444 445 446
                {
                    title:      _guidedController.continueMissionTitle,
                    text:       _guidedController.continueMissionMessage,
                    action:     _guidedController.actionContinueMission,
                    visible:    _guidedController.showContinueMission
                },
447
                {
448 449 450 451
                    title:      _guidedController.resumeMissionTitle,
                    text:       _guidedController.resumeMissionMessage,
                    action:     _guidedController.actionResumeMission,
                    visible:    _guidedController.showResumeMission
452 453
                },
                {
454 455 456 457
                    title:      _guidedController.changeAltTitle,
                    text:       _guidedController.changeAltMessage,
                    action:     _guidedController.actionChangeAlt,
                    visible:    _guidedController.showChangeAlt
458 459
                },
                {
460 461 462 463
                    title:      _guidedController.landAbortTitle,
                    text:       _guidedController.landAbortMessage,
                    action:     _guidedController.actionLandAbort,
                    visible:    _guidedController.showLandAbort
464 465 466 467
                }
            ]
            property var _smartShotModel: [
                {
468 469 470 471
                    title:      _guidedController.orbitTitle,
                    text:       _guidedController.orbitMessage,
                    action:     _guidedController.actionOrbit,
                    visible:    _guidedController.showOrbit
472 473 474 475 476
                }
            ]

            model: [
                {
477
                    name:       _guidedController.takeoffTitle,
478
                    iconSource: "/res/takeoff.svg",
479
                    action:     _guidedController.actionTakeoff
480 481
                },
                {
482
                    name:       _guidedController.landTitle,
483
                    iconSource: "/res/land.svg",
484
                    action:     _guidedController.actionLand
485 486
                },
                {
487
                    name:       _guidedController.rtlTitle,
488
                    iconSource: "/res/rtl.svg",
489
                    action:     _guidedController.actionRTL
490 491
                },
                {
492
                    name:       _guidedController.pauseTitle,
Gus Grubba's avatar
Gus Grubba committed
493
                    iconSource: "/res/pause-mission.svg",
494
                    action:     _guidedController.actionPause
495 496 497
                },
                {
                    name:       qsTr("Action"),
Gus Grubba's avatar
Gus Grubba committed
498
                    iconSource: "/res/action.svg",
499 500 501 502 503 504 505 506 507 508 509 510 511
                    action:     -1
                },
                /*
                  No firmware support any smart shots yet
                {
                    name:       qsTr("Smart"),
                    iconSource: "/qmlimages/MapCenter.svg",
                    action:     -1
                },
                */
            ]

            onClicked: {
512
                guidedActionsController.closeAll()
513 514 515
                var action = model[index].action
                if (action === -1) {
                    if (index == 4) {
516
                        guidedActionList.model   = _actionModel
517 518
                        guidedActionList.visible = true
                    } else if (index == 5) {
519
                        guidedActionList.model   = _smartShotModel
520 521 522
                        guidedActionList.visible = true
                    }
                } else {
523
                    _guidedController.confirmAction(action)
524 525 526 527 528
                }
            }
        }

        GuidedActionsController {
529
            id:                 guidedActionsController
530
            missionController:  _missionController
531
            confirmDialog:      guidedActionConfirm
Don Gagne's avatar
Don Gagne committed
532
            altitudeSlider:     _altitudeSlider
533 534
            z:                  _flightVideoPipControl.z + 1

535
            onShowStartMissionChanged: {
536
                if (showStartMission && !showResumeMission) {
537 538 539 540
                    confirmAction(actionStartMission)
                }
            }

541 542 543 544 545 546
            onShowContinueMissionChanged: {
                if (showContinueMission) {
                    confirmAction(actionContinueMission)
                }
            }

547 548 549 550 551
            onShowResumeMissionChanged: {
                if (showResumeMission) {
                    confirmAction(actionResumeMission)
                }
            }
552 553 554 555 556 557

            onShowLandAbortChanged: {
                if (showLandAbort) {
                    confirmAction(actionLandAbort)
                }
            }
558 559 560 561 562 563 564 565

            /// Close all dialogs
            function closeAll() {
                rootLoader.sourceComponent  = null
                guidedActionConfirm.visible = false
                guidedActionList.visible    = false
                altitudeSlider.visible      = false
            }
566 567
        }

568
        GuidedActionConfirm {
569 570 571 572
            id:                         guidedActionConfirm
            anchors.margins:            _margins
            anchors.bottom:             parent.bottom
            anchors.horizontalCenter:   parent.horizontalCenter
573 574
            guidedController:           _guidedController
            altitudeSlider:             _altitudeSlider
575 576
        }

577
        GuidedActionList {
578 579 580 581
            id:                         guidedActionList
            anchors.margins:            _margins
            anchors.bottom:             parent.bottom
            anchors.horizontalCenter:   parent.horizontalCenter
582
            guidedController:           _guidedController
583 584 585
        }

        //-- Altitude slider
DonLakeFlyer's avatar
DonLakeFlyer committed
586
        GuidedAltitudeSlider {
587 588 589 590 591 592
            id:                 altitudeSlider
            anchors.margins:    _margins
            anchors.right:      parent.right
            anchors.topMargin:  ScreenTools.toolbarHeight + _margins
            anchors.top:        parent.top
            anchors.bottom:     parent.bottom
593
            z:                  _guidedController.z
594 595 596 597 598
            radius:             ScreenTools.defaultFontPixelWidth / 2
            width:              ScreenTools.defaultFontPixelWidth * 10
            color:              qgcPal.window
            visible:            false
        }
Don Gagne's avatar
Don Gagne committed
599
    }
600
}