diff --git a/SleepLib/loader_plugins/zeo_loader.cpp b/SleepLib/loader_plugins/zeo_loader.cpp index 5086ed8e..c60e16aa 100644 --- a/SleepLib/loader_plugins/zeo_loader.cpp +++ b/SleepLib/loader_plugins/zeo_loader.cpp @@ -14,6 +14,7 @@ License: GPL #include +#include #include "zeo_loader.h" #include "SleepLib/machine.h" @@ -34,6 +35,9 @@ int ZEOLoader::Open(QString & path,Profile *profile) QString newpath; QString dirtag="zeo"; + + // Could Scan the ZEO folder for a list of CSVs + if (path.toLower().endsWith(QDir::separator()+dirtag)) { return 0; //newpath=path; @@ -43,11 +47,6 @@ int ZEOLoader::Open(QString & path,Profile *profile) QString filename; - if (path.toLower().endsWith(".csv")) { - - } else if (path.toLower().endsWith(".dat")) { - // not supported. - } // ZEO folder structure detection stuff here. return 0; // number of machines affected @@ -72,19 +71,194 @@ Machine *ZEOLoader::CreateMachine(Profile *profile) qDebug("Create ZEO Machine Record"); Machine *m=new SleepStage(profile,0); + m->SetType(MT_SLEEPSTAGE); m->SetClass(zeo_class_name); m->properties[STR_PROP_Brand]="ZEO"; m->properties[STR_PROP_Model]="Personal Sleep Coach"; - QString s; - s.sprintf("%i",zeo_data_version); - m->properties[STR_PROP_DataVersion]=s; + m->properties[STR_PROP_DataVersion]=QString::number(zeo_data_version); profile->AddMachine(m); - m->properties[STR_PROP_Path]="{"+STR_GEN_DataFolder+"}/"+m->GetClass()+"_"+m->hexid()+"/"; + + QString path="{"+STR_GEN_DataFolder+"}/"+m->GetClass()+"_"+m->hexid()+"/"; + m->properties[STR_PROP_Path]=path; + m->properties[STR_PROP_BackupPath]=path+"Backup/"; return m; } +/*15233: "Sleep Date" +15234: "ZQ" +15236: "Total Z" +15237: "Time to Z" +15237: "Time in Wake" +15238: "Time in REM" +15238: "Time in Light" +15241: "Time in Deep" +15242: "Awakenings" +15245: "Start of Night" +15246: "End of Night" +15246: "Rise Time" +15247: "Alarm Reason" +15247: "Snooze Time" +15254: "Wake Tone" +15259: "Wake Window" +15259: "Alarm Type" +15260: "First Alarm Ring" +15261: "Last Alarm Ring" +15261: "First Snooze Time" +15265: "Last Snooze Time" +15266: "Set Alarm Time" +15266: "Morning Feel" +15267: "Sleep Graph" +15267: "Detailed Sleep Graph" +15268: "Firmware Version" */ +int ZEOLoader::OpenFile(QString filename) +{ + QFile file(filename); + if (filename.toLower().endsWith(".csv")) { + if (!file.open(QFile::ReadOnly)) { + qDebug() << "Couldn't open zeo file" << filename; + return 0; + } + } else {// if (filename.toLower().endsWith(".dat")) { + + return 0; + // not supported. + } + QTextStream text(&file); + QString headerdata=text.readLine(); + QStringList header=headerdata.split(","); + QString line; + QStringList linecomp; + QDateTime start_of_night, end_of_night, rise_time; + SessionID sid; + + const qint64 WindowSize=30000; + qint64 st,tt; + int stage; + + int ZQ, TotalZ, TimeToZ, TimeInWake, TimeInREM, TimeInLight, TimeInDeep, Awakenings; + int AlarmReason, SnoozeTime, WakeTone, WakeWindow, AlarmType, MorningFeel, FirmwareVersion; + + QDateTime FirstAlarmRing, LastAlarmRing, FirstSnoozeTime, LastSnoozeTime, SetAlarmTime; + + QStringList SG, DSG; + + Machine *mach=CreateMachine(p_profile); + + + bool ok; + bool dodgy; + do { + line=text.readLine(); + dodgy=false; + if (line.isEmpty()) continue; + linecomp=line.split(","); + ZQ=linecomp[1].toInt(&ok); + if (!ok) dodgy=true; + TotalZ=linecomp[2].toInt(&ok); + if (!ok) dodgy=true; + TimeToZ=linecomp[3].toInt(&ok); + if (!ok) dodgy=true; + TimeInWake=linecomp[4].toInt(&ok); + if (!ok) dodgy=true; + TimeInREM=linecomp[5].toInt(&ok); + if (!ok) dodgy=true; + TimeInLight=linecomp[6].toInt(&ok); + if (!ok) dodgy=true; + TimeInDeep=linecomp[7].toInt(&ok); + if (!ok) dodgy=true; + Awakenings=linecomp[8].toInt(&ok); + if (!ok) dodgy=true; + start_of_night=QDateTime::fromString(linecomp[9],"MM/dd/yyyy HH:mm"); + if (!start_of_night.isValid()) dodgy=true; + end_of_night=QDateTime::fromString(linecomp[10],"MM/dd/yyyy HH:mm"); + if (!end_of_night.isValid()) dodgy=true; + rise_time=QDateTime::fromString(linecomp[11],"MM/dd/yyyy HH:mm"); + if (!rise_time.isValid()) dodgy=true; + + AlarmReason=linecomp[12].toInt(&ok); + if (!ok) dodgy=true; + SnoozeTime=linecomp[13].toInt(&ok); + if (!ok) dodgy=true; + WakeTone=linecomp[14].toInt(&ok); + if (!ok) dodgy=true; + WakeWindow=linecomp[15].toInt(&ok); + if (!ok) dodgy=true; + AlarmType=linecomp[16].toInt(&ok); + if (!ok) dodgy=true; + + if (!linecomp[17].isEmpty()) { + FirstAlarmRing=QDateTime::fromString(linecomp[9],"MM/dd/yyyy HH:mm"); + if (!FirstAlarmRing.isValid()) dodgy=true; + } + if (!linecomp[18].isEmpty()) { + LastAlarmRing=QDateTime::fromString(linecomp[9],"MM/dd/yyyy HH:mm"); + if (!LastAlarmRing.isValid()) dodgy=true; + } + if (!linecomp[19].isEmpty()) { + FirstSnoozeTime=QDateTime::fromString(linecomp[9],"MM/dd/yyyy HH:mm"); + if (!FirstSnoozeTime.isValid()) dodgy=true; + } + if (!linecomp[20].isEmpty()) { + LastSnoozeTime=QDateTime::fromString(linecomp[9],"MM/dd/yyyy HH:mm"); + if (!LastSnoozeTime.isValid()) dodgy=true; + } + if (!linecomp[21].isEmpty()) { + SetAlarmTime=QDateTime::fromString(linecomp[9],"MM/dd/yyyy HH:mm"); + if (!SetAlarmTime.isValid()) dodgy=true; + } + MorningFeel=linecomp[22].toInt(&ok); + if (!ok) dodgy=true; + + FirmwareVersion=linecomp[25].toInt(&ok); + if (!ok) dodgy=true; + + if (dodgy) + continue; + SG=linecomp[23].split(" "); + DSG=linecomp[24].split(" "); + + const int WindowSize=30000; + sid=start_of_night.toTime_t(); + if (DSG.size()==0) + continue; + if (mach->SessionExists(sid)) + continue; + Session *sess=new Session(mach,sid); + + sess->settings[ZEO_Awakenings]=Awakenings; + sess->settings[ZEO_MorningFeel]=MorningFeel; + sess->settings[ZEO_TimeToZ]=TimeToZ; + sess->settings[ZEO_ZQ]=ZQ; + sess->settings[ZEO_TimeInWake]=TimeInWake; + sess->settings[ZEO_TimeInREM]=TimeInREM; + sess->settings[ZEO_TimeInLight]=TimeInLight; + sess->settings[ZEO_TimeInDeep]=TimeInDeep; + + st=qint64(start_of_night.toTime_t()) * 1000L; + sess->really_set_first(st); + tt=st; + EventList * sleepstage=sess->AddEventList(ZEO_SleepStage,EVL_Event,1,0,0,4); + for (int i=0;iAddEvent(tt,stage); + } + tt+=WindowSize; + } + sess->really_set_last(tt); + int size=DSG.size(); + sess->SetChanged(true); + mach->AddSession(sess,p_profile); + + + qDebug() << linecomp[0] << start_of_night << end_of_night << rise_time << size << "30 second chunks"; + + } while (!line.isNull()); + mach->Save(); + return true; +} static bool zeo_initialized=false; diff --git a/SleepLib/loader_plugins/zeo_loader.h b/SleepLib/loader_plugins/zeo_loader.h index 441e6e43..81949681 100644 --- a/SleepLib/loader_plugins/zeo_loader.h +++ b/SleepLib/loader_plugins/zeo_loader.h @@ -10,7 +10,7 @@ License: GPL #include "SleepLib/machine_loader.h" -const QString zeo_class_name="CMS50"; +const QString zeo_class_name="ZEO"; const int zeo_data_version=1; @@ -23,6 +23,7 @@ class ZEOLoader : public MachineLoader ZEOLoader(); virtual ~ZEOLoader(); virtual int Open(QString & path,Profile *profile); + virtual int OpenFile(QString filename); static void Register(); virtual int Version() { return zeo_data_version; } diff --git a/SleepLib/machine.cpp b/SleepLib/machine.cpp index 3a8318d9..6c7b48f6 100644 --- a/SleepLib/machine.cpp +++ b/SleepLib/machine.cpp @@ -467,4 +467,7 @@ ChannelID OXI_Pulse, OXI_SPO2, OXI_PulseChange, OXI_SPO2Drop, OXI_Plethy; ChannelID Journal_Notes, Journal_Weight, Journal_BMI, Journal_ZombieMeter, Bookmark_Start, Bookmark_End, Bookmark_Notes; +ChannelID ZEO_SleepStage, ZEO_ZQ, ZEO_TotalZ, ZEO_TimeToZ, ZEO_TimeInWake, ZEO_TimeInREM, ZEO_TimeInLight, ZEO_TimeInDeep, ZEO_Awakenings, +ZEO_AlarmReason, ZEO_SnoozeTime, ZEO_WakeTone, ZEO_WakeWindow, ZEO_AlarmType, ZEO_MorningFeel, ZEO_FirmwareVersion, +ZEO_FirstAlarmRing, ZEO_LastAlarmRing, ZEO_FirstSnoozeTime, ZEO_LastSnoozeTime, ZEO_SetAlarmTime, ZEO_RiseTime; diff --git a/SleepLib/machine_common.h b/SleepLib/machine_common.h index d361d798..316e029d 100644 --- a/SleepLib/machine_common.h +++ b/SleepLib/machine_common.h @@ -105,6 +105,9 @@ extern ChannelID OXI_Pulse, OXI_SPO2, OXI_PulseChange, OXI_SPO2Drop, OXI_Plethy; extern ChannelID Journal_Notes, Journal_Weight, Journal_BMI, Journal_ZombieMeter, Bookmark_Start, Bookmark_End, Bookmark_Notes; +extern ChannelID ZEO_SleepStage, ZEO_ZQ, ZEO_TotalZ, ZEO_TimeToZ, ZEO_TimeInWake, ZEO_TimeInREM, ZEO_TimeInLight, ZEO_TimeInDeep, ZEO_Awakenings, +ZEO_AlarmReason, ZEO_SnoozeTime, ZEO_WakeTone, ZEO_WakeWindow, ZEO_AlarmType, ZEO_MorningFeel, ZEO_FirmwareVersion, +ZEO_FirstAlarmRing, ZEO_LastAlarmRing, ZEO_FirstSnoozeTime, ZEO_LastSnoozeTime, ZEO_SetAlarmTime, ZEO_RiseTime; #endif // MACHINE_COMMON_H diff --git a/SleepLib/schema.cpp b/SleepLib/schema.cpp index 0b149174..9cd55d23 100644 --- a/SleepLib/schema.cpp +++ b/SleepLib/schema.cpp @@ -163,6 +163,15 @@ void init() Bookmark_End=schema::channel["BookmarkEnd"].id(); Bookmark_Notes=schema::channel["BookmarkNotes"].id(); + ZEO_SleepStage=schema::channel["SleepStage"].id(); + ZEO_ZQ=schema::channel["ZeoZQ"].id(); + ZEO_Awakenings=schema::channel["Awakenings"].id(); + ZEO_MorningFeel=schema::channel["MorningFeel"].id(); + ZEO_TimeInWake=schema::channel["TimeInWake"].id(); + ZEO_TimeInREM=schema::channel["TimeInREM"].id(); + ZEO_TimeInLight=schema::channel["TimeInLight"].id(); + ZEO_TimeInDeep=schema::channel["TimeInDeep"].id(); + ZEO_TimeToZ=schema::channel["TimeToZ"].id(); } Channel::Channel(int id, ChanType type, ScopeType scope, QString name, QString description, QString label, QString unit, DataType datatype, QColor color, int link): diff --git a/SleepyHeadQT.pro b/SleepyHeadQT.pro index 0795114f..ac185650 100644 --- a/SleepyHeadQT.pro +++ b/SleepyHeadQT.pro @@ -187,7 +187,8 @@ OTHER_FILES += \ LICENSE.txt \ docs/tooltips.css \ docs/script.js \ - update.xml + update.xml \ + docs/changelog.txt diff --git a/daily.cpp b/daily.cpp index 78d19345..fadf541e 100644 --- a/daily.cpp +++ b/daily.cpp @@ -113,6 +113,7 @@ Daily::Daily(QWidget *parent,gGraphView * shared) TE=new gGraph(GraphView,tr("Exp. Time"),schema::channel[CPAP_Te].description()+"\n("+schema::channel[CPAP_Te].units()+")",default_height); IE=new gGraph(GraphView,tr("IE"),schema::channel[CPAP_IE].description()+"\n("+schema::channel[CPAP_IE].units()+")",default_height); + STAGE=new gGraph(GraphView,tr("Sleep Stage"),schema::channel[ZEO_SleepStage].description()+"\n("+schema::channel[ZEO_SleepStage].units()+")",default_height); int oxigrp=PROFILE.ExistsAndTrue("SyncOximetry") ? 0 : 1; PULSE=new gGraph(GraphView,STR_TR_PulseRate,schema::channel[OXI_Pulse].description()+"\n("+schema::channel[OXI_Pulse].units()+")",default_height,oxigrp); SPO2=new gGraph(GraphView,STR_TR_SpO2,schema::channel[OXI_SPO2].description()+"\n("+schema::channel[OXI_SPO2].units()+")",default_height,oxigrp); @@ -205,7 +206,7 @@ Daily::Daily(QWidget *parent,gGraphView * shared) FRW->AddLayer(AddCPAP(los)); - gGraph *graphs[]={ PRD, LEAK, AHI, SNORE, PTB, MP, RR, MV, TV, FLG, IE, TI, TE, TgMV, SPO2, PLETHY, PULSE }; + gGraph *graphs[]={ PRD, LEAK, AHI, SNORE, PTB, MP, RR, MV, TV, FLG, IE, TI, TE, TgMV, SPO2, PLETHY, PULSE, STAGE }; int ng=sizeof(graphs)/sizeof(gGraph*); for (int i=0;iAddLayer(new gXGrid()); @@ -273,6 +274,8 @@ Daily::Daily(QWidget *parent,gGraphView * shared) //INTPULSE->AddLayer(AddCPAP(new gLineChart(OXI_Pulse,Qt::red,square))); //INTSPO2->AddLayer(AddCPAP(new gLineChart(OXI_SPO2,Qt::blue,square))); + STAGE->AddLayer(AddSTAGE(new gLineChart(ZEO_SleepStage,Qt::gray,true))); + gLineOverlaySummary *los1=new gLineOverlaySummary(tr("Events/hour"),5,-4); gLineOverlaySummary *los2=new gLineOverlaySummary(tr("Events/hour"),5,-4); PULSE->AddLayer(AddOXI(los1->add(new gLineOverlayBar(OXI_PulseChange,QColor("light gray"),tr("PD"),FT_Span)))); @@ -645,7 +648,7 @@ void Daily::Load(QDate date) previous_date=date; Day *cpap=PROFILE.GetDay(date,MT_CPAP); Day *oxi=PROFILE.GetDay(date,MT_OXIMETER); - // Day *sleepstage=profile->GetDay(date,MT_SLEEPSTAGE); + Day *stage=PROFILE.GetDay(date,MT_SLEEPSTAGE); if (!PROFILE.session->cacheSessions()) { if (lastcpapday && (lastcpapday!=cpap)) { @@ -687,6 +690,7 @@ void Daily::Load(QDate date) UpdateOXIGraphs(oxi); UpdateCPAPGraphs(cpap); + UpdateSTAGEGraphs(stage); UpdateEventsTree(ui->treeWidget,cpap); mainwin->refreshStatistics(); @@ -1117,6 +1121,37 @@ void Daily::Load(QDate date) //html+=tmp; } } + if (stage) { + html+=QString("%1").arg(tr("Sleep Stage Sessions")); + for (QVector::iterator s=stage->begin();s!=stage->end();s++) { + fd=QDateTime::fromTime_t((*s)->first()/1000L); + ld=QDateTime::fromTime_t((*s)->last()/1000L); + int len=(*s)->length()/1000L; + int h=len/3600; + int m=(len/60) % 60; + int s1=len % 60; + tooltip=stage->machine->GetClass()+" "+tr("Sleep Stage")+" "+QString().sprintf("%2ih, %2im, %2is",h,m,s1); + + Session *sess=*s; + if (!sess->settings.contains(SESSION_ENABLED)) { + sess->settings[SESSION_ENABLED]=true; + } + bool b=sess->settings[SESSION_ENABLED].toBool(); + + QHash::iterator i=(*s)->settings.find(CPAP_BrokenWaveform); + corrupted_waveform=(i!=(*s)->settings.end()) && i.value().toBool(); + html+=QString("%3%2%5%6%7") + .arg((*s)->session()) + .arg(tooltip) + .arg((*s)->session(),8,10,QChar('0')) + .arg((b ? "on" : "off")) + .arg(fd.date().toString(Qt::SystemLocaleShortDate)) + .arg(fd.toString("HH:mm")) + .arg(ld.toString("HH:mm")); + //tmp.sprintf(("%08i"+fd.date().toString(Qt::SystemLocaleShortDate)+""+fd.toString("HH:mm ")+""+ld.toString("HH:mm")+"").toLatin1(),(*s)->session(),(*s)->session()); + //html+=tmp; + } + } if (corrupted_waveform) { html+=QString("%1").arg(tr("One or more waveform record for this session had faulty source data. Some waveform overlay points may not match up correctly.")); } @@ -1412,6 +1447,16 @@ void Daily::UpdateCPAPGraphs(Day *day) (*g)->SetDay(day); } } +void Daily::UpdateSTAGEGraphs(Day *day) +{ + //if (!day) return; + if (day) { + day->OpenEvents(); + } + for (QList::iterator g=STAGEData.begin();g!=STAGEData.end();g++) { + (*g)->SetDay(day); + } +} void Daily::UpdateOXIGraphs(Day *day) { diff --git a/daily.h b/daily.h index 28ec78d6..70fc2aa8 100644 --- a/daily.h +++ b/daily.h @@ -265,20 +265,23 @@ private: gGraph *PRD,*FRW,*GAHI,*TAP,*LEAK,*SF,*TAP_EAP,*TAP_IAP,*PULSE,*SPO2, *SNORE,*RR,*MP,*MV,*TV,*FLG,*PTB,*OF, *THPR, - *PLETHY,*TI,*TE, *RE, *IE, *TgMV, *AHI, *RDI; + *PLETHY,*TI,*TE, *RE, *IE, *TgMV, *AHI, *RDI, *STAGE; QList OXIData; QList CPAPData; + QList STAGEData; QHash GraphToggles; QVector GraphAction; QGLContext *offscreen_context; QList splitter_sizes; Layer * AddCPAP(Layer *d) { CPAPData.push_back(d); return d; } + Layer * AddSTAGE(Layer *d) { STAGEData.push_back(d); return d; } Layer * AddOXI(Layer *d) { OXIData.push_back(d); return d; } void UpdateCPAPGraphs(Day *day); void UpdateOXIGraphs(Day *day); + void UpdateSTAGEGraphs(Day *day); Ui::Daily *ui; QDate previous_date; diff --git a/docs/changelog.txt b/docs/changelog.txt new file mode 100644 index 00000000..e69de29b diff --git a/docs/channels.xml b/docs/channels.xml index 3fd91bce..ae1574b9 100644 --- a/docs/channels.xml +++ b/docs/channels.xml @@ -119,7 +119,15 @@ Important: One id code per item, DO NOT CHANGE ID NUMBERS!!! - + + + + + + + + + diff --git a/main.cpp b/main.cpp index ab7ee837..4b6b2fbc 100644 --- a/main.cpp +++ b/main.cpp @@ -111,7 +111,7 @@ int main(int argc, char *argv[]) //////////////////////////////////////////////////////////////////////////////////////////// PRS1Loader::Register(); CMS50Loader::Register(); - //ZEOLoader::Register(); + //ZEOLoader::Register(); // Use outside of directory importer.. ResmedLoader::Register(); IntellipapLoader::Register(); diff --git a/mainwindow.cpp b/mainwindow.cpp index 777da831..a8b5d677 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -24,6 +24,7 @@ #include #include #include +#include #include #include "mainwindow.h" @@ -482,6 +483,41 @@ enum RXSortMode { RX_first, RX_last, RX_days, RX_ahi, RX_mode, RX_min, RX_max, R RXSortMode RXsort=RX_first; bool RXorder=false; +bool operator<(const RXChange & c1, const RXChange & c2) { + const RXChange * comp1=&c1; + const RXChange * comp2=&c2; + if (RXorder) { + switch (RXsort) { + case RX_ahi: return comp1->ahi < comp2->ahi; + case RX_days: return comp1->days < comp2->days; + case RX_first: return comp1->first < comp2->first; + case RX_last: return comp1->last < comp2->last; + case RX_mode: return comp1->mode < comp2->mode; + case RX_min: return comp1->min < comp2->min; + case RX_max: return comp1->max < comp2->max; + case RX_maxhi: return comp1->maxhi < comp2->maxhi; + case RX_per1: return comp1->per1 < comp2->per1; + case RX_per2: return comp1->per2 < comp2->per2; + case RX_weighted: return comp1->weighted < comp2->weighted; + }; + } else { + switch (RXsort) { + case RX_ahi: return comp1->ahi > comp2->ahi; + case RX_days: return comp1->days > comp2->days; + case RX_first: return comp1->first > comp2->first; + case RX_last: return comp1->last > comp2->last; + case RX_mode: return comp1->mode > comp2->mode; + case RX_min: return comp1->min > comp2->min; + case RX_max: return comp1->max > comp2->max; + case RX_maxhi: return comp1->maxhi > comp2->maxhi; + case RX_per1: return comp1->per1 > comp2->per1; + case RX_per2: return comp1->per2 > comp2->per2; + case RX_weighted: return comp1->weighted > comp2->weighted; + }; + } + return true; +} + bool RXSort(const RXChange * comp1, const RXChange * comp2) { if (RXorder) { switch (RXsort) { @@ -1113,6 +1149,9 @@ void MainWindow::on_summaryButton_clicked() recbox+=""; ui->recordsBox->setHtml(recbox); + RXsort=RX_min; + RXorder=true; + qSort(rxchange.begin(),rxchange.end()); html+="
"; html+=QString("
Changes to Prescription Settings"); html+=QString(""); @@ -2593,3 +2632,25 @@ void MainWindow::doReprocessEvents() if (overview) overview->ReloadGraphs(); } } + +void MainWindow::on_actionImport_ZEO_Data_triggered() +{ + QFileDialog w; + w.setFileMode(QFileDialog::ExistingFiles); + w.setOption(QFileDialog::ShowDirsOnly, false); + w.setOption(QFileDialog::DontUseNativeDialog,true); + w.setFilters(QStringList("Zeo CSV File (*.csv)")); + + ZEOLoader zeo; + if (w.exec()==QFileDialog::Accepted) { + QString filename=w.selectedFiles()[0]; + if (!zeo.OpenFile(filename)) { + Notify("There was a problem opening ZEO File: "+filename); + return; + } + Notify("Zeo CSV Import complete"); + daily->LoadDate(daily->getDate()); + } + + +} diff --git a/mainwindow.h b/mainwindow.h index dae4bb9f..68d2dd06 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -290,6 +290,8 @@ private slots: void on_filterBookmarksButton_clicked(); + void on_actionImport_ZEO_Data_triggered(); + private: void FreeSessions(); diff --git a/mainwindow.ui b/mainwindow.ui index 1b15c621..0900270a 100644 --- a/mainwindow.ui +++ b/mainwindow.ui @@ -1559,6 +1559,7 @@ &File + @@ -1815,6 +1816,11 @@ F4 + + + Import &ZEO Data + + diff --git a/preferencesdialog.ui b/preferencesdialog.ui index 2b0d4d03..822efb5e 100644 --- a/preferencesdialog.ui +++ b/preferencesdialog.ui @@ -10,7 +10,7 @@ 0 0 640 - 414 + 421 @@ -42,7 +42,7 @@ - 1 + 5 @@ -884,8 +884,7 @@ Defaults to 60 minutes.. Highly recommend it's left at this value. - Reset the counter to zero at beginning of each (time) window. -Note: Unless you purge and reimport after changing this, you won't see the changes. + Reset the counter to zero at beginning of each (time) window. Zero Reset