Changeset 229 for Evidence/Edd
- Timestamp:
- 06/24/10 07:51:15 (15 years ago)
- Location:
- Evidence/Edd
- Files:
-
- 1 added
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
TabularUnified Evidence/Edd/Edd.cc ¶
r224 r229 27 27 QWidget *OpenHistory(char *Service, int Index) { 28 28 29 QString Format; 30 DimBrowser Browser; 29 31 class EvidenceHistory *Hist = Handler->GetHistory(Service); 30 32 31 // Check if hi tory service available33 // Check if history service available 32 34 if (Hist == NULL || Hist->GetFormat() == NULL) { 33 35 QMessageBox::warning(NULL, "Edd Message", QString("Could not retrieve history for service ") + Service ,QMessageBox::Ok); 34 Handler->DropHistory(Service); 35 return NULL; 36 } 37 38 QString Format = Hist->GetFormat(); 36 37 // If service currently available, take its format 38 char *Name, *Fmt; 39 40 Browser.getServices(Service); 41 if (Browser.getNextService(Name, Fmt) != 0) Format = QString(Fmt); 42 else { 43 Handler->DropHistory(Service); 44 return NULL; 45 } 46 } 47 48 if (Format.isEmpty()) Format = Hist->GetFormat(); 39 49 Handler->DropHistory(Service); 40 50 41 //if (strlen(Hist->GetFormat()) == 1 && *Hist->GetFormat() != 'C') return new EddPlot(Service, Index);42 51 if (Format.size() == 1 && Format[0] != 'C') return new EddPlot(Service, Index); 43 52 else return new EddText(Service); … … 68 77 QLineEdit(P), ServiceName(Name), Index(Index) { 69 78 70 LastHist = NULL;79 LastHist = NULL; 71 80 72 81 // Widget properties … … 112 121 return; 113 122 } 123 else Pal.setColor(QPalette::Base, Qt::white); 114 124 115 125 // Message service backgound colour determined by severity … … 933 943 if (!EvidenceServer::ServiceOK(getInfo())) YEP(getInfo()->getName(), -1); 934 944 else { 935 char *Text = EvidenceServer::ToString(getInfo()); 936 YEP(getInfo()->getName(), getInfo()->getTimestamp(), QByteArray((char *) getInfo()->getData(), getInfo()->getSize()), getInfo()->getFormat(), Text); 937 free(Text); 945 YEP(getInfo()->getName(), 946 getInfo()->getTimestamp(), 947 QByteArray((char *) getInfo()->getData(), 948 getInfo()->getSize()), getInfo()->getFormat(), 949 QString::fromStdString(EvidenceServer::ToString(getInfo()))); 938 950 } 939 951 } … … 1183 1195 Plot->AddService("ARDUINO/Data", i); 1184 1196 } 1185 Layout->addWidget(Plot, 0, 2, 8, 7);1197 Layout->addWidget(Plot, 0, 2, 9, 7); 1186 1198 1187 1199 // Night sky monitor 1200 Line = new EddLineDisplay("SQM/Message"); 1201 Line->setMaximumWidth(200); 1202 Layout->addWidget(Line, 6, 0, 1, 2); 1203 1188 1204 Line = new EddLineDisplay("SQM/NSB"); 1189 Layout->addWidget(Line, 6, 0, 1, 1);1205 Layout->addWidget(Line, 7, 0, 1, 1); 1190 1206 } 1191 1207 … … 1554 1570 bool OK; 1555 1571 1556 // Find all services that are not historyservices and sort1572 // Find all DIM services and sort 1557 1573 getServices("*"); 1558 1574 while ((Type = getNextService(Name, Format)) != 0) { -
TabularUnified Evidence/Edd/Edd.pro ¶
r208 r229 6 6 TARGET = 7 7 DEPENDPATH += . 8 INCLUDEPATH += . .. /ihp/local/qwt-5.2.1/include $(DIMDIR)/dim ../../drsdaq ../../pixelmap8 INCLUDEPATH += . .. $(QWTDIR)/include $(DIMDIR)/dim ../../drsdaq ../../pixelmap 9 9 10 10 # Input 11 11 HEADERS += Edd.h 12 12 SOURCES += Edd.cc ../Evidence.cc ../../drsdaq/RawDataCTX.cc ../../pixelmap/Pixel.cc ../../pixelmap/PixelMap.cc 13 LIBS += -L /ihp/local/qwt-5.2.1/lib -lqwt $(DIMDIR)/linux/libdim.a13 LIBS += -L$(QWTDIR)/lib -lqwt $(DIMDIR)/linux/libdim.a
Note:
See TracChangeset
for help on using the changeset viewer.