履歴拡大α版完成

[train-delayed/source.git] / workspace / TrainDelayed / src / com / td / HistoryActivity.java

diff --git a/workspace/TrainDelayed/src/com/td/HistoryActivity.java b/workspace/TrainDelayed/src/com/td/HistoryActivity.java
index f683ab0..7d09a8a 100644 (file)
--- a/workspace/TrainDelayed/src/com/td/HistoryActivity.java
+++ b/workspace/TrainDelayed/src/com/td/HistoryActivity.java
@@ -11,10 +11,12 @@ import org.afree.data.category.DefaultCategoryDataset;
 \r
 import android.content.Context;\r
 import android.content.Intent;\r
+import android.content.res.Configuration;\r
 import android.os.Bundle;\r
 import android.view.View;\r
 import android.view.View.OnClickListener;\r
 import android.widget.Button;\r
+import android.widget.HorizontalScrollView;\r
 import android.widget.TextView;\r
 \r
 import com.td.db.History;\r
@@ -35,18 +37,17 @@ public class HistoryActivity extends BaseActivity {
        public static final String PREF_HIS_EN_HOUR = "HIS_EN_HOUR";\r
        public static final String PREF_HIS_EN_MINUTE = "HIS_EN_MINUTE";\r
 \r
-       public static final String PREF_HIS_UNIT = "HIS_UNIT";\r
-\r
        public static final int[] unit = { 10, 30, 60 };\r
 \r
        private TextView textView1;\r
        private EditPrefUtil pref = new EditPrefUtil(this);\r
-\r
+    private HorizontalScrollView scrollView;\r
+    private HistoryView historyView;\r
+    \r
        private int prefYear;\r
        private int prefMonth;\r
        private int prefDay;\r
        private int prefYmdPos;\r
-       private int prefUnit;\r
 \r
        private int prefStHour;\r
        private int prefStMinute;\r
@@ -59,7 +60,7 @@ public class HistoryActivity extends BaseActivity {
        public void onCreate(Bundle savedInstanceState) {\r
                super.onCreate(savedInstanceState);\r
                setContentView(R.layout.history);\r
-\r
+               \r
                try {\r
                        Button button1 = (Button) findViewById(R.id.button11);\r
                        button1.setOnClickListener(new OnClickListener() {\r
@@ -78,7 +79,9 @@ public class HistoryActivity extends BaseActivity {
                        });\r
 \r
                        textView1 = (TextView) findViewById(R.id.textView11);\r
-                       \r
+                       scrollView = (HorizontalScrollView) findViewById(R.id.scrollView11);\r
+                       historyView = (HistoryView) findViewById(R.id.historyView11);\r
+                       historyView.setHistoryActivity(this);\r
 //                     HistoryDao dao = HistoryDao.getInstance();\r
 //                     // List<History> list = dao.search(this);\r
 //                     Calendar cal = Calendar.getInstance();\r
@@ -126,7 +129,25 @@ public class HistoryActivity extends BaseActivity {
                }\r
        }\r
 \r
+\r
+       public static int W = 0;\r
        @Override\r
+       public void onWindowFocusChanged(boolean hasFocus) {\r
+               int width = scrollView.getWidth();\r
+               W = width;              \r
+               \r
+               super.onWindowFocusChanged(hasFocus);\r
+       }\r
+       \r
+       @Override\r
+    public void onConfigurationChanged(Configuration newConfig ) {\r
+               int width = scrollView.getWidth();\r
+               W = width;              \r
+               \r
+        super.onConfigurationChanged(newConfig);\r
+    }\r
+        \r
+    @Override\r
        protected void onStart() {\r
                super.onStart();\r
 \r
@@ -161,8 +182,6 @@ public class HistoryActivity extends BaseActivity {
                        cal.add(Calendar.DATE, -(M - (prefYmdPos + 1)));\r
                        currentDate = cal.getTime();\r
 \r
-                       prefUnit = pref.getInt(PREF_HIS_UNIT, 0);\r
-\r
                        pref.update();\r
                        \r
                        \r
@@ -194,7 +213,7 @@ public class HistoryActivity extends BaseActivity {
                                int hm = history.getHm();\r
                                // TODO\r
                                //String text = (hm / 100) + ":" + (hm % 100);\r
-                               String text = DateUtil.formattedDate(hm);\r
+                               String text = DateUtil.formattedHm(hm);\r
                                String route = "<none>";\r
                                switch (history.getRouteId()) {\r
                                case 1:\r
@@ -214,9 +233,7 @@ public class HistoryActivity extends BaseActivity {
                        AFreeChart chart = ChartFactory.createLineChart("\82Â\82Ô\82â\82«\97\9a\97ð", "\8e\9e\8d\8f",\r
                                        "\82Â\82Ô\82â\82«\90\94(\89ñ/\8e\9e)", dataset, PlotOrientation.VERTICAL, true,\r
                                        false, false);\r
-\r
-                       HistoryView spcv = (HistoryView) findViewById(R.id.spcv);\r
-                       spcv.setChart(chart);\r
+                       historyView.setChart(chart);\r
                        \r
                        String text = DateUtil.formattedDate(ymd, from, to);\r
                        textView1.setText(text);\r
@@ -240,8 +257,12 @@ public class HistoryActivity extends BaseActivity {
                pref.remove(PREF_HIS_EN_HOUR);\r
                pref.remove(PREF_HIS_EN_MINUTE);\r
 \r
-               pref.remove(PREF_HIS_UNIT);\r
-\r
                pref.update();\r
        }\r
+       \r
+       public void magnification(float dw){\r
+               // TODO \8cv\8eZ\95û\96@\r
+               int x = scrollView.getScrollX();\r
+               scrollView.scrollTo((int)(x * (dw / 2)), 0);\r
+       }\r
 }\r