From 80e249105ff187c18128c8b3e44bb6bdf1838bfd Mon Sep 17 00:00:00 2001 From: "kr.angelov" Date: Thu, 24 Apr 2014 07:44:47 +0000 Subject: [PATCH] show the probabilities for the alternative translations --- .../ui/android/AlternativesActivity.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/ui/android/src/org/grammaticalframework/ui/android/AlternativesActivity.java b/src/ui/android/src/org/grammaticalframework/ui/android/AlternativesActivity.java index 80bf19e7e..fa9f8fb7c 100644 --- a/src/ui/android/src/org/grammaticalframework/ui/android/AlternativesActivity.java +++ b/src/ui/android/src/org/grammaticalframework/ui/android/AlternativesActivity.java @@ -132,7 +132,7 @@ public class AlternativesActivity extends ListActivity { expandedView = view; } - private void expandExpr(View view, Expr expr) { + private void expandExpr(View view, ExprProb ep) { ImageView arrow = (ImageView) view.findViewById(R.id.arrow); arrow.setImageResource(R.drawable.close_arrow); @@ -146,7 +146,8 @@ public class AlternativesActivity extends ListActivity { ((RelativeLayout) view).addView(inflectionView, params); } - inflectionView.loadData(expr.toString(), "text/plain; charset=UTF-8", null); + String content = String.format("[%.4f] %s", ep.getProb(), ep.getExpr()); + inflectionView.loadData(content, "text/plain; charset=UTF-8", null); expandedView = view; } @@ -189,9 +190,9 @@ public class AlternativesActivity extends ListActivity { }); } else { if (item instanceof ExprProb) { - final Expr expr = ((ExprProb) item).getExpr(); + final ExprProb ep = (ExprProb) item; - String phrase = mTranslator.linearize(expr); + String phrase = mTranslator.linearize(ep.getExpr()); if (phrase.startsWith("% ") || phrase.startsWith("* ") || phrase.startsWith("+ ")) phrase = phrase.substring(2); @@ -203,10 +204,10 @@ public class AlternativesActivity extends ListActivity { if (expandedView == view) collapse(); else if (expandedView == null) - expandExpr(view, expr); + expandExpr(view, ep); else { collapse(); - expandExpr(view, expr); + expandExpr(view, ep); } } });