Fix default Brightness value/behavior adds shutdown button (#412)

* added exit button

* fixed visible state

* added shutdown button fixed default brightness issues

* fixed compiler warning

src/overlaycontroller.cpp

@@ -327,6 +327,24 @@ OverlayController::~OverlayController()
     Shutdown();
 }
 
+void OverlayController::exitApp()
+{
+    settings::saveAllSettings();
+
+    m_moveCenterTabController.shutdown();
+    // Un-mute mic before Exiting VR, as it is set at system level Not
+    // Vr level.
+    // m_audioTabController.setMicMuted( false, false );
+    m_audioTabController.shutdown();
+    m_chaperoneTabController.shutdown();
+    Shutdown();
+    QApplication::exit();
+
+    LOG( INFO ) << "All systems exited.";
+    exit( EXIT_SUCCESS );
+    // Does not fallthrough
+}
+
 void OverlayController::Shutdown()
 {
     disconnect( &m_pumpEventsTimer,
@@ -1004,20 +1022,10 @@ void OverlayController::mainEventLoop()
             vr::VRSystem()->AcknowledgeQuit_Exiting(); // Let us buy some
                                                        // time just in case
 
-            settings::saveAllSettings();
+            exitApp();
-
+            // Won't fallthrough, but also exitApp() wont, but QT won't
-            m_moveCenterTabController.shutdown();
+            // acknowledge
-            // Un-mute mic before Exiting VR, as it is set at system level Not
-            // Vr level.
-            // m_audioTabController.setMicMuted( false, false );
-            m_audioTabController.shutdown();
-            m_chaperoneTabController.shutdown();
-            Shutdown();
-            QApplication::exit();
-
-            LOG( INFO ) << "All systems exited.";
             exit( EXIT_SUCCESS );
-            // Does not fallthrough
         }
 
         case vr::VREvent_DashboardActivated:

src/overlaycontroller.h

@@ -184,6 +184,7 @@ public:
     virtual ~OverlayController();
 
     void Shutdown();
+    Q_INVOKABLE void exitApp();
 
     bool isDashboardVisible()
     {

src/res/qml/SettingsPage.qml

@@ -156,6 +156,7 @@ MyStackViewPage {
                 Layout.fillWidth: true
             }
         }
+        RowLayout{
 
             MyText {
                 id: seatedOldExternalWarning
@@ -168,6 +169,20 @@ MyStackViewPage {
                 Layout.rightMargin: 20
                 Layout.fillWidth: true
             }
+        }
+        RowLayout{
+            Item {
+                Layout.fillWidth: true
+            }
+            MyPushButton {
+                id: shutdownButton
+                Layout.preferredWidth: 250
+                text: "Shutdown OVRAS"
+                onClicked: {
+                    OverlayController.exitApp()
+                    }
+                }
+        }
 
         Item {
             Layout.fillHeight: true
@@ -175,14 +190,15 @@ MyStackViewPage {
 
         RowLayout {
             Layout.fillWidth: true
-            // set visible to true here in builds when we need a debug toggle checkbox, otherwise false when on master branch.
+
-            visible: false
 
             Item {
                 Layout.fillWidth: true
             }
 
             MyToggleButton {
+                // set visible to true here in builds when we need a debug toggle checkbox, otherwise false when on master branch.
+                visible: false
                 id: debugToggle
                 text: "Debug"
                 onCheckedChanged: {

src/res/qml/video_page/brightness/BrightnessGroupBox.qml

@@ -51,7 +51,7 @@ GroupBox {
 
             MySlider {
                 id: brightnessSlider
-                from: 0.01
+                from: 0.10
                 to: 1.0
                 stepSize: 0.01
                 value: 1.0

src/tabcontrollers/VideoTabController.cpp

@@ -70,6 +70,7 @@ void VideoTabController::initBrightnessOverlay()
                      << vr::VROverlay()->GetOverlayErrorNameFromEnum(
                             overlayError );
     }
+    setBrightnessOpacityValue( brightnessOpacityValue(), false );
 }
 
 void VideoTabController::initColorOverlay()
@@ -286,6 +287,7 @@ void VideoTabController::setBrightnessEnabled( bool value,
         {
             if ( overlayHandle != vr::k_ulOverlayHandleInvalid )
             {
+                setBrightnessOpacityValue( brightnessOpacityValue(), false );
                 vr::VROverlay()->ShowOverlay( getBrightnessOverlayHandle() );
                 LOG( INFO ) << "Brightness Overlay toggled on";
             }
@@ -314,15 +316,16 @@ void VideoTabController::setBrightnessOpacityValue( float percvalue,
     float realvalue = static_cast<float>(
         std::pow( static_cast<double>( 1.0f - percvalue ), 1 / 3. ) );
 
-    if ( fabs( static_cast<double>( percvalue - brightnessOpacityValue() ) )
+    settings::setSetting( settings::DoubleSetting::VIDEO_brightnessOpacityValue,
-         > .005 )
-    {
-        settings::setSetting(
-            settings::DoubleSetting::VIDEO_brightnessOpacityValue,
                           static_cast<double>( percvalue ) );
 
-        if ( realvalue <= 1.0f && realvalue >= 0.00f )
+    if ( realvalue >= 0.97f || realvalue <= 0.00f )
     {
+        LOG( WARNING ) << "alpha value is invalid setting to 1.0";
+        settings::setSetting(
+            settings::DoubleSetting::VIDEO_brightnessOpacityValue, 1.0 );
+        realvalue = 0;
+    }
     vr::VROverlayError overlayError = vr::VROverlay()->SetOverlayAlpha(
         m_brightnessOverlayHandle, realvalue );
     if ( overlayError != vr::VROverlayError_None )
@@ -331,19 +334,11 @@ void VideoTabController::setBrightnessOpacityValue( float percvalue,
                      << vr::VROverlay()->GetOverlayErrorNameFromEnum(
                             overlayError );
     }
-        }
-        else
-        {
-            LOG( WARNING ) << "alpha value is invalid setting to 1.0";
-            settings::setSetting(
-                settings::DoubleSetting::VIDEO_brightnessOpacityValue, 0.0 );
-        }
 
     if ( notify )
     {
         emit brightnessOpacityValueChanged( percvalue );
     }
-    }
 }
 
 /*