Subversion Repositories f9daq

Compare Revisions

Ignore whitespace Rev 166 → Rev 167

/lab/sipmscan/trunk/src/new_tabs.cpp
464,7 → 464,7
delete scope_data;
delete inroot;
printf("HeaderChange(): 6\n");
//printf("HeaderChange(): 6\n");
// Prepare branches for the new header
TTree *new_header_data = new TTree("header_data", "Header information for the measurement.");
new_header_data->Branch("nrch", &evtheader.nrch, "nrch/I");
477,7 → 477,7
new_header_data->Branch("angle", &evtheader.angle, "temperature/D");
new_header_data->Branch("laserinfo", &evtheader.laserinfo, "laserinfo/C");
 
printf("HeaderChange(): 7\n");
//printf("HeaderChange(): 7\n");
// Save new values (and old ones where we don't want to edit anything)
evtheader.nrch = itemp[0];
evtheader.timestamp = itemp[1];
517,7 → 517,7
else
sprintf(evtheader.laserinfo, "%s", ctemp);
 
printf("HeaderChange(): 8\n");
//printf("HeaderChange(): 8\n");
new_header_data->Fill();
 
// Write down the temporary output file
526,7 → 526,7
if(scopeTemp)
new_scope_data->Write();
 
printf("HeaderChange(): 9\n");
//printf("HeaderChange(): 9\n");
delete new_header_data;
delete new_meas_data;
if(scopeTemp)
664,6 → 664,7
 
// Actions for header editor
char cTemp[512];
exportExitAnalysis->widgetTB[0]->Connect("Clicked()", "TGAppMainFrame", this, "ExportTempAnalysisPlot()");
sprintf(cTemp, "CloseTempAnalysisTab(=%d)", newTab*100+startTab);
exportExitAnalysis->widgetTB[1]->Connect("Clicked()", "TGAppMainFrame", this, cTemp);
 
774,4 → 775,23
}
}
 
void TGAppMainFrame::ExportTempAnalysisPlot()
{
TCanvas *gCanvas = tempAnalysisCanvas->GetCanvas();
 
TGFileInfo file_info;
const char *filetypes[] = {"PDF","*.pdf","Encapsulated PostScript (.eps)","*.eps", "JPG/JPEG", "*.jpg", "PNG", "*.png",0,0};
char *cTemp;
file_info.fFileTypes = filetypes;
cTemp = new char[1024];
// sprintf(cTemp, "%s/results", rootdir);
// file_info.fIniDir = StrDup(cTemp);
file_info.fIniDir = StrDup(currentOpenDir);
new TGFileDialog(gClient->GetDefaultRoot(), fMain, kFDSave, &file_info);
delete[] cTemp;
 
if(file_info.fFilename != NULL)
gCanvas->SaveAs(file_info.fFilename);
}
 
// Temporary analysis window ------------------------------------------