fixed filedir for gotthard receiver problem

git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@113 af1100a4-978c-4157-bff7-07162d2ba061

slsDetectorGui/forms/form_tab_plot.ui

@@ -593,7 +593,7 @@
      <rect>
       <x>10</x>
       <y>20</y>
-      <width>337</width>
+      <width>341</width>
       <height>26</height>
      </rect>
     </property>
@@ -627,7 +627,7 @@
        </property>
        <property name="sizeHint" stdset="0">
         <size>
-         <width>11</width>
+         <width>9</width>
          <height>10</height>
         </size>
        </property>
@@ -656,7 +656,7 @@
        </property>
        <property name="sizeHint" stdset="0">
         <size>
-         <width>11</width>
+         <width>9</width>
          <height>10</height>
         </size>
        </property>
@@ -671,7 +671,7 @@
         </sizepolicy>
        </property>
        <property name="text">
-        <string>File Index</string>
+        <string>Frame Index</string>
        </property>
       </widget>
      </item>
@@ -685,7 +685,7 @@
        </property>
        <property name="sizeHint" stdset="0">
         <size>
-         <width>11</width>
+         <width>9</width>
          <height>10</height>
         </size>
        </property>

slsDetectorGui/include/qDrawPlot.h

@@ -463,8 +463,6 @@ bool backwardScanPlot;
 /**if files will be saved and index increased*/
 bool fileSaveEnable;
 
-/** true if receiver online*/
-bool receiver;
 
 signals:
 void UpdatingPlotFinished();

slsDetectorGui/slsDetectorGui.pro

@@ -5,9 +5,11 @@ UI_HEADERS_DIR		= 		forms/include
 
 RESOURCES   		+=  	icons.qrc
 
-CONFIG+=debug 
+CONFIG				+=		debug 
-QMAKE_CXXFLAGS_WARN_ON = -w 
+
-QMAKE_CFLAGS_WARN_ON = -w
+QMAKE_CXXFLAGS_WARN_ON = 	-w 
+QMAKE_CFLAGS_WARN_ON   = 	-w
+
 DEFINES 			+= 		VERBOSE DACS_INT  #VERYVERBOSE 
 							
 
@@ -20,7 +22,7 @@ QMAKE_CLEAN 		+= 		docs/*/* \
 							$(DESTDIR)* 
 							
 
-LIBS				+= 	-Wl,-Bstatic -L../slsDetectorSoftware -lSlsDetector  -Wl,-Bdynamic\
+LIBS				+=		-Wl,-Bstatic -L../slsDetectorSoftware -lSlsDetector  -Wl,-Bdynamic\
 							-L$(QWTDIR)/lib  -lqwt -L$(QWT3D)/lib  
 
 DEPENDPATH  		+=		\
@@ -31,11 +33,11 @@ DEPENDPATH  		+=		\
 
 
 INCLUDEPATH 		+= 		\
-                                                        $(shell echo "/lib/modules/`uname -r`/build/include") \
+                            $(shell echo "/lib/modules/`uname -r`/build/include") \
 							$(QWTDIR)/include\
 							$(QWTDIR) \
-                                                        $(QWTDIR)/src\
+                            $(QWTDIR)/src\
-                                                        $(QWT3D)/include\
+                            $(QWT3D)/include\
 							slsDetectorPlotting/include\
 							include\
 							forms/include\

slsDetectorGui/src/qDrawPlot.cpp

@@ -109,7 +109,6 @@ void qDrawPlot::SetupWidgetWindow(){
 	currentFileIndex = 0;
 	currentFrameIndex = 0;
 
-	receiver=false;
 	// This is so that it initially stop and plots
 	running = 1;
 	for(int i=0;i<MAX_1DPLOTS;i++)
@@ -351,8 +350,6 @@ bool qDrawPlot::StartOrStopThread(bool start){
 		//sets up the measurement parameters
 		SetupMeasurement();
 
-		if(myDet->setReceiverOnline()==slsDetectorDefs::ONLINE_FLAG)
-			receiver=true;
 
 		cout << "Starting new acquisition threadddd ...." << endl;
 		// Start acquiring data from server
@@ -547,19 +544,15 @@ int qDrawPlot::GetData(detectorData *data,int fIndex){
 		//set progress
 		progress=(int)data->progressIndex;
 		currentFrameIndex = fileIOStatic::getIndicesFromFileName(string(data->fileName),currentFileIndex);
-
 #ifdef VERYVERBOSE
 		cout << "progress:" << progress << endl;
 #endif
 
-		//Plot Disabled
-		if(!plotEnable) 	return 0;
-
 		// secondary title necessary to differentiate between frames when not saving data
 		char temp_title[2000];
-		if(receiver){
+		//findex is used because in the receiver, you cannot know the frame index as many frames are in 1 file.
-			//findex is used because in the receiver, you cannot know the frame index as many frames are in 1 file.
+		if(fIndex!=-1){
-			if(fIndex==-1) fIndex=currentFrame;
+			currentFrameIndex=fIndex;
 			sprintf(temp_title,"#%d",fIndex);
 		}else{
 			if(fileSaveEnable)	strcpy(temp_title,"");
@@ -567,6 +560,10 @@ int qDrawPlot::GetData(detectorData *data,int fIndex){
 		}
 
 
+		//Plot Disabled
+		if(!plotEnable) 	return 0;
+
+
 		//angle plotting
 		if(anglePlot){
 			while(1){

slsDetectorGui/src/qTabDataOutput.cpp

@@ -143,11 +143,40 @@ void qTabDataOutput::setOutputDir(){
 
 	QString path = dispOutputDir->text();
 
+	string oldPath = myDet->getFilePath();
+	bool error=false;
+
 	//gets rid of the end '/'s
 	while(path.endsWith('/')) path.chop(1);
 	dispOutputDir->setText(path);
 
-	if(QFile::exists(path)){
+	if(myDet->setReceiverOnline()==slsDetectorDefs::ONLINE_FLAG){
+		for(int i=0;i<myDet->getNumberOfDetectors();i++){
+			slsDetector *det = 	myDet->getSlsDetector(i);
+			det->setFilePath(string(path.toAscii().constData()));
+			if(det->getFilePath()!=(string(path.toAscii().constData()))){
+				error=true;
+				break;
+			}
+		}
+		if(error){
+			//set it back for the ones which got set
+			for(int i=0;i<myDet->getNumberOfDetectors();i++){
+				slsDetector *det = 	myDet->getSlsDetector(i);
+				det->setFilePath(oldPath);
+			}
+		}//set it in multi as well if it worked so that they reflect the same
+		else
+			myDet->setFilePath(string(path.toAscii().constData()));
+	}
+	else	{
+		myDet->setFilePath(string(path.toAscii().constData()));
+		if(myDet->getFilePath()!=(string(path.toAscii().constData())))
+			error=true;
+	}
+
+	if(!error){
+	//if(QFile::exists(path)){
 		lblOutputDir->setText("Output Directory: ");
 		lblOutputDir->setPalette(chkRate->palette());
 		lblOutputDir->setToolTip(outDirTip);
@@ -512,6 +541,12 @@ void qTabDataOutput::Refresh(){
 	if(myDet->getBadChannelCorrection()) chkDiscardBad->setChecked(true);
 
 
+	if(myDet->setReceiverOnline()==slsDetectorDefs::ONLINE_FLAG)
+		btnOutputBrowse->setEnabled(false);
+	else
+		btnOutputBrowse->setEnabled(true);
+
+
 #ifdef VERBOSE
 	cout  << "**Updated DataOutput Tab" << endl << endl;
 #endif

slsDetectorGui/src/qTabPlot.cpp

@@ -767,8 +767,8 @@ void qTabPlot::SetScanArgument(){
 			break;
 			break;
 		case 2://file index
-			dispYAxis->setText("File Index");
+			dispYAxis->setText("Frame Index");
-			myPlot->SetImageYAxisTitle("File Index");
+			myPlot->SetImageYAxisTitle("Frame Index");
 			break;
 		case 3://all frames
 			dispYAxis->setText("All Frames");