Fix issue #615

gephi · May 20, 2012 · d8c7ae5 · d8c7ae5
1 parent 00d4318
commit d8c7ae5
Showing 1 changed file with 10 additions and 9 deletions.
diff --git a/TimelineAPI/src/org/gephi/timeline/TimelineControllerImpl.java b/TimelineAPI/src/org/gephi/timeline/TimelineControllerImpl.java
@@ -55,20 +55,15 @@ Development and Distribution License("CDDL") (collectively, the
 import org.gephi.data.attributes.type.Interval;
 import org.gephi.data.attributes.type.TimeInterval;
 import org.gephi.dynamic.api.DynamicController;
-import org.gephi.dynamic.api.DynamicModel;
 import org.gephi.dynamic.api.DynamicModelEvent;
 import org.gephi.dynamic.api.DynamicModelListener;
 import org.gephi.graph.api.Graph;
 import org.gephi.graph.api.GraphController;
 import org.gephi.project.api.ProjectController;
 import org.gephi.project.api.Workspace;
 import org.gephi.project.api.WorkspaceListener;
-import org.gephi.timeline.api.TimelineChart;
-import org.gephi.timeline.api.TimelineController;
-import org.gephi.timeline.api.TimelineModel;
 import org.gephi.timeline.api.TimelineModel.PlayMode;
-import org.gephi.timeline.api.TimelineModelEvent;
-import org.gephi.timeline.api.TimelineModelListener;
+import org.gephi.timeline.api.*;
 import org.openide.util.Lookup;
 import org.openide.util.lookup.ServiceProvider;
 
@@ -178,7 +173,7 @@ private boolean setMinMax(double min, double max) {
         if (model != null) {
             if (min > max) {
                 throw new IllegalArgumentException("min should be less than max");
-            } else if(min == max) {
+            } else if (min == max) {
                 //Avoid setting values at this point
                 return false;
             }
@@ -310,13 +305,19 @@ public void run() {
                                 Number[] xs = new Number[intervals.size() * 2];
                                 Number[] ys = new Number[intervals.size() * 2];
                                 int i = 0;
-                                for (Interval interval : intervals) {
+                                Interval interval;
+                                for (int j = 0; j < intervals.size(); j++) {
+                                    interval = intervals.get(j);
                                     Number x = (Double) interval.getLow();
                                     Number y = (Number) interval.getValue();
                                     xs[i] = x;
                                     ys[i] = y;
                                     i++;
-                                    xs[i] = (Double) interval.getHigh();
+                                    if (j != intervals.size() - 1 && intervals.get(j + 1).getLow() < interval.getHigh()) {
+                                        xs[i] = (Double) intervals.get(j + 1).getLow();
+                                    } else {
+                                        xs[i] = (Double) interval.getHigh();
+                                    }
                                     ys[i] = y;
                                     i++;
                                 }