previous checkin is not a working version

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

slsDetectorGui/forms/form_tab_advanced.ui

@@ -32,7 +32,7 @@
    <string>Form</string>
   </property>
   <property name="windowIcon">
-   <iconset resource="../include/icons.qrc">
+   <iconset>
     <normaloff>:/icons/images/refresh.png</normaloff>:/icons/images/refresh.png</iconset>
   </property>
   <widget class="QTabWidget" name="tabAdvancedSettings">
@@ -51,7 +51,7 @@
     <enum>QTabWidget::North</enum>
    </property>
    <property name="currentIndex">
-    <number>2</number>
+    <number>0</number>
    </property>
    <property name="elideMode">
     <enum>Qt::ElideLeft</enum>
@@ -164,7 +164,7 @@ Updates plot with Trimbits from Shared Memory, not from Detector.
           <string>Refresh  </string>
          </property>
          <property name="icon">
-          <iconset resource="../include/icons.qrc">
+          <iconset>
            <normaloff>:/icons/images/refresh.png</normaloff>:/icons/images/refresh.png</iconset>
          </property>
          <property name="iconSize">
@@ -186,7 +186,7 @@ Plots Trimbits from Detector. This will take time.
           <string>Get Trimbits  </string>
          </property>
          <property name="icon">
-          <iconset resource="../include/icons.qrc">
+          <iconset>
            <normaloff>:/icons/images/download.png</normaloff>:/icons/images/download.png</iconset>
          </property>
         </widget>
@@ -495,7 +495,7 @@ An extension given by the modules serial number will be attached.
           <string>Browse</string>
          </property>
          <property name="icon">
-          <iconset resource="../include/icons.qrc">
+          <iconset>
            <normaloff>:/icons/images/browse.png</normaloff>:/icons/images/browse.png</iconset>
          </property>
         </widget>
@@ -519,7 +519,7 @@ An extension given by the modules serial number will be attached.
           <string>Start Trimming  </string>
          </property>
          <property name="icon">
-          <iconset resource="../include/icons.qrc">
+          <iconset>
            <normaloff>:/icons/images/start.png</normaloff>:/icons/images/start.png</iconset>
          </property>
         </widget>
@@ -801,7 +801,7 @@ An extension given by the modules serial number will be attached.
          <string>  Get ROI  </string>
         </property>
         <property name="icon">
-         <iconset resource="../include/icons.qrc">
+         <iconset>
           <normaloff>:/icons/images/download.png</normaloff>:/icons/images/download.png</iconset>
         </property>
        </widget>
@@ -831,7 +831,7 @@ An extension given by the modules serial number will be attached.
          <string>  Set ROI  </string>
         </property>
         <property name="icon">
-         <iconset resource="../include/icons.qrc">
+         <iconset>
           <normaloff>:/icons/images/upload.png</normaloff>:/icons/images/upload.png</iconset>
         </property>
        </widget>
@@ -861,7 +861,7 @@ An extension given by the modules serial number will be attached.
          <string>  Clear ROI  </string>
         </property>
         <property name="icon">
-         <iconset resource="../include/icons.qrc">
+         <iconset>
           <normaloff>:/icons/images/close.png</normaloff>:/icons/images/close.png</iconset>
         </property>
        </widget>
@@ -1528,7 +1528,7 @@ An extension given by the modules serial number will be attached.
       <string> Set Receiver</string>
      </property>
      <property name="icon">
-      <iconset resource="../include/icons.qrc">
+      <iconset>
        <normaloff>:/icons/images/start.png</normaloff>:/icons/images/start.png</iconset>
      </property>
     </widget>
@@ -1545,7 +1545,7 @@ An extension given by the modules serial number will be attached.
       <string> Configure MAC</string>
      </property>
      <property name="icon">
-      <iconset resource="../include/icons.qrc">
+      <iconset>
        <normaloff>:/icons/images/start.png</normaloff>:/icons/images/start.png</iconset>
      </property>
     </widget>

slsDetectorGui/src/qDetectorMain.cpp

@@ -101,7 +101,6 @@ void qDetectorMain::SetUpWidgetWindow(){
 	tabs = new MyTabWidget(this);
 	layoutTabs->addWidget(tabs);
 
-	int numDet = myDet->getNumberOfDetectors();
 
 // creating all the other tab widgets
 	tab_measurement 	=  new qTabMeasurement	(this,	myDet,myPlot);		cout<<"Measurement ready"<<endl;
@@ -109,7 +108,7 @@ void qDetectorMain::SetUpWidgetWindow(){
 	tab_plot 			=  new qTabPlot			(this,	myDet,myPlot);		cout<<"Plot ready"<<endl;
 	tab_actions			=  new qTabActions		(this,	myDet);				cout<<"Actions ready"<<endl;
 	tab_settings 		=  new qTabSettings		(this,	myDet);				cout<<"Settings ready"<<endl;
-	tab_advanced 		=  new qTabAdvanced		(this,	myDet,myPlot,numDet);cout<<"Advanced ready"<<endl;
+	tab_advanced 		=  new qTabAdvanced		(this,	myDet,myPlot);cout<<"Advanced ready"<<endl;
 	tab_debugging 		=  new qTabDebugging	(this,	myDet);				cout<<"Debugging ready"<<endl;
 	tab_developer 		=  new qTabDeveloper	(this,	myDet);				cout<<"Developer ready"<<endl;