merge conflict resolved from 3.0.1

slsDetectorGui/include/qCloneWidget.h

@@ -119,11 +119,10 @@ private:
 	int id;
 	/** Default Save file path */
 	string filePath;
-
-	/**	clone 2D Plot */
-	SlsQt2DPlotLayout* 	cloneplot2D;
 	/**	clone 1D Plot */
 	SlsQt1DPlot* 		cloneplot1D;
+	/**	clone 2D Plot */
+	SlsQt2DPlotLayout* 	cloneplot2D;
 	/**	vector of 1D hist values */
 	QVector<SlsQtH1D*> 	cloneplot1D_hists;
 

slsDetectorGui/include/qDebugStream.h

@@ -59,7 +59,8 @@ public:
 		// output anything that is left
 		if (!m_string.empty()) {
 			pthread_mutex_lock(&mutex);
-			QApplication::postEvent(log_window, new qStreamEvent(m_string.c_str()));
+			const char* c_string = m_string.c_str();
+			QApplication::postEvent(log_window, new qStreamEvent(c_string));
 			pthread_mutex_unlock(&mutex);
 		}
 		m_stream.rdbuf(m_old_buf);
@@ -71,7 +72,8 @@ protected:
 	virtual int_type overflow(int_type v){
 		if (v == '\n'){
 			pthread_mutex_lock(&mutex);
-			QApplication::postEvent(log_window, new qStreamEvent(m_string.c_str()));
+			const char* c_string = m_string.c_str();
+			QApplication::postEvent(log_window, new qStreamEvent(c_string));
 			m_string.erase(m_string.begin(), m_string.end());
 			pthread_mutex_unlock(&mutex);
 		}
@@ -87,13 +89,14 @@ protected:
 		m_string.append(p, p + n);
 
 		//changed from uint because of 64 bit
-		int pos = 0;
+		size_t pos = 0;
 
 		while (pos != string::npos){
 			pos = m_string.find('\n');
 			if (pos != string::npos){
 				string tmp(m_string.begin(), m_string.begin() + pos);
-				QApplication::postEvent(log_window, new qStreamEvent(tmp.c_str()));
+				const char* c_tmp = tmp.c_str();
+				QApplication::postEvent(log_window, new qStreamEvent(c_tmp));
 				m_string.erase(m_string.begin(), m_string.begin() + pos + 1);
 			}
 		}

slsDetectorGui/include/qDrawPlot.h

@@ -430,7 +430,7 @@ unsigned int nPixelsX;
 /** Number of angle Pixels in X Axis */
 int nAnglePixelsX;
 /**	Number of pixel bins in Y Axis */
-int nPixelsY;
+unsigned int nPixelsY;
 /** Min Pixel number for Y Axis*/
 double minPixelsY;
 /** Max Pixel number for Y Axis*/

slsDetectorGui/include/qTabAdvanced.h

@@ -133,6 +133,16 @@ private slots:
 	 */
 	void SetRxrUDPPort(int port);
 
+	/** Sets client zmq receiver port
+	 * @param port client zmq receiver port
+	 */
+	void SetCltZmqPort(int port);
+
+	/** Sets receiver zmq transmitting port
+	 * @param port receiver zmq transmitting port
+	 */
+	void SetRxrZmqPort(int port);
+
 	/** Sets receiver online
 	 * @param index 1 for online and 0 for offline
 	 */