From 642d7d8c74e9e37774e943bba9b325ef24e47137 Mon Sep 17 00:00:00 2001
From: l_maliakal_d <l_maliakal_d@af1100a4-978c-4157-bff7-07162d2ba061>
Date: Fri, 22 Feb 2013 09:54:06 +0000
Subject: [PATCH] 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 |  22 +++++++++++-----------
 slsDetectorGui/images/upload.png          | Bin 0 -> 721 bytes
 slsDetectorGui/src/qDetectorMain.cpp      |   3 +--
 3 files changed, 12 insertions(+), 13 deletions(-)
 create mode 100644 slsDetectorGui/images/upload.png

diff --git a/slsDetectorGui/forms/form_tab_advanced.ui b/slsDetectorGui/forms/form_tab_advanced.ui
index 7de324bdb..6f4fbd717 100644
--- a/slsDetectorGui/forms/form_tab_advanced.ui
+++ b/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>
diff --git a/slsDetectorGui/images/upload.png b/slsDetectorGui/images/upload.png
new file mode 100644
index 0000000000000000000000000000000000000000..d493327dbc234cbcd9f1808bd2f843d0dea6c6ba
GIT binary patch
literal 721
zcmV;?0xtcDP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-2xT~G9GnktnUB-0$xc(
zK~y-)jgvoX6j2n#fA`IMGn3iP?BK2@uBOpK1Vu!mScxejV!nfom0&Aa`31yE3yUDc
zk6^$*h>eJtQV^6SpoN8sQIhQJ?Cj3F7PAI57Ct!d@i>?B&b^!`09?7{NSZ0?h5uQ`
zDBGKxEMFf9SMRu);q;@iA1`<jAqXG{Km?2c6HWEtYdBGzj;EflZ-2aKX{2doWZ~O^
zeL@^V977aC6mqhiP$|6G$YEH*uz;d~q7Xi9F3^}x4XQHsDi~A0Y%Ms;rGqI?=G#0y
z-C?ntg0nRj1YiuMR{<4MyYsc>2`=q#a_>mOs2ETcIm<^A7H1oO)aazOT0ke8Dofoa
z_l~8Md7pm2#whQze7wctY;&j1%P#=|58ypZb1jz7bQukDuD@C*&j)<(=iGd~jvp4R
zob7VqKnmXDe|O+jn2ikg&mBTXB{yEY=ZW6~C`N?G+UE9J4^xd<Ie(ZvP9_cnOB88f
z$ILY&R@dIJKJZkXgPcbQLm?2ud^)CA?d8tPx6H-DshJkN4bO+Nua+e63t5|_lkqeM
zj9{xV))>O5fr_CeB^afrDZPQxX~5@X05<SeT<FyZS?vByn?MwXs0ql-Rz3Z|?$BXq
z5e>aHPQ5jjEV8>2tCJjNVX%vfBZu+ot(eNY(9-(b0Wchvs4@TK;>aPz*jtl?zBM(a
z*_7M$k)D10ii(hBom~Q*EKw<)x31h8y3^g&cVGHTBd@i{PU6~i6F;=RPiEr+qn#7`
zSM9@BLjjn+`#>a0LbFr#*ED}S08~_~{#Lnt?Xvy^SRm^&4QXnm00000NkvXXu0mjf
DZfZrA

literal 0
HcmV?d00001

diff --git a/slsDetectorGui/src/qDetectorMain.cpp b/slsDetectorGui/src/qDetectorMain.cpp
index 4c4a5cd1f..2e9c2fa2d 100644
--- a/slsDetectorGui/src/qDetectorMain.cpp
+++ b/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;