Add elevation in UI for 2D transect

hkexgroup · Apr 19, 2024 · feb4659 · feb4659
1 parent 3f6e5b6
commit feb4659
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 38 deletions.
diff --git a/src/Version.details b/src/Version.details
@@ -1,7 +1,7 @@
 VSVersionInfo(
   ffi=FixedFileInfo(
-    filevers=(1,2,0,0),
-    prodvers=(1,2,0,0),
+    filevers=(1,3,3,0),
+    prodvers=(1,3,3,0),
     mask=0x3f,
     flags=0x0,
     OS=0x40004,
@@ -16,12 +16,12 @@ VSVersionInfo(
         u'040904B0',
         [StringStruct(u'CompanyName', u'HKEx Group'),
         StringStruct(u'FileDescription', u'EMagPy - Modelling/Inversion of 1D frequency domain electromagnetic data'),
-        StringStruct(u'FileVersion', u'1.2.0'),
+        StringStruct(u'FileVersion', u'1.3.3'),
         StringStruct(u'InternalName', u'EMagPy'),
         StringStruct(u'LegalCopyright', u'HKEx Group'),
         StringStruct(u'OriginalFilename', u'EMagPy.exe'),
         StringStruct(u'ProductName', u'EMagPy'),
-        StringStruct(u'ProductVersion', u'1.2.0')])
+        StringStruct(u'ProductVersion', u'1.3.3')])
       ]), 
     VarFileInfo([VarStruct(u'Translation', [1033, 1200])])
   ]

diff --git a/src/emagpy/Problem.py b/src/emagpy/Problem.py
@@ -2822,7 +2822,7 @@ def objfunc(p, app, alpha):
             res = minimize(objfunc, conds0, args=(app, alpha))
             phiData[i] = np.sum(dataMisfit(res.x, app)**2)
             phiModel[i] = np.sum(modelMisfit(res.x)**2)
-
+                    
         if ax is None:
             fig, ax = plt.subplots()
         ax.set_title('L curve')

diff --git a/src/emagpy/__init__.py b/src/emagpy/__init__.py
@@ -5,7 +5,7 @@
 
 @author: jkl
 """
-EMagPy_version = '1.3.2'
+EMagPy_version = '1.3.3'
 name = 'emagpy'
 from emagpy.Problem import Problem
 from emagpy.Survey import Survey
diff --git a/src/examples/cover-crop/coverCropTransect.csv b/src/examples/cover-crop/coverCropTransect.csv
@@ -1,31 +1,32 @@
-x,y,VCP0.32f30000h0,VCP0.71f30000h0,VCP1.18f30000h0,HCP0.32f30000h0,HCP0.71f30000h0,HCP1.18f30000h0
-0,2,27.0162222222222,28.03,32.79,28.65,33.58,38.57
-1,2,26.6781111111111,26.06,29.19,26.73,29.69,36.5
-2,2,25.15,24.44,28.51,26.39,28.87,34.49
-3,2,22.5105555555556,26.48,23.84,24.02,25.76,29.77
-4,2,20.8224444444444,19.28,22.19,20.15,23,28.67
-5,2,21.6043333333333,20.77,23.99,23.92,26.58,30.92
-6,2,21.1048888888889,19.18,22.05,19.73,23.42,28.64
-7,2,21.8467777777778,20.84,23.28,21.9,24.57,28.79
-8,2,199.518666666667,38.67,29.15,33.57,25.76,29.88
-9,2,21.7992222222222,19.48,21.17,22.4,22.12,25.21
-10,2,21.3811111111111,18.67,21.42,25.28,23.43,26
-11,2,22.283,19.52,20.67,22.02,21.72,24.22
-12,2,19.3835555555556,13.99,15.89,16.03,15.83,18.43
-13,2,18.0954444444444,13.34,15.46,15.61,14.88,18.46
-14,2,17.0973333333333,13.71,15.4,14.92,16.47,19.33
-15,2,54.6078888888889,13.73,14.09,12.87,13.63,16.32
-16,2,17.4897777777778,12.04,15.56,13.47,13.31,16.1
-17,2,16.7916666666667,11.77,13.11,11.15,12.83,15.86
-18,2,24.4722222222222,10.4,12.32,15.98,11.67,15.14
-19,2,18.2941111111111,11.16,12.35,14.02,13.12,15.99
-20,2,16.246,11.62,13.37,14.42,14.18,16.58
-21,2,19.4565555555556,13.27,13.77,14.65,13.7,15.48
-22,2,19.4584444444444,12.66,13.46,14.34,14.18,15.79
-23,2,18.4403333333333,12.47,13.51,13.24,14.08,16.4
-24,2,20.8408888888889,12.94,13.84,14.79,14.21,15.67
-25,2,19.2927777777778,12.71,13.76,14.57,14.31,15.34
-26,2,19.3046666666667,12.22,13.3,13.93,13.2,15.22
-27,2,21.1752222222222,13.79,14.9,14.99,14.44,16.91
-28,2,21.8071111111111,14.04,14.33,14.93,14.87,17.02
-29,2,21.349,13.95,14.64,15.35,14.85,17.01
+x,y,elevation,VCP0.32f30000h0,VCP0.71f30000h0,VCP1.18f30000h0,HCP0.32f30000h0,HCP0.71f30000h0,HCP1.18f30000h0
+0,2,0,27.0162220000000,28.03,32.79,28.65,33.58,38.57
+1,2,0,26.6781110000000,26.06,29.19,26.73,29.69,36.5
+2,2,0,25.15,24.44,28.51,26.39,28.87,34.49
+3,2,0.10000000000000001,22.5105560000000,26.48,23.84,24.02,25.76,29.77
+4,2,0.20000000000000001,20.8224440000000,19.28,22.19,20.15,23,28.67
+5,2,0.29999999999999999,21.6043330000000,20.77,23.99,23.92,26.58,30.92
+6,2,0.39999999999999997,21.1048890000000,19.18,22.05,19.73,23.42,28.64
+7,2,0.49999999999999994,21.8467780000000,20.84,23.28,21.9,24.57,28.79
+8,2,0.59999999999999987,199.518667000000,38.67,29.15,33.57,25.76,29.88
+9,2,0.69999999999999996,21.7992220000000,19.48,21.17,22.4,22.12,25.21
+10,2,0.79999999999999982,21.3811110000000,18.67,21.42,25.28,23.43,26
+11,2,0.89999999999999991,22.283,19.52,20.67,22.02,21.72,24.22
+12,2,0.99999999999999978,19.3835560000000,13.99,15.89,16.03,15.83,18.43
+13,2,1,18.0954440000000,13.34,15.46,15.61,14.88,18.46
+14,2,1,17.0973330000000,13.71,15.4,14.92,16.47,19.33
+15,2,1,54.6078890000000,13.73,14.09,12.87,13.63,16.32
+16,2,1,17.4897780000000,12.04,15.56,13.47,13.31,16.1
+17,2,1,16.7916670000000,11.77,13.11,11.15,12.83,15.86
+18,2,1,24.4722220000000,10.4,12.32,15.98,11.67,15.14
+19,2,1,18.2941110000000,11.16,12.35,14.02,13.12,15.99
+20,2,1,16.246,11.62,13.37,14.42,14.18,16.58
+21,2,1,19.4565560000000,13.27,13.77,14.65,13.7,15.48
+22,2,1,19.4584440000000,12.66,13.46,14.34,14.18,15.79
+23,2,1,18.4403330000000,12.47,13.51,13.24,14.08,16.4
+24,2,1,20.8408890000000,12.94,13.84,14.79,14.21,15.67
+25,2,1,19.2927780000000,12.71,13.76,14.57,14.31,15.34
+26,2,1,19.3046670000000,12.22,13.3,13.93,13.2,15.22
+27,2,1,21.1752220000000,13.79,14.9,14.99,14.44,16.91
+28,2,1,21.8071110000000,14.04,14.33,14.93,14.87,17.02
+29,2,1,21.349,13.95,14.64,15.35,14.85,17.01
+
diff --git a/src/ui.py b/src/ui.py
@@ -1551,7 +1551,7 @@ def invertBtnFunc():
 
         # profile display
         showInvParams = {'index':0, 'vmin':None, 'vmax':None, 
-                         'cmap':'viridis_r', 'contour':False, 'dist':True}
+                         'cmap':'viridis_r', 'contour':False, 'dist':True, 'elev':True}
 
         def cmapInvComboFunc(index):
             showInvParams['cmap'] = self.cmapInvCombo.itemText(index)