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

fixing warnings, and completing bug fix of gui and data gui call back

Browse Source
This commit is contained in:
maliakal_d 2019-04-12 10:13:02 +02:00
parent d17fd54a9d
commit 5fdb090926
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
slsDetectorSoftware/src/multiSlsDetector.cpp
View File

@ -3289,13 +3289,13 @@ void multiSlsDetector::readFrameFromReceiver() {
if (dynamicRange == 4 && gappixelsenable) { if (dynamicRange == 4 && gappixelsenable) {
int n = processImageWithGapPixels(multiframe, multigappixels); int n = processImageWithGapPixels(multiframe, multigappixels);
thisData = thisData =
new detectorData(getCurrentProgress(), currentFileName.c_str(), nPixelsX, new detectorData(getCurrentProgress(), currentFileName.c_str(), nCompletePixelsX,
nPixelsY, multigappixels, n, dynamicRange, currentFileIndex); nCompletePixelsY, multigappixels, n, dynamicRange, currentFileIndex);
} }
// normal pixels // normal pixels
else { else {
thisData = new detectorData(getCurrentProgress(), currentFileName.c_str(), nPixelsX, thisData = new detectorData(getCurrentProgress(), currentFileName.c_str(), nCompletePixelsX,
nPixelsY, multiframe, multisize, dynamicRange, nCompletePixelsY, multiframe, multisize, dynamicRange,
currentFileIndex); currentFileIndex);
} }
dataReady(thisData, currentFrameIndex, dataReady(thisData, currentFrameIndex,

2
slsSupportLib/include/ServerSocket.h
View File

@ -15,7 +15,7 @@ class ServerSocket : public DataSocket {
ServerSocket(int port); ServerSocket(int port);
DataSocket accept(); DataSocket accept();
const std::string &getLastClient(); const std::string &getLastClient();
const int getPort(); int getPort() const;
void SendResult(int &ret, void *retval, int retvalSize, char* mess); void SendResult(int &ret, void *retval, int retvalSize, char* mess);
private: private:

2
slsSupportLib/src/ServerSocket.cpp
View File

@ -55,7 +55,7 @@ DataSocket ServerSocket::accept() {
const std::string &ServerSocket::getLastClient() { return lastClient_; } const std::string &ServerSocket::getLastClient() { return lastClient_; }
const int ServerSocket::getPort() { return serverPort; } int ServerSocket::getPort() const { return serverPort; }
void ServerSocket::SendResult(int &ret, void* retval, int retvalSize, char* mess) { void ServerSocket::SendResult(int &ret, void* retval, int retvalSize, char* mess) {