From 5fdb090926ed106ef6665df131210266f8c6041d Mon Sep 17 00:00:00 2001
From: Dhanya Thattil <dhanya.thattil@psi.ch>
Date: Fri, 12 Apr 2019 10:13:02 +0200
Subject: [PATCH] fixing warnings, and completing bug fix of gui and data gui
 call back

---
 slsDetectorSoftware/src/multiSlsDetector.cpp | 8 ++++----
 slsSupportLib/include/ServerSocket.h         | 2 +-
 slsSupportLib/src/ServerSocket.cpp           | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/slsDetectorSoftware/src/multiSlsDetector.cpp b/slsDetectorSoftware/src/multiSlsDetector.cpp
index b55eabb69..277ab1c0d 100755
--- a/slsDetectorSoftware/src/multiSlsDetector.cpp
+++ b/slsDetectorSoftware/src/multiSlsDetector.cpp
@@ -3289,13 +3289,13 @@ void multiSlsDetector::readFrameFromReceiver() {
             if (dynamicRange == 4 && gappixelsenable) {
                 int n = processImageWithGapPixels(multiframe, multigappixels);
                 thisData =
-                    new detectorData(getCurrentProgress(), currentFileName.c_str(), nPixelsX,
-                                     nPixelsY, multigappixels, n, dynamicRange, currentFileIndex);
+                    new detectorData(getCurrentProgress(), currentFileName.c_str(), nCompletePixelsX,
+                                     nCompletePixelsY, multigappixels, n, dynamicRange, currentFileIndex);
             }
             // normal pixels
             else {
-                thisData = new detectorData(getCurrentProgress(), currentFileName.c_str(), nPixelsX,
-                                            nPixelsY, multiframe, multisize, dynamicRange,
+                thisData = new detectorData(getCurrentProgress(), currentFileName.c_str(), nCompletePixelsX,
+                                            nCompletePixelsY, multiframe, multisize, dynamicRange,
                                             currentFileIndex);
             }
             dataReady(thisData, currentFrameIndex,
diff --git a/slsSupportLib/include/ServerSocket.h b/slsSupportLib/include/ServerSocket.h
index cb6545c5d..4e15a820a 100755
--- a/slsSupportLib/include/ServerSocket.h
+++ b/slsSupportLib/include/ServerSocket.h
@@ -15,7 +15,7 @@ class ServerSocket : public DataSocket {
     ServerSocket(int port);
     DataSocket accept();
     const std::string &getLastClient();
-    const int getPort();
+    int getPort() const;
     void SendResult(int &ret, void *retval, int retvalSize, char* mess);
 
   private:
diff --git a/slsSupportLib/src/ServerSocket.cpp b/slsSupportLib/src/ServerSocket.cpp
index 29fd50447..54943cc79 100755
--- a/slsSupportLib/src/ServerSocket.cpp
+++ b/slsSupportLib/src/ServerSocket.cpp
@@ -55,7 +55,7 @@ DataSocket ServerSocket::accept() {
 
 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) {