Changeset 1501

Timestamp:

11/30/08 08:26:56 (5 weeks 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) (3 diffs)
• IGraphTemplate.java (modified) (2 diffs)
• LineChart.java (modified) (8 diffs)
• WHOWeightTemplate.java (modified) (6 diffs)

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

@@ -2 +2 @@
 
 import java.util.Vector;
+
+import org.javarosa.patient.model.Patient;
 
  /* 
@@ -12 +14 @@
         public static final String CURRENT_TEMPLATE_NAME = "CurrentGraph";
         public static boolean isUseTemplate=false; //brotecs:add this
-
+        private Patient patient;
         /*
          * (non-Javadoc)
@@ -58 +60 @@
                 return isUseTemplate;
         }
+        
+        public Patient getPatient() {
+                return this.patient;
+        }
 }

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

@@ -2 +2 @@
 
 import java.util.Vector;
+
+import org.javarosa.patient.model.Patient;
 
 public interface IGraphTemplate {
@@ -25 +27 @@
          */
         Vector getLines(Vector data,LineChart chart);
+        public Patient getPatient(); 
         //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

@@ -82 +82 @@
             templatemarginOne=36;//brotecs
             templatexScaleFactor=13;//brotecs
-           // System.out.println("Brotecs::LineChart->LineChart(String label, Style style)");
     }
     
@@ -160 +159 @@
             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));
             
         }
@@ -252 +249 @@
         int l = this.width - marginOne;
         int i1 = this.height - fontSpaceHeight;
-        //System.out.println("Brotecs::LineChart->this.width ==> " + this.width + " this.height == " + this.height + " l = " + l + " i1 == " + i1);
         g.setFont(font);
         g.setColor(255, 255, 255);
@@ -302 +298 @@
             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;
-                //System.out.println("Brotecs::LineChart->drawChart:"+point+"="+yScaleFactor+"*"+i+"/"+height);
                 pointLabelWidth = font.stringWidth(String.valueOf(point));
                 
@@ -325 +319 @@
    
    public void drawLine(Graphics g, Vector pointVector) {
-           //System.out.println("Brotecs::LineChart->drawLine:pointVector.size()="+pointVector.size());
        pointVector.size();
        int count = -1;
@@ -357 +350 @@
            int pointY2 = this.height - fontSpaceHeight - (height * b1.yCordPt) / (yScaleFactor);
            
-           //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);
+           if(defaulttemplate){            
+                   pointX2 = marginOne + (width * b1.xCordPt) / (templatexScaleFactor * 6);
            }
            else
@@ -369 +361 @@
            }
            
-          // 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);
-           
+           /************Brotecs*************/           
            if(count > -1) {
                g.drawLine(pointX1, pointY1, pointX2, pointY2);
-               //System.out.println("Brotecs::LineChart->pointX1:"+pointX1+" pointY1:"+pointY1+" pointX2:"+pointX2+" pointY2:"+pointY2);
            }
            pointX1 = pointX2;
@@ -390 +378 @@
                    else{
                        if((count + 1) % ticker == 0) {
-                           //g.drawLine(pointX2, this.height - fontSpaceHeight, pointX2, (this.height - fontSpaceHeight) + 4);
-                           
+                           //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);
-          
                        }
                    }

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

@@ -25 +25 @@
         public static boolean isUseTemplate=false; //brotecs:add this
         private Patient patient;
-
+        public int age; 
         /*
          * (non-Javadoc)
@@ -55 +55 @@
                 Vector points2 = new Vector();
                 Vector points3 = new Vector();
-                
                 lines.addElement(points1);/*Brotecs*/
                 lines.addElement(points3);/*Brotecs*/
                 lines.addElement(points2);
-                
-
-        
         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 diff_year = thisYear-birthYear;
-                System.out.println("towhid::::WHOWeightTemplate:diff_year="+diff_year);
-                if(diff_year<5){
+                age=diff_year;
+                if(diff_year<=5){
                         if(patient.getGender()==patient.SEX_MALE){
                                 
@@ -87 +79 @@
                         int [] chartY3PointsArray = {0, 2, 4, 11, 20, 26, 34, 42, 58};
                         
-                                System.out.println("towhid::::WHOWeightTemplate:Gender=MALE");       
+                                //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));
@@ -107 +99 @@
                                 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");
+                                //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));
@@ -132 +121 @@
                                 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};
@@ -168 +155 @@
                 this.patient = patient;
         }
+        public Patient getPatient() {
+                return this.patient;
+        }
+
         /*************Brotecs:add this**********************
         public void setIsUseTemplate(boolean isUse)