diff --git a/daily.cpp b/daily.cpp index 706d536b..319c490d 100644 --- a/daily.cpp +++ b/daily.cpp @@ -204,11 +204,11 @@ Daily::Daily(QWidget *parent,QGLContext *context) : l->AddName(tr("CSR")); l->color.clear(); l->color.push_back(QColor("blue")); - l->color.push_back(QColor("aqua")); - l->color.push_back(QColor("purple")); //0xff,0x40,0xff,0xff)); //wxPURPLE); + l->color.push_back(QColor(0x40,0xaf,0xbf,0xff)); //#40afbf + l->color.push_back(QColor(0xb2,0x54,0xcd,0xff)); //b254cd; //wxPURPLE); l->color.push_back(QColor("yellow")); - l->color.push_back(QColor(20,20,20,255)); - l->color.push_back(QColor("light green")); + l->color.push_back(QColor(0x40,0x40,0x40,255)); + l->color.push_back(QColor(0x60,0xff,0x60,0xff)); //80ff80 G_AHI->AddLayer(l); G_AHI->SetDrawBackground(false); //G_AHI->setMaximumSize(2000,30); @@ -345,9 +345,15 @@ void Daily::UpdateEventsTree(QTreeWidget *tree,Day *day) t=t.addSecs(-((*(*e))[0]/2)); } QStringList a; - QString c; - c.sprintf("#%04i: ",mccnt[code]++); - a.append(c+t.toString(" HH:mm:ss")); + QString c,b; + c.sprintf("#%03i: ",++mccnt[code]); + c+=t.toString(" HH:mm:ss"); + + //if ((*e)->fields()) { // Perhaps need a dedicated offset field + //b.sprintf(" %02.0f",(*(*e))[0]); + //c+=b; + //} + a.append(c); a.append(t.toString("yyyy-MM-dd HH:mm:ss")); mcr->addChild(new QTreeWidgetItem(a)); } @@ -457,7 +463,7 @@ void Daily::Load(QDate date) html=html+("
")+tr("RERA")+(" | ")+a.sprintf("%.2f",rei)+(" |
")+tr("FlowLimit")+(" | ")+a.sprintf("%.2f",fli)+(" |