Merge branch 'develop' into amdadev

Benjamin Renard
2 parents b5d86c4b 8ee13af1
Showing 3 changed files with 52 additions and 14 deletions Show diff stats
generic_data/Functions/functions.xml
js/app/views/CatalogUI.js
js/app/views/TimeTableUI.js
@@ -114,6 +114,11 @@
         <info_brief>Remove Spikes: filter(param, factor,nPoints)</info_brief>
         <new_kernel>#filter</new_kernel>
     </function>
+    <function name="BCain(,)" args="2" kind="model" group="space">
+        <default_args>"",mag</default_args>
+        <info_brief>Cain model for Mars Magnetic Field</info_brief>
+        <new_kernel>#bcain</new_kernel>
+    </function>
     <function name="vAlfven(,)" args="2" kind="physics" group="space">
         <prompt_param>density[cm^⁻3], b_magnitude[nT]</prompt_param>
         <info_brief>Alfven velocity Valfven(density[cm^⁻3], b_magnitude[nT])</info_brief>
@@ -409,7 +409,7 @@ Ext.define(&#39;amdaUI.CatalogUI&#39;, {
                     hidden: true,
                     id: amdaUI.CatalogUI.COL_TO_HIDE_DURATION + '1',
                     renderer: function (value) {
-                        return Ext.util.Format.number(value, '0.00');
+                        return this.dateToString(value);
                     },
                     listeners: {
                         beforeshow: function () {
@@ -429,7 +429,7 @@ Ext.define(&#39;amdaUI.CatalogUI&#39;, {
                     hidden: true,
                     id: amdaUI.CatalogUI.COL_TO_HIDE_DURATION + '2',
                     renderer: function (value) {
-                        return Ext.util.Format.number(value, '0.00');
+                        return this.dateToString(value);
                     },
                     listeners: {
                         beforeshow: function () {
@@ -449,7 +449,7 @@ Ext.define(&#39;amdaUI.CatalogUI&#39;, {
                     hidden: false,
                     id: amdaUI.CatalogUI.COL_TO_HIDE_DURATION + '3',
                     renderer: function (value) {
-                        return Ext.util.Format.number(value, '0.00');
+                        return this.dateToString(value);
                     },
                     listeners: {
                         beforeshow: function () {
@@ -469,7 +469,7 @@ Ext.define(&#39;amdaUI.CatalogUI&#39;, {
                     hidden: true,
                     id: amdaUI.CatalogUI.COL_TO_HIDE_DURATION + '4',
                     renderer: function (value) {
-                        return Ext.util.Format.number(value, '0.00');
+                        return Ext.util.Format.number(value, '0.000');
                     },
                     listeners: {
                         beforeshow: function () {
@@ -939,6 +939,24 @@ Ext.define(&#39;amdaUI.CatalogUI&#39;, {
             frame: true,
             columnLines: true,
             selModel: {pruneRemoved: false},
+            
+          countDecimals: function (value) {
+                if (Math.floor(value) === value)
+                    return 0;
+                return value.toString().split(".")[1].length || 0;
+            },
+            
+            dateToString: function (value) {
+                ndegits = this.countDecimals(value);
+                if (ndegits <= 3) {
+                    return  Ext.util.Format.number(value, '0.000');
+                } else if (value < 0.1) {
+                    return value.toExponential(3);
+                } else {
+                    return Ext.util.Format.number(value, '0.000000');
+                }
+            },
+            
             //	selType: 'cellmodel',
             plugins: [cellEditing, {ptype: 'bufferedrenderer'}],
             listeners: {
@@ -383,8 +383,8 @@ Ext.define(&#39;amdaUI.TimeTableUI&#39;, {
     convertUTCDateToLocalDate: function (date) {
         if (date == null) {
             return date;
-        }
-        ;
+        };
+         
         var newDate = new Date(date.getTime() + date.getTimezoneOffset() * 60 * 1000);
  
         var offset = date.getTimezoneOffset() / 60;
@@ -514,7 +514,6 @@ Ext.define(&#39;amdaUI.TimeTableUI&#39;, {
                 {type: 'date', dataIndex: 'stop', dateFormat: 'Y-m-d'}
             ]
         };
-
         var cellEditing = Ext.create('Ext.grid.plugin.CellEditing', {
             onEditComplete: function (ed, value, startValue) {
                 var me = this,
@@ -580,6 +579,23 @@ Ext.define(&#39;amdaUI.TimeTableUI&#39;, {
             features: [filters],
             columnLines: true,
             selModel: {pruneRemoved: false},
+
+            countDecimals: function (value) {
+                if (Math.floor(value) === value)
+                    return 0;
+                return value.toString().split(".")[1].length || 0;
+            },
+            
+            dateToString: function (value) {
+                ndegits = this.countDecimals(value);
+                if (ndegits <= 3) {
+                    return  Ext.util.Format.number(value, '0.000');
+                } else if (value < 0.1) {
+                    return value.toExponential(3);
+                } else {
+                    return Ext.util.Format.number(value, '0.000000');
+                }
+            },
             columns: [
                 {
                     xtype: 'rownumberer',
@@ -624,13 +640,12 @@ Ext.define(&#39;amdaUI.TimeTableUI&#39;, {
                         }
                     }
                 },
-                    {
+                {
                     header: 'Duration (day)', width: 120, dataIndex: 'durationDay',
                     id: amdaUI.TimeTableUI.COL_TO_HIDE + '1',
                     hidden: true,
                     renderer: function (value) {
-                       
-                        return Ext.util.Format.number(value, '0.00');
+                        return this.dateToString(value);
                     },
                     listeners: {
                         beforeshow: function () {
@@ -652,7 +667,7 @@ Ext.define(&#39;amdaUI.TimeTableUI&#39;, {
                     id: amdaUI.TimeTableUI.COL_TO_HIDE + '2',
                     hidden: true,
                     renderer: function (value) {
-                        return Ext.util.Format.number(value, '0.00');
+                        return this.dateToString(value);
                     },
                     listeners: {
                         beforeshow: function () {
@@ -673,7 +688,7 @@ Ext.define(&#39;amdaUI.TimeTableUI&#39;, {
                     header: 'Duration (min)', width: 120, dataIndex: 'durationMin',
                     id: amdaUI.TimeTableUI.COL_TO_HIDE + '3',
                     renderer: function (value) {
-                        return Ext.util.Format.number(value, '0.00');
+                        return this.dateToString(value);
                     },
                     listeners: {
                         beforeshow: function () {
@@ -695,7 +710,7 @@ Ext.define(&#39;amdaUI.TimeTableUI&#39;, {
                     id: amdaUI.TimeTableUI.COL_TO_HIDE + '4',
                     hidden: true,
                     renderer: function (value) {
-                        return Ext.util.Format.number(value, '0.00');
+                        return Ext.util.Format.number(value, '0.000');
                     },
                     listeners: {
                         beforeshow: function () {
@@ -786,7 +801,7 @@ Ext.define(&#39;amdaUI.TimeTableUI&#39;, {
                         this.fireEvent("refresh");
                     }
                 }
-                
+
             }
         });