Changeset 1451

Timestamp:

11/04/08 07:51:04 (2 months ago)

Author:

amostafa

Message:

 

Files:

• branches/dev-brotecs-refactor/org.javarosa.polish.chatterbox.extensions/src/org/javarosa/formmanager/view/chatterbox/widget/GraphWidget.java (modified) (10 diffs)

branches/dev-brotecs-refactor/org.javarosa.polish.chatterbox.extensions/src/org/javarosa/formmanager/view/chatterbox/widget/GraphWidget.java

@@ -39 +39 @@
         
         /** Integer->IGraphTemplate */
-        Map templates = new Map();
+        private static Map templates = new Map();
         
         Vector data;
@@ -45 +45 @@
         //brotecs:add this;
         //CurrentTemplate currentTemplate=null;
-        WHOWeightTemplate currentTemplate=null; //Brotecs: for WHOWeightTemplate
+        IGraphTemplate currentTemplate=null; //Brotecs: for WHOWeightTemplate
         
         
@@ -71 +71 @@
 
         chart.setMaxYScaleFactor(100);
-        chart.setMaxXScaleFactor(18);
+        chart.setMaxXScaleFactor(26);
         }
         
@@ -81 +81 @@
                 for(int i = 0; i < chartXPointsArray.length; i++) {
             chart.insertItem("", chartYPointsArray[i].intValue(), chartXPointsArray[i].intValue(), 0,  0,   255);
-           // System.out.println("Brotecs::GraphWidget->applyData():chartYPointsArray="+chartYPointsArray[i].intValue()+" chartXPointsArray="+chartXPointsArray[i].intValue());
+            //System.out.println("Brotecs::GraphWidget->applyData():chartYPointsArray="+chartYPointsArray[i].intValue()+" chartXPointsArray="+chartXPointsArray[i].intValue());
                 }
         
@@ -93 +93 @@
         private void applyTemplate(Vector data) {
         System.out.println("Brotecs::GraphWidget->applyTemplate");              
-                if(currentTemplate.getIsUseTemplate()) {
+                if(currentTemplate!=null) {
                         System.out.println("Brotecs::GraphWidget->applyTemplate:currentTemplate != null");
-                        Vector lines = currentTemplate.getLines(data);
+                        Vector lines = currentTemplate.getLines(data,chart);
                         if(lines != null) {
-                                System.out.println("Brotecs::GraphWidget->applyTemplate:lines != null");
+                                //System.out.println("Brotecs::GraphWidget->applyTemplate:lines != null");
                                 Enumeration en = lines.elements();
                                 while(en.hasMoreElements()) {
-                                        System.out.println("Brotecs::GraphWidget->en.hasMoreElements()");
+                                        //System.out.println("Brotecs::GraphWidget->en.hasMoreElements()");
                                         Vector dataPoints = (Vector)en.nextElement();
                                         //System.out.println("Brotecs::GraphWidget->datapoints.size()="+dataPoints.size());
@@ -112 +112 @@
                 }
                 else{
-                        //System.out.println("Brotecs::GraphWidget->applyTemplate:currentTemplate == null");
+                        System.out.println("Brotecs::GraphWidget->applyTemplate:currentTemplate == null");
                 }
         }
@@ -123 +123 @@
         public void registerTemplate(IGraphTemplate template) {
         //System.out.println("Brotecs::GraphWidget->registerTemplate");         
-                templates.put(new Integer(template.getTemplateId()), template);
+                //System.out.println("Brotecs::GraphWidget->registerTemplate Length1; "+templates.size());              
+        templates.put(new Integer(template.getTemplateId()), template);
+        //System.out.println("Brotecs::GraphWidget->registerTemplate Length2; "+templates.size());
         }
         
@@ -156 +158 @@
         protected void setWidgetValue(Object o) {
         //System.out.println("Brotecs::GraphWidget->setWidgetValue");           
-                if(o instanceof Vector /*Brotecs:add this*/ && !currentTemplate.getIsUseTemplate()/*brotecs:till*/) {
+                if(o instanceof Vector /*Brotecs:add this*/ && !chart.getdefaulttemplate()/*brotecs:till*/) {
                         try{//Brotecs: add this
                                 data = (Vector)o;
@@ -243 +245 @@
                         
                         chart.resetData();
-                        applyTemplate(data); //Brotecs: block this
+                        //applyTemplate(data); //Brotecs: block this
                         applyData();
                 }        
@@ -253 +255 @@
          */
         protected void updateWidget(QuestionDef question) {
-        //System.out.println("Brotecs::GraphWidget->updateWidget");             
-                //currentTemplate = (WHOWeightTemplate)templates.get(new Integer(question.getDataType())); //Brotecs: block this
-                currentTemplate = new WHOWeightTemplate(); //Brotecs: for WHOWeightTemplate
-                //currentTemplate = new CurrentTemplate();
-        currentTemplate.setIsUseTemplate(true);
+        System.out.println("Brotecs::GraphWidget->updateWidget");
+                //currentTemplate = (IGraphTemplate)templates.get(new Integer(question.getDataType())); //Brotecs: for WHOWeightTemplate
+                currentTemplate = (IGraphTemplate)templates.get(new Integer(WHOWeightTemplate.WHO_WEIGHT_TEMPLATE_ID)); //Brotecs: for WHOWeightTemplate
+        /*********Brotecs*********************
+                if(currentTemplate!=null){
+                currentTemplate.setIsUseTemplate(true);
+                chart.defaulttemplate(true);
+                chart.setMaxYScaleFactor(30);
+        }
+        else{
+                currentTemplate.setIsUseTemplate(false);
+        }**************************************/
         chart.resetData();
                 applyTemplate(data);