Pārlūkot izejas kodu

Inversion functional, minor version bump

tags/1.6.1
Trevor Irons 5 gadus atpakaļ
vecāks
revīzija
c2153d7daa
3 mainītis faili ar 87 papildinājumiem un 17 dzēšanām
  1. 7
    2
      akvo/gui/akvoGUI.py
  2. 79
    14
      akvo/gui/main.ui
  3. 1
    1
      setup.py

+ 7
- 2
akvo/gui/akvoGUI.py Parādīt failu

@@ -336,6 +336,11 @@ class ApplicationWindow(QtWidgets.QMainWindow):
336 336
         NT2 = self.ui.NT2.value()
337 337
         dataChan = self.ui.invChan.currentText()
338 338
        
339
+
340
+        t2Obj = self.ui.T2Objective.currentText()
341
+        depthObj = self.ui.depthObjective.currentText()
342
+        alpha_0 = self.ui.initialAlpha.value()
343
+
339 344
         invDict = dict()
340 345
         invDict["data"] = dict()
341 346
         invDict["data"] = dict() 
@@ -345,8 +350,8 @@ class ApplicationWindow(QtWidgets.QMainWindow):
345 350
         invDict["T2Bins"] = dict()
346 351
         invDict["T2Bins"]["low"] = T2lo
347 352
         invDict["T2Bins"]["high"] = T2hi
348
-        invDict["T2Bins"]["number"] = NT2
349
-        
353
+        invDict["T2Bins"]["number"] = NT2       
354
+ 
350 355
         node = yaml.YAML()
351 356
         kpo = open( "invert.yml", 'w' )
352 357
         node.dump(invDict, kpo)

+ 79
- 14
akvo/gui/main.ui Parādīt failu

@@ -4008,8 +4008,8 @@ background: dark grey;
4008 4008
               <rect>
4009 4009
                <x>0</x>
4010 4010
                <y>0</y>
4011
-               <width>96</width>
4012
-               <height>26</height>
4011
+               <width>100</width>
4012
+               <height>30</height>
4013 4013
               </rect>
4014 4014
              </property>
4015 4015
              <attribute name="label">
@@ -4021,8 +4021,8 @@ background: dark grey;
4021 4021
               <rect>
4022 4022
                <x>0</x>
4023 4023
                <y>0</y>
4024
-               <width>96</width>
4025
-               <height>26</height>
4024
+               <width>411</width>
4025
+               <height>67</height>
4026 4026
               </rect>
4027 4027
              </property>
4028 4028
              <attribute name="label">
@@ -4110,10 +4110,48 @@ background: dark grey;
4110 4110
             </item>
4111 4111
             <item>
4112 4112
              <widget class="QGroupBox" name="groupBox_6">
4113
+              <property name="maximumSize">
4114
+               <size>
4115
+                <width>16777215</width>
4116
+                <height>500</height>
4117
+               </size>
4118
+              </property>
4113 4119
               <property name="title">
4114 4120
                <string>QT Inversion</string>
4115 4121
               </property>
4116 4122
               <layout class="QGridLayout" name="gridLayout_19">
4123
+               <item row="5" column="0" colspan="2">
4124
+                <widget class="QPushButton" name="invertButton">
4125
+                 <property name="styleSheet">
4126
+                  <string notr="true">#invertButton {
4127
+font-size:29pt;
4128
+font-weight: bold;
4129
+color: white;
4130
+background: red;
4131
+}</string>
4132
+                 </property>
4133
+                 <property name="text">
4134
+                  <string>Invert</string>
4135
+                 </property>
4136
+                </widget>
4137
+               </item>
4138
+               <item row="4" column="0">
4139
+                <widget class="QLabel" name="label_81">
4140
+                 <property name="text">
4141
+                  <string>initial alpha </string>
4142
+                 </property>
4143
+                </widget>
4144
+               </item>
4145
+               <item row="4" column="1">
4146
+                <widget class="QSpinBox" name="initialAlpha">
4147
+                 <property name="maximum">
4148
+                  <number>10000000</number>
4149
+                 </property>
4150
+                 <property name="value">
4151
+                  <number>1000000</number>
4152
+                 </property>
4153
+                </widget>
4154
+               </item>
4117 4155
                <item row="1" column="0">
4118 4156
                 <widget class="QLabel" name="label_79">
4119 4157
                  <property name="text">
@@ -4121,6 +4159,25 @@ background: dark grey;
4121 4159
                  </property>
4122 4160
                 </widget>
4123 4161
                </item>
4162
+               <item row="2" column="1">
4163
+                <widget class="QComboBox" name="T2Objective">
4164
+                 <item>
4165
+                  <property name="text">
4166
+                   <string>Smallest</string>
4167
+                  </property>
4168
+                 </item>
4169
+                 <item>
4170
+                  <property name="text">
4171
+                   <string>Smoothest</string>
4172
+                  </property>
4173
+                 </item>
4174
+                 <item>
4175
+                  <property name="text">
4176
+                   <string>Both</string>
4177
+                  </property>
4178
+                 </item>
4179
+                </widget>
4180
+               </item>
4124 4181
                <item row="1" column="1">
4125 4182
                 <widget class="QComboBox" name="invChan">
4126 4183
                  <item>
@@ -4145,18 +4202,26 @@ background: dark grey;
4145 4202
                  </item>
4146 4203
                 </widget>
4147 4204
                </item>
4148
-               <item row="2" column="0" colspan="2">
4149
-                <widget class="QPushButton" name="invertButton">
4150
-                 <property name="styleSheet">
4151
-                  <string notr="true">#invertButton {
4152
-font-size:29pt;
4153
-font-weight: bold;
4154
-color: white;
4155
-background: red;
4156
-}</string>
4205
+               <item row="2" column="0">
4206
+                <widget class="QLabel" name="label_80">
4207
+                 <property name="text">
4208
+                  <string>T2* model objective</string>
4157 4209
                  </property>
4210
+                </widget>
4211
+               </item>
4212
+               <item row="3" column="1">
4213
+                <widget class="QComboBox" name="depthObjective">
4214
+                 <item>
4215
+                  <property name="text">
4216
+                   <string>Smallest</string>
4217
+                  </property>
4218
+                 </item>
4219
+                </widget>
4220
+               </item>
4221
+               <item row="3" column="0">
4222
+                <widget class="QLabel" name="label_82">
4158 4223
                  <property name="text">
4159
-                  <string>Invert</string>
4224
+                  <string>Depth model objective</string>
4160 4225
                  </property>
4161 4226
                 </widget>
4162 4227
                </item>

+ 1
- 1
setup.py Parādīt failu

@@ -21,7 +21,7 @@ with open("README.md", "r") as fh:
21 21
     long_description = fh.read()
22 22
 
23 23
 setup(name='Akvo',
24
-      version='1.3.6',
24
+      version='1.4.0',
25 25
       python_requires='>3.7.0', # due to pyLemma
26 26
       description='Surface nuclear magnetic resonance workbench',
27 27
       long_description=long_description,

Notiek ielāde…
Atcelt
Saglabāt