New version (to be tested).

[logicplayer.git] / mainActivity / src / com / example / furt / myapplication / GenericFormula.java

diff --git a/mainActivity/src/com/example/furt/myapplication/GenericFormula.java b/mainActivity/src/com/example/furt/myapplication/GenericFormula.java
index 5e063f536c2e83708495db223f18524fc08fb735..b2136ab0be74c6b06309eba9601553e3fbe52fdb 100755 (executable)
--- a/mainActivity/src/com/example/furt/myapplication/GenericFormula.java
+++ b/mainActivity/src/com/example/furt/myapplication/GenericFormula.java
@@ -12,17 +12,17 @@ public class GenericFormula implements Formula
     int priority;
     public String Draw(int p)
     {
-        return "";
-    }
+        return "?";
+    } //la GenericFormula non può essere rappresentata
     public String toString(){return Draw(0);}
     public float size(){
         p.setTextSize(DrawActivity.textSize);
-        return p.measureText(toString())+(float)(p.measureText(toString())*0.20);
+        return p.measureText(toString())+(float)(p.measureText(toString())*0.20);//ritorna la misura effettuata dalla classe Paint con un padding del 20% per migliorare la stima
     }
     public float sizeDeleted()
     {
         p.setTextSize(DrawActivity.textSize);
-        return p.measureText(toStringDeleted())+(float)(p.measureText(toStringDeleted())*0.20);
+        return p.measureText(toStringDeleted())+(float)(p.measureText(toStringDeleted())*0.20); //ritorna la misura effettuata dalla classe Paint con un padding del 20% per migliorare la stima
     }
     public String toStringDeleted()
     {
@@ -33,7 +33,7 @@ public class GenericFormula implements Formula
         p.setTextSize(DrawActivity.textSize);
         Rect bounds=new Rect();
         p.getTextBounds(toString(),0,toString().length(),bounds);
-        return (float)((bounds.height()+((float)0.20*bounds.height()))*1.5);
+        return (float)((bounds.height()+((float)0.20*bounds.height()))*1.5); //l'altezza della formula va moltiplicata per l'inverso della densità dello schermo (circa 1.5)
     }
     public List<IntroductionRule> introductionRules(){
         List<IntroductionRule> rules=new ArrayList<IntroductionRule>();