chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-05 10:40:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into dateformat

Browse Source
This commit is contained in:
Seeker4 2019-08-09 22:56:45 -07:00
commit d375ab38f8
4 changed files with 27 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
oscar/Graphs/gGraphView.cpp
View File

@ -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;

25
oscar/daily.cpp
View File

@ -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];

2
oscar/docs/release_notes.html
View File

@ -11,7 +11,7 @@ Which was written and copyright 2011-2018 &copy; 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>

30
oscar/updateparser.h
View File

@ -43,14 +43,7 @@ class Update
*/
struct Release {
Release() {}
Release(const Release &copy) {
version = copy.version;
codename = copy.version;
notes = copy.notes;
info_url = copy.info_url;
status = copy.status;
updates = copy.updates;
}
Release(const Release &copy) = default;
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) {
// 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;
}
PackageUpdate(const PackageUpdate & copy) = default;
QString name;
QString displayName;