Преглед на файлове

conversion routines for all planed units

Konstantin Ladutenko преди 5 години
родител
ревизия
9a7429c253
променени са 2 файла, в които са добавени 16 реда и са изтрити 4 реда
  1. 14 2
      vue-cli3-webapp/src/App.vue
  2. 2 2
      vue-cli3-webapp/src/components/GetUnits.vue

+ 14 - 2
vue-cli3-webapp/src/App.vue

@@ -375,13 +375,19 @@
         if (fromU === 'km') return val*1e12;
 
         let c = 299792458; // m/s
-        let hc = 1239841930.092394328; // m*eV
+        let hc = 1239841930.092394328e-15; // m*eV
         if (fromU === 'THz') return c/(val*1e12)*1e9;
         if (fromU === 'GHz') return c/(val*1e9)*1e9;
         if (fromU === 'MHz') return c/(val*1e6)*1e9;
         if (fromU === 'kHz') return c/(val*1e3)*1e9;
         if (fromU === 'Hz') return c/(val*1e0)*1e9;
 
+        if (fromU === 'eV') return hc/(val*1e0)*1e9;
+        if (fromU === 'meV') return hc/(val/1e3)*1e9;
+
+        if (fromU === 'fs') return (val/1e12)/c*1e9;
+        if (fromU === 'ps') return (val/1e15)/c*1e9;
+
         return undefined;
       },
       convertUnitsFrom_nm(toU, val) {
@@ -393,13 +399,19 @@
         if (toU === 'km') return val/1e12;
 
         let c = 299792458; // m/s
-        let hc = 1239841930.092394328; // m*eV
+        let hc = 1239841930.092394328e-15; // m*eV
         if (toU === 'THz') return c/(val/1e9)/1e12;
         if (toU === 'GHz') return c/(val/1e9)/1e9;
         if (toU === 'MHz') return c/(val/1e9)/1e6;
         if (toU === 'kHz') return c/(val/1e9)/1e3;
         if (toU === 'Hz') return c/(val/1e9)/1e0;
 
+        if (toU === 'eV') return hc/(val/1e9);
+        if (toU === 'meV') return hc/(val/1e9)*1e3;
+
+        if (toU === 'fs') return (val/1e9)/c*1e12;
+        if (toU === 'ps') return (val/1e9)/c*1e15;
+
         return undefined;
       },
       convertUnits(fromU,toU, val) {

+ 2 - 2
vue-cli3-webapp/src/components/GetUnits.vue

@@ -29,12 +29,12 @@
                                 <option value="THz">THz</option>
                             </optgroup>
                                 <optgroup label="Energy">
-                                    <option value="eV">eV</option>
                                     <option value="meV">meV</option>
+                                    <option value="eV">eV</option>
                                 </optgroup>
                                 <optgroup label="Period duration">
-                                    <option value="fs">fs</option>
                                     <option value="ps">ps</option>
+                                    <option value="fs">fs</option>
                                 </optgroup>
                         </b-select>
                     </div>