Changed units

tainfante · Jan 21, 2018 · b0e933f · b0e933f
1 parent b2cc0f1
commit b0e933f
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 42 deletions.
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/out/production/KCC_App/sample/Controller.class b/out/production/KCC_App/sample/Controller.class
diff --git a/src/sample/Controller.java b/src/sample/Controller.java
@@ -71,21 +71,21 @@ public void onStartAction(ActionEvent actionEvent) {
 
     private float calculateTime(long impulses) {
         float time=impulses/(16*frequency);
-        if (time>1000){
-            time=time/1000;
-            units="s";
-        }
-        else if(time<1){
-            time=time*1000;
-            units="us";
+        if (time<0.000001){
+            time=time*1000000000;
+            units="ns";
         }
         else if(time<0.001){
             time=time*1000000;
-            units="ns";
+            units="us";
         }
-        else{
+        else if(time<1){
+            time=time*1000;
             units="ms";
         }
+        else{
+            units="s";
+        }
         return time;
     }