Put CSV Export back, step overview barchar segment brightness a bit more

sleepyhead/Graphs/gSessionTimesChart.cpp

@@ -43,10 +43,10 @@ gSummaryChart::gSummaryChart(ChannelID code, MachineType machtype)
     tz_hours = tz_offset / 3600.0;
     expected_slices = 5;
 
-    addCalc(code, ST_MIN, brighten(schema::channel[code].defaultColor() ,0.90));
-    addCalc(code, ST_MID, brighten(schema::channel[code].defaultColor() ,1.30));
-    addCalc(code, ST_90P, brighten(schema::channel[code].defaultColor() ,1.50));
-    addCalc(code, ST_MAX, brighten(schema::channel[code].defaultColor() ,1.80));
+    addCalc(code, ST_MIN, brighten(schema::channel[code].defaultColor() ,0.60));
+    addCalc(code, ST_MID, brighten(schema::channel[code].defaultColor() ,1.20));
+    addCalc(code, ST_90P, brighten(schema::channel[code].defaultColor() ,1.70));
+    addCalc(code, ST_MAX, brighten(schema::channel[code].defaultColor() ,2.30));
 }
 
 gSummaryChart::~gSummaryChart()

sleepyhead/SleepLib/loader_plugins/prs1_loader.cpp

@@ -216,11 +216,13 @@ void parseModel(MachineInfo & info, QString modelnum)
     info.modelnumber = modelnum;
 
     QString modelstr;
+    bool fnd = false;
     for (int i=0; i<modelnum.size(); i++) {
         QChar c = modelnum.at(i);
         if (c.isDigit()) {
             modelstr += c;
-        } else break;
+            fnd = true;
+        } else if (fnd) break;
     }
 
     bool ok;
@@ -232,6 +234,11 @@ void parseModel(MachineInfo & info, QString modelnum)
 
 
     switch (type) {
+    case 1: // cpap
+    case 2: // cpap
+    case 3: // cpap
+        info.model = QObject::tr("RemStar Plus Compliance Only");
+        break;
     case 4: // cpap
         info.model = QObject::tr("RemStar Pro with C-Flex+");
         break;
@@ -500,11 +507,13 @@ int PRS1Loader::OpenMachine(QString path)
     PeekProperties(info, propertyfile);
 
     QString modelstr;
+    bool fnd = false;
     for (int i=0; i<info.modelnumber.size(); i++) {
         QChar c = info.modelnumber.at(i);
         if (c.isDigit()) {
             modelstr += c;
-        } else break;
+            fnd = true;
+        } else if (fnd) break;
     }
 
     bool ok;

sleepyhead/mainwindow.cpp

@@ -1686,14 +1686,6 @@ void MainWindow::on_action_CycleTabs_triggered()
     ui->tabWidget->setCurrentIndex(i);
 }
 
-void MainWindow::on_actionExp_ort_triggered()
-{
-    ExportCSV ex(this);
-
-    if (ex.exec() == ExportCSV::Accepted) {
-    }
-}
-
 void MainWindow::on_actionOnline_Users_Guide_triggered()
 {
     ui->webView->load(
@@ -2712,3 +2704,16 @@ void MainWindow::on_actionShow_Performance_Counters_toggled(bool arg1)
 {
     p_profile->general->setShowPerformance(arg1);
 }
+
+void MainWindow::on_actionExport_CSV_triggered()
+{
+    ExportCSV ex(this);
+
+    if (ex.exec() == ExportCSV::Accepted) {
+    }
+}
+
+void MainWindow::on_actionExport_Review_triggered()
+{
+    QMessageBox::information(nullptr, STR_MessageBox_Information, QObject::tr("Sorry, this feature is not implemented yet"), QMessageBox::Ok);
+}

sleepyhead/mainwindow.h

@@ -235,9 +235,6 @@ class MainWindow : public QMainWindow
     //! \brief Selects the next view tab
     void on_action_CycleTabs_triggered();
 
-    //! \brief Opens the CSV Export window
-    void on_actionExp_ort_triggered();
-
     //! \brief Opens the User Guide at the wiki in the welcome browser.
     void on_actionOnline_Users_Guide_triggered();
 
@@ -331,6 +328,10 @@ class MainWindow : public QMainWindow
     void on_actionShow_Performance_Counters_toggled(bool arg1);
     void on_aboutToQuit();
 
+    void on_actionExport_CSV_triggered();
+
+    void on_actionExport_Review_triggered();
+
 private:
     void importCPAPBackups();
     void finishCPAPImport();

sleepyhead/mainwindow.ui

@@ -1494,7 +1494,7 @@ QToolBox::tab:selected  {
          <rect>
           <x>0</x>
           <y>0</y>
-          <width>230</width>
+          <width>240</width>
           <height>724</height>
          </rect>
         </property>
@@ -1908,7 +1908,7 @@ border: 2px solid #56789a; border-radius: 30px;
          <rect>
           <x>0</x>
           <y>0</y>
-          <width>230</width>
+          <width>240</width>
           <height>724</height>
          </rect>
         </property>
@@ -3138,15 +3138,15 @@ border-radius: 10px;
      </property>
      <addaction name="actionExport_CSV"/>
      <addaction name="separator"/>
-     <addaction name="actionExport_Current_Day"/>
+     <addaction name="actionExport_Review"/>
     </widget>
     <addaction name="action_Import_Data"/>
     <addaction name="action_Preferences"/>
     <addaction name="action_Edit_Profile"/>
     <addaction name="separator"/>
     <addaction name="actionPrint_Report"/>
-    <addaction name="menuExp_ort_CSV_Data"/>
     <addaction name="separator"/>
+    <addaction name="menuExp_ort_CSV_Data"/>
     <addaction name="actionExport_Journal"/>
     <addaction name="separator"/>
     <addaction name="actionChange_User"/>
@@ -3526,10 +3526,10 @@ border-radius: 10px;
   </action>
   <action name="actionExport_CSV">
    <property name="text">
-    <string>Export as CSV</string>
+    <string>CSV Export Wizard</string>
    </property>
   </action>
-  <action name="actionExport_Current_Day">
+  <action name="actionExport_Review">
    <property name="text">
     <string>Export for Review</string>
    </property>