浏览代码

Don't default to PCA, preliminary support for later transmitter versions

HEAD
Trevor Irons 7 年前
父节点
当前提交
6f7f678e26
共有 2 个文件被更改,包括 7 次插入4 次删除
  1. 6
    3
      akvo/gui/main.ui
  2. 1
    1
      akvo/tressel/mrsurvey.py

+ 6
- 3
akvo/gui/main.ui 查看文件

73
         <rect>
73
         <rect>
74
          <x>0</x>
74
          <x>0</x>
75
          <y>0</y>
75
          <y>0</y>
76
-         <width>966</width>
77
-         <height>919</height>
76
+         <width>982</width>
77
+         <height>921</height>
78
         </rect>
78
         </rect>
79
        </property>
79
        </property>
80
        <layout class="QHBoxLayout" name="horizontalLayout_2">
80
        <layout class="QHBoxLayout" name="horizontalLayout_2">
1573
              <property name="toolTip">
1573
              <property name="toolTip">
1574
               <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Perform priciple component analysis on the reference channels? If &lt;span style=&quot; font-weight:600;&quot;&gt;yes&lt;/span&gt;, PCA will performed on the reference channels and the rotated channels will be used for noise cancelation rather than the raw noise channels. In the case of multiple noise sources where one dominantes across channels, better performance can be realized.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
1574
               <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Perform priciple component analysis on the reference channels? If &lt;span style=&quot; font-weight:600;&quot;&gt;yes&lt;/span&gt;, PCA will performed on the reference channels and the rotated channels will be used for noise cancelation rather than the raw noise channels. In the case of multiple noise sources where one dominantes across channels, better performance can be realized.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
1575
              </property>
1575
              </property>
1576
+             <property name="currentIndex">
1577
+              <number>1</number>
1578
+             </property>
1576
              <item>
1579
              <item>
1577
               <property name="text">
1580
               <property name="text">
1578
                <string>Yes</string>
1581
                <string>Yes</string>
3127
      <x>0</x>
3130
      <x>0</x>
3128
      <y>0</y>
3131
      <y>0</y>
3129
      <width>1000</width>
3132
      <width>1000</width>
3130
-     <height>20</height>
3133
+     <height>19</height>
3131
     </rect>
3134
     </rect>
3132
    </property>
3135
    </property>
3133
    <widget class="QMenu" name="menuFile">
3136
    <widget class="QMenu" name="menuFile">

+ 1
- 1
akvo/tressel/mrsurvey.py 查看文件

226
 
226
 
227
         ######################################################
227
         ######################################################
228
         # PreAmp gain
228
         # PreAmp gain
229
-        if self.nTransVersion == 4:
229
+        if self.nTransVersion >= 4:
230
             self.PreAmpGain = 1000.
230
             self.PreAmpGain = 1000.
231
         elif self.nTransVersion == 1 or self.nTransVersion == 2 or self.nTransVersion == 3:
231
         elif self.nTransVersion == 1 or self.nTransVersion == 2 or self.nTransVersion == 3:
232
             self.PreAmpGain = 500.
232
             self.PreAmpGain = 500.

正在加载...
取消
保存