Merge branch 'master' into dateformat

oscar/Graphs/gGraphView.cpp

@@ -3262,7 +3262,6 @@ void gGraphView::keyPressEvent(QKeyEvent *event)
     //qDebug() << "Keypress??";
 }
 
-
 void gGraphView::setDay(Day *day)
 {
 
@@ -3274,6 +3273,7 @@ void gGraphView::setDay(Day *day)
 
     ResetBounds(false);
 }
+
 bool gGraphView::isEmpty()
 {
     bool res = true;

oscar/daily.cpp

@@ -852,6 +852,28 @@ void Daily::ResetGraphLayout()
 void Daily::ResetGraphOrder()
 {
     GraphView->resetGraphOrder(true);
+
+    // Enable all graphs (make them not hidden)
+    for (int i=0;i<ui->graphCombo->count();i++) {
+        // If disabled, emulate a click to enable the graph
+        if (!ui->graphCombo->itemData(i,Qt::UserRole).toBool()) {
+            qDebug() << "resetting graph" << i;
+            Daily::on_graphCombo_activated(i);
+        }
+    }
+
+    // Mark all events as active
+    for (int i=0;i<ui->eventsCombo->count();i++) {
+        // If disabled, emulate a click to enable the event
+        ChannelID code = ui->eventsCombo->itemData(i, Qt::UserRole).toUInt();
+        schema::Channel * chan = &schema::channel[code];
+        if (!chan->enabled()) {
+            qDebug() << "resetting event" << i;
+            Daily::on_eventsCombo_activated(i);
+        }
+    }
+
+    // Reset graph heights (and repaint)
     ResetGraphLayout();
 }
 
@@ -2416,6 +2438,7 @@ void Daily::on_graphCombo_activated(int index)
     GraphView->updateScale();
     GraphView->redraw();
 }
+
 void Daily::updateCube()
 {
     //brick..
@@ -2495,7 +2518,6 @@ void Daily::updateGraphCombo()
     }
     ui->graphCombo->setCurrentIndex(0);
 
-
     updateCube();
 }
 
@@ -2504,7 +2526,6 @@ void Daily::on_eventsCombo_activated(int index)
     if (index<0)
         return;
 
-
     ChannelID code = ui->eventsCombo->itemData(index, Qt::UserRole).toUInt();
     schema::Channel * chan = &schema::channel[code];
 

oscar/docs/release_notes.html

@@ -11,7 +11,7 @@ Which was written and copyright 2011-2018 © Mark Watkins
 <ul>
 <li>Portions of OSCAR are &copy; 2019 by The OSCAR Team</li>
 <li>[new] </li>
-<li>[fix] </li>
+<li>[fix] View/Reset Graphs now enables all graphs and all event flags</li>
 <li>[fix] Calendar date now formatted per national settings</li>
 </ul>
 </p>

oscar/updateparser.h

@@ -43,14 +43,7 @@ class Update
   */
 struct Release {
     Release() {}
-    Release(const Release &copy) {
+    Release(const Release &copy) = default;
-        version = copy.version;
-        codename = copy.version;
-        notes = copy.notes;
-        info_url = copy.info_url;
-        status = copy.status;
-        updates = copy.updates;
-    }
 
     Release(QString ver, QString code, UpdateStatus stat) { version = ver; codename = code; status = stat; }
     QString version;
@@ -94,26 +87,7 @@ class UpdateParser: public QXmlDefaultHandler
 class PackageUpdate {
 public:
     PackageUpdate() {}
-    PackageUpdate(const PackageUpdate & copy) {
+    PackageUpdate(const PackageUpdate & copy) = default;
-        // Seriously, why do I still have to do this crud by hand
-        // Where is the shortcut to save time here in the latest C++ extensions?
-        name = copy.name;
-        displayName = copy.displayName;
-        description = copy.description;
-        versionString = copy.versionString;
-        releaseDate = copy.releaseDate;
-        defaultInstall = copy.defaultInstall;
-        installScript = copy.installScript;
-        dependencies = copy.dependencies;
-        script = copy.script;
-        forcedInstall = copy.forcedInstall;
-        downloadArchives = copy.downloadArchives;
-        license = copy.license;
-        sha1 = copy.sha1;
-        compressedSize = copy.compressedSize;
-        uncompressedSize = copy.uncompressedSize;
-        os = copy.os;
-    }
 
     QString name;
     QString displayName;