Changeset 1452

Timestamp:

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

Author:

amostafa

Message:

 

Location:

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

Files:

• CurrentTemplate.java (modified) (1 diff)
• IGraphTemplate.java (modified) (2 diffs)
• LineChart.java (modified) (9 diffs)
• WHOWeightTemplate.java (modified) (3 diffs)

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

@@ -33 +33 @@
          * @see org.javarosa.formmanager.view.chatterbox.widget.chart.IGraphTemplate#getDataPoints()
          */
-        public Vector getLines(Vector data) {
+        public Vector getLines(Vector data,LineChart chart) {
 
                 Vector lines = new Vector();

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

@@ -5 +5 @@
 public interface IGraphTemplate {
         
+
         /**
          * @return The internal ID used to identify the template
@@ -23 +24 @@
          * lines for the template.
          */
-        Vector getLines(Vector data);
+        Vector getLines(Vector data,LineChart chart);
+        //public void setIsUseTemplate(boolean isUseTemplate);
+        //public boolean getIsUseTemplate();
 }

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

@@ -50 +50 @@
 
     private boolean isDefaultColor;
-
+    
+    private boolean defaulttemplate;//brotecs
+    private int templatemarginOne;//brotecs
+    private int templatexScaleFactor;//brotecs
+    
     public LineChart(String label, Style style) {
         super(label,style);
@@ -59 +63 @@
             pointsVector.addElement(currentPointVector);
             yScaleFactor = 100;
-            xScaleFactor = 25;
+            xScaleFactor = 26;
             isDrawAxis = true;
             marginOne = 1;
@@ -75 +79 @@
             shadowColorThree = 100;
             font = Font.getDefaultFont();
+            defaulttemplate=false;//brotecs
+            templatemarginOne=36;//brotecs
+            templatexScaleFactor=13;//brotecs
            // System.out.println("Brotecs::LineChart->LineChart(String label, Style style)");
     }
@@ -153 +160 @@
             g1.setColor(0, 0, 0);
             g1.drawLine(marginOne, this.height - marginFour, marginOne + width, this.height - marginFour);
+            //System.out.println("Line 1->X1:"+marginOne+" Y1:"+(this.height - marginFour)+" X2:"+(marginOne+width)+" Y2:"+(this.height - marginFour));
             g1.drawLine(marginOne, this.height - marginFour, marginOne, this.height - marginFour - height);
-           
+            //System.out.println("Line 2->X1:"+marginOne+" Y1:"+(this.height - marginFour)+" X2:"+marginOne+" Y2:"+(this.height - marginFour - height));
+            
         }
     }
@@ -293 +302 @@
             for(int i = 0; i <= height; i += 10) {
                 int j1 = this.height - fontSpaceHeight - i;
+                //System.out.println("Brotecs::LineChart->marginOne:"+marginOne+"j1:"+j1+"marginOne-2"+(marginOne-2));
                 g.drawLine(marginOne, j1, marginOne - 2, j1); //draw Y axis "-" 
                 int point = (yScaleFactor * i) / height;
@@ -306 +316 @@
             }
         }
+
         Enumeration en = pointsVector.elements();
         while(en.hasMoreElements()) {
@@ -314 +325 @@
    
    public void drawLine(Graphics g, Vector pointVector) {
-
+           //System.out.println("Brotecs::LineChart->drawLine:pointVector.size()="+pointVector.size());
        pointVector.size();
        int count = -1;
@@ -345 +356 @@
            
            int pointY2 = this.height - fontSpaceHeight - (height * b1.yCordPt) / (yScaleFactor);
-           //System.out.println("Brotecs::LineChart->drawLine:"+height+" * " +  b1.yCordPt + " / "+yScaleFactor);
-           int pointX2 = marginOne + (width * b1.xCordPt) / (xScaleFactor * scaleFactor);
+           
+           //System.out.println("Brotecs::pointY2->this.height:"+this.height +"- fontSpaceHeight:"+fontSpaceHeight+" - (height:"+height+" * b1.yCordPt:" +  b1.yCordPt + ") / yScaleFactor:"+yScaleFactor);
+           //int pointX2 = marginOne + (width * b1.xCordPt) / (xScaleFactor * scaleFactor);
+           /************Brotecs*************/
+           int pointX2;
+           if(defaulttemplate){//
+                   pointX2 = marginOne + (width * b1.xCordPt) / (templatexScaleFactor * scaleFactor);
+           }
+           else
+           {
+                   pointX2 = marginOne + (width * b1.xCordPt) / (xScaleFactor * scaleFactor);
+           }
+           
+          // System.out.println("Brotecs::pointX2->marginOne:"+marginOne+"+(width:"+width+"* b1.xCordPt:"+b1.xCordPt+") / (xScaleFactor:"+xScaleFactor+"* scaleFactor:"+scaleFactor+")");
+           /************Brotecs*************/
            //System.out.println("pointX1 ==  " + pointX1 + " pointY1 == " + pointY1 + " pointX2 == " + pointX2 + " pointY2 == " + pointY2);
            
            if(count > -1) {
                g.drawLine(pointX1, pointY1, pointX2, pointY2);
+               //System.out.println("Brotecs::LineChart->pointX1:"+pointX1+" pointY1:"+pointY1+" pointX2:"+pointX2+" pointY2:"+pointY2);
            }
            pointX1 = pointX2;
            pointY1 = pointY2;
            if(isMarginTwoTrue) {
-               g.setColor(0, 0, 0);
-               if((count + 1) % ticker == 0) {
-                   //g.drawLine(pointX2, this.height - fontSpaceHeight, pointX2, (this.height - fontSpaceHeight) + 2);
-               }
-               pointLabelWidth = font.stringWidth(b1.labelX);
-               if(isLabelXTrue && (count + 1) % (equalCoordTicker * ticker) == 0) {
-                   g.drawString(b1.labelX, pointX2 - pointLabelWidth / 2, (this.height - fontSpaceHeight) + 1, 20);
-  
-               }
+                   g.setColor(0, 0, 0);
+                   /************Brotecs*************/
+                   if(defaulttemplate){
+                           for(int i=1;i<5;i++){
+                           g.drawLine(marginOne+(templatemarginOne*i), this.height - fontSpaceHeight, marginOne+(templatemarginOne*i), (this.height - fontSpaceHeight) + 3);
+                           g.drawString(i+" Year", marginOne+(templatemarginOne*i), (this.height - fontSpaceHeight) + 4, 20);
+                           }
+                   }/********Brotecs**********/
+                   else{
+                       if((count + 1) % ticker == 0) {
+                           //g.drawLine(pointX2, this.height - fontSpaceHeight, pointX2, (this.height - fontSpaceHeight) + 4);
+                           
+                       }
+                       pointLabelWidth = font.stringWidth(b1.labelX);
+                       if(isLabelXTrue && (count + 1) % (equalCoordTicker * ticker) == 0) {
+                           //g.drawString(b1.labelX, pointX2 - pointLabelWidth / 2, (this.height - fontSpaceHeight) + 1, 20);
+          
+                       }
+                   }
            }
        } while(true);
@@ -461 +496 @@
     }
     
+    public void defaulttemplate(boolean defaulttemplate) {
+        this.defaulttemplate = defaulttemplate;
+    }
+    public boolean getdefaulttemplate()
+    {
+        return defaulttemplate;
+    }
 }

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

@@ -1 +1 @@
 package org.javarosa.formmanager.view.chatterbox.widget.chart;
-
+import java.util.Calendar;
+import java.util.Date;
 import java.util.Vector;
 
@@ -45 +46 @@
          * @see org.javarosa.formmanager.view.chatterbox.widget.chart.IGraphTemplate#getDataPoints()
          */
-        public Vector getLines(Vector data) {
+        public Vector getLines(Vector data,LineChart chart) {
                 //This function will give a number of days. We can use it to scale record dates 
-                //DateUtils.getApproxDaysDifference(earlierDate, laterDate)
+                //DateUtils.getApproxDaysDifference(earlierDate, laterDate);
                 
                 //TODO: Scale X axis from 0 to 5 years. Display the data from the website
                 Vector lines = new Vector();
-                Vector points1 = new Vector();
+                Vector points1 = new Vector();/*Brotecs*/
                 Vector points2 = new Vector();
                 Vector points3 = new Vector();
                 
-                lines.addElement(points1);
-                lines.addElement(points3);
+                lines.addElement(points1);/*Brotecs*/
+                lines.addElement(points3);/*Brotecs*/
                 lines.addElement(points2);
+                
+
         
-        int [] chartX1PointsArray = {12, 20, 30, 40, 50, 60, 70, 80, 90};
-        int [] chartY1PointsArray = {10, 10, 10, 10, 10, 10, 10, 10, 10};
+        Date birthdate=patient.getBirthDate();
+        
+        Date today=new Date();
+        Calendar calendar = Calendar.getInstance();
+                calendar.setTime(today);
+                int thisYear = calendar.get(Calendar.YEAR);
+                System.out.println("towhid::::WHOWeightTemplate:thisYear="+thisYear);
+                calendar.setTime(birthdate);
+                int birthYear = calendar.get(Calendar.YEAR);
+                System.out.println("towhid::::WHOWeightTemplate:birthYear="+birthYear);
                 
-                int [] chartX2PointsArray = {15, 20, 30, 35, 45, 55, 68, 79, 90};
-        int [] chartY2PointsArray = {2, 8, 16, 32, 48, 55, 64, 70, 80};
-        
-        int [] chartX3PointsArray = {10, 10, 10, 10, 10, 10, 10, 10, 10};
-        int [] chartY3PointsArray = {15, 20, 30, 40, 50, 60, 70, 80, 90};
-        
-        for(int i = 0; i < chartX2PointsArray.length; i++) {
-                points2.addElement(new LinePointsItem("", chartX2PointsArray[i], chartY2PointsArray[i], 0,  255,   255));
-        }
-
-        for(int i = 0; i < chartX1PointsArray.length; i++) {
-                points1.addElement(new LinePointsItem("", chartX1PointsArray[i], chartY1PointsArray[i], 255,  0,   255));
-        }
-
-        for(int i = 0; i < chartX3PointsArray.length; i++) {
-                points3.addElement(new LinePointsItem("", chartX3PointsArray[i], chartY3PointsArray[i], 0,  0,   0));
-        }
+                int diff_year = thisYear-birthYear;
+                System.out.println("towhid::::WHOWeightTemplate:diff_year="+diff_year);
+                if(diff_year<5){
+                        if(patient.getGender()==patient.SEX_MALE){
+                                
+                                int [] chartY1PointsArray = {5, 6, 8, 12, 13, 15, 17, 19, 23};
+                        int [] chartX1PointsArray = {0, 1, 2, 12, 16, 23, 31, 39, 60};
+                                
+                                int [] chartX2PointsArray = {3, 5, 9, 10, 11, 13, 15, 17, 18};
+                        int [] chartY2PointsArray = {0, 2, 10, 14, 18, 28, 40, 52, 56};
+                        
+                        int [] chartX3PointsArray = {2, 4, 5, 8, 9, 10, 11, 12, 14};
+                        int [] chartY3PointsArray = {0, 2, 4, 11, 20, 26, 34, 42, 58};
+                        
+                                System.out.println("towhid::::WHOWeightTemplate:Gender=MALE");       
+                        for(int i = 0; i < chartX2PointsArray.length; i++) {
+                                points2.addElement(new LinePointsItem("", chartX2PointsArray[i], chartY2PointsArray[i], 0,  255, 255));
+                        }
+                
+                        for(int i = 0; i < chartX1PointsArray.length; i++) {
+                                points1.addElement(new LinePointsItem("", chartY1PointsArray[i], chartX1PointsArray[i], 255, 0 , 255));
+                        }
+                
+                        for(int i = 0; i < chartX3PointsArray.length; i++) {
+                                points3.addElement(new LinePointsItem("", chartX3PointsArray[i], chartY3PointsArray[i], 255, 0, 255));
+                        }
+                        //this.isUseTemplate=true;
+                        chart.defaulttemplate(true);
+                        chart.setMaxYScaleFactor(30);
+                        }
+                        else if(patient.getGender()==patient.SEX_FEMALE)
+                        {
+                                int [] chartY1PointsArray = {4, 6, 9, 12, 13, 14, 19, 22, 25};
+                        int [] chartX1PointsArray = {0, 1, 5, 14, 16, 19, 39, 50, 60};
+                                
+                                int [] chartY2PointsArray = {3, 5, 7,  9, 11, 13, 15, 17, 18};
+                        int [] chartX2PointsArray = {0, 2, 5, 12, 20, 31, 42, 55, 59};
+                        
+                        int [] chartY3PointsArray = {2, 4, 5, 7, 8, 9, 10, 13, 14};
+                        int [] chartX3PointsArray = {0, 2, 4, 12, 17, 24, 30, 53, 59};
+                        
+                                System.out.println("towhid::::WHOWeightTemplate:Gender=FEMALE");
+                                for(int i = 0; i < chartX3PointsArray.length; i++) {
+                                points3.addElement(new LinePointsItem("", chartY3PointsArray[i], chartX3PointsArray[i], 0,  255, 255));
+                        }
+                                for(int i = 0; i < chartX1PointsArray.length; i++) {
+                                points1.addElement(new LinePointsItem("", chartY1PointsArray[i], chartX1PointsArray[i], 255,  0, 255));
+                        }
+                                for(int i = 0; i < chartX2PointsArray.length; i++) {
+                                points2.addElement(new LinePointsItem("", chartY2PointsArray[i], chartX2PointsArray[i], 255,  0, 255));
+                            }
+                                //this.isUseTemplate=true;
+                        chart.defaulttemplate(true);
+                        chart.setMaxYScaleFactor(30);
+                        }/**************UNKNOWN*************
+                        else
+                        {
+                                int [] chartX1PointsArray = {5, 6, 8, 12, 13, 15, 17, 19, 23};
+                        int [] chartY1PointsArray = {0, 1, 2, 12, 16, 23, 31, 39, 60};
+                                
+                                int [] chartX2PointsArray = {3, 5, 9, 10, 11, 13, 15, 17, 18};
+                        int [] chartY2PointsArray = {0, 2, 10, 14, 18, 28, 40, 52, 56};
+                        
+                        int [] chartX3PointsArray = {2, 4, 5, 8, 9, 10, 11, 12, 14};
+                        int [] chartY3PointsArray = {0, 2, 4, 11, 20, 26, 34, 42, 58};
+                        
+                                System.out.println("towhid::::WHOWeightTemplate:Gender=UNKNOWN");
+                                for(int i = 0; i < chartX3PointsArray.length; i++) {
+                                points3.addElement(new LinePointsItem("", chartX3PointsArray[i], chartY3PointsArray[i], 255,  0,   255));
+                        }
+                                for(int i = 0; i < chartX1PointsArray.length; i++) {
+                                points1.addElement(new LinePointsItem("", chartX1PointsArray[i], chartY1PointsArray[i], 255,  0,   255));
+                        }
+                                for(int i = 0; i < chartX2PointsArray.length; i++) {
+                                points2.addElement(new LinePointsItem("", chartX2PointsArray[i], chartY2PointsArray[i], 255,  0,   255));
+                            }
+                        }/**************************/
+                        
+                }
+                else
+                {
+                        this.isUseTemplate=false;
+                        chart.defaulttemplate(false);
+                chart.setMaxYScaleFactor(100);
+                }
+                        
                 return lines;
         }
@@ -88 +168 @@
                 this.patient = patient;
         }
-        /*************Brotecs:add this**********************/
-        public void setIsUseTemplate(boolean isUseTemplate)
+        /*************Brotecs:add this**********************
+        public void setIsUseTemplate(boolean isUse)
         {
-                this.isUseTemplate=isUseTemplate;
+                isUseTemplate=isUse;
         }