detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-11 04:17:15 +02:00
Code Issues Actions Packages Releases Activity

merge ocnflict for white background

Browse Source
This commit is contained in:
Dhanya Maliakal
2017-11-28 11:29:15 +01:00
parent 4466213882 a351fa8f28
commit a89847538d
17 changed files with 101 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
slsReceiverSoftware/include/File.h
View File

@ -89,7 +89,7 @@ class File : private virtual slsReceiverDefs {
* @returns OK or FAIL
*/
virtual int CreateFile(uint64_t fnum){
bprintf(RED,"This is a generic function CreateFile that should be overloaded by a derived class\n");
cprintf(RED,"This is a generic function CreateFile that should be overloaded by a derived class\n");
return OK;
}
@ -97,14 +97,14 @@ class File : private virtual slsReceiverDefs {
* Close Current File
*/
virtual void CloseCurrentFile() {
bprintf(RED,"This is a generic function CloseCurrentFile that should be overloaded by a derived class\n");
cprintf(RED,"This is a generic function CloseCurrentFile that should be overloaded by a derived class\n");
}
/**
* Close Files
*/
virtual void CloseAllFiles() {
bprintf(RED,"This is a generic function that should be overloaded by a derived class\n");
cprintf(RED,"This is a generic function that should be overloaded by a derived class\n");
}
/**
@ -115,7 +115,7 @@ class File : private virtual slsReceiverDefs {
* @param OK or FAIL
*/
virtual int WriteToFile(char* buffer, int buffersize, uint64_t fnum, uint32_t nump) {
bprintf(RED,"This is a generic function WriteToFile that should be overloaded by a derived class\n");
cprintf(RED,"This is a generic function WriteToFile that should be overloaded by a derived class\n");
return FAIL;
}
@ -132,7 +132,7 @@ class File : private virtual slsReceiverDefs {
*/
virtual int CreateMasterFile(bool en, uint32_t size,
uint32_t nx, uint32_t ny, uint64_t at, uint64_t st, uint64_t ap) {
bprintf(RED,"This is a generic function CreateMasterFile that should be overloaded by a derived class\n");
cprintf(RED,"This is a generic function CreateMasterFile that should be overloaded by a derived class\n");
return OK;
}
@ -143,7 +143,7 @@ class File : private virtual slsReceiverDefs {
* @param ny number of pixels in y direction
*/
virtual void SetNumberofPixels(uint32_t nx, uint32_t ny) {
bprintf(RED,"This is a generic function SetNumberofPixels that should be overloaded by a derived class\n");
cprintf(RED,"This is a generic function SetNumberofPixels that should be overloaded by a derived class\n");
}
/**
@ -151,7 +151,7 @@ class File : private virtual slsReceiverDefs {
* @param numf number of images caught
*/
virtual void EndofAcquisition(uint64_t numf) {
bprintf(RED,"This is a generic function EndofAcquisition that should be overloaded by a derived class\n");
cprintf(RED,"This is a generic function EndofAcquisition that should be overloaded by a derived class\n");
}
protected: