Finally figured out the issue with the setting the date choosers correctly

This commit is contained in:
Kelly Kelly 2019-03-26 14:09:01 -04:00
parent defbbad58b
commit b1ef186ab5
2 changed files with 8 additions and 4 deletions

View File

@ -22,8 +22,10 @@ import com.google.common.collect.ImmutableSet;
import com.google.common.eventbus.Subscribe;
import java.awt.event.ItemListener;
import java.beans.PropertyChangeListener;
import java.time.Instant;
import java.time.LocalDate;
import java.time.ZoneId;
import java.time.ZonedDateTime;
import java.util.Collection;
import java.util.EnumSet;
import java.util.HashMap;
@ -301,14 +303,15 @@ final public class FiltersPanel extends JPanel {
* @param dateFilter
*/
private void setDateRangeFilter(DateRangeFilter dateFilter) {
ZonedDateTime zoneDate = ZonedDateTime.ofInstant(Instant.ofEpochSecond(dateFilter.getStartDate()), Utils.getUserPreferredZoneId());
startDatePicker.setEnabled(dateFilter.isStartDateEnabled());
startCheckBox.setEnabled(dateFilter.isStartDateEnabled());
startDatePicker.setDate(LocalDate.ofEpochDay(dateFilter.getStartDate()));
startDatePicker.setDate(zoneDate.toLocalDate());
zoneDate = ZonedDateTime.ofInstant(Instant.ofEpochSecond(dateFilter.getEndDate()), Utils.getUserPreferredZoneId());
endDatePicker.setEnabled(dateFilter.isEndDateEnabled());
endCheckBox.setEnabled(dateFilter.isEndDateEnabled());
endDatePicker.setDate(LocalDate.ofEpochDay(dateFilter.getEndDate()));
endDatePicker.setDate(zoneDate.toLocalDate());
}
/**
@ -631,7 +634,6 @@ final public class FiltersPanel extends JPanel {
private DateRangeFilter getDateRangeFilter() {
ZoneId zone = Utils.getUserPreferredZoneId();
long value = startDatePicker.getDate().atStartOfDay(zone).toEpochSecond();
return new DateRangeFilter(startDatePicker.isEnabled(),
startDatePicker.getDate().atStartOfDay(zone).toEpochSecond(),
endDatePicker.isEnabled(),

View File

@ -1148,6 +1148,8 @@ final public class VisualizationPanel extends JPanel implements Lookup.Provider
} else if (event.getPreciseWheelRotation() > 0) {
graphComponent.zoomOut();
}
CVTEvents.getCVTEventBus().post(new CVTEvents.ZoomEvent(graph.getView().getScale()));
}
/**