From 03be617460d6537b24d072e5beb3ab004b3865ae Mon Sep 17 00:00:00 2001
From: Manuel Rego Casasnovas <mrego@igalia.com>
Date: Mon, 15 Mar 2010 08:26:26 +0100
Subject: [PATCH]  ItEr50S04ValidacionEProbasFuncionaisItEr49S04: [Bug #385]
 Fixing bug using zoom level from planner for charts.

---
 .../web/planner/company/CompanyPlanningModel.java             | 4 ++--
 .../navalplanner/web/planner/order/OrderPlanningModel.java    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java
index f650e8ecf..88f88b170 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java
@@ -252,10 +252,10 @@ public abstract class CompanyPlanningModel implements ICompanyPlanningModel {
                 chartEarnedValueTimeplot, earnedValueChartFiller);
 
         setupChart(chartLoadTimeplot, new CompanyLoadChartFiller(), planner
-                .getTimeTracker(), defaultZoomLevel);
+                .getTimeTracker(), planner.getZoomLevel());
         Chart earnedValueChart = setupChart(chartEarnedValueTimeplot,
                 earnedValueChartFiller, planner.getTimeTracker(),
-                defaultZoomLevel);
+                planner.getZoomLevel());
         setEventListenerConfigurationCheckboxes(earnedValueChart);
     }
 
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java
index a273aba42..a7a973b5c 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java
@@ -315,13 +315,13 @@ public abstract class OrderPlanningModel implements IOrderPlanningModel {
         Chart loadChart = setupChart(orderReloaded,
                 new OrderLoadChartFiller(orderReloaded), chartLoadTimeplot,
                 planner.getTimeTracker(),
-                defaultZoomLevel);
+                planner.getZoomLevel());
         refillLoadChartWhenNeeded(configuration, planner, saveCommand,
                 loadChart);
         Chart earnedValueChart = setupChart(orderReloaded,
                 earnedValueChartFiller,
                 chartEarnedValueTimeplot, planner
-                        .getTimeTracker(), defaultZoomLevel);
+                        .getTimeTracker(), planner.getZoomLevel());
         refillLoadChartWhenNeeded(configuration, planner, saveCommand,
                 earnedValueChart);
         setEventListenerConfigurationCheckboxes(earnedValueChart);