Merge branch 'retry' of github.com:camillol/cs424p3 into retry

camillol · Oct 25, 2011 · 81747fd · 81747fd
2 parents 4a742b5 + fb0708b
commit 81747fd
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/cs424p3.pde b/cs424p3.pde
@@ -146,6 +146,7 @@ void mouseClicked()
   println(tmpByType);
 
   if (btwTime != settingsView.timeCheckbox.value || btwMonths != settingsView.monthCheckbox.value || !byType.equals(tmpByType)){
+    println("Entro mouseClicked");
       btwTime = settingsView.timeCheckbox.value;
       btwMonths = settingsView.monthCheckbox.value;
       byType = tmpByType;
@@ -159,21 +160,23 @@ void mouseClicked()
 
 void mouseReleased(){
   if (isDragging){
-    if (yearMin != yearLabelsToPrint[settingsView.yearSlider.minIndex()] || yearMax != yearLabelsToPrint[settingsView.yearSlider.maxIndex()]){
+    if (!yearMin.equals(yearLabelsToPrint[settingsView.yearSlider.minIndex()]) || !yearMax.equals(yearLabelsToPrint[settingsView.yearSlider.maxIndex()])){
+      println("Entro byYear");
       yearMin =  yearLabelsToPrint[settingsView.yearSlider.minIndex()] ;
       yearMax = yearLabelsToPrint[settingsView.yearSlider.maxIndex()];
       reloadCitySightingCounts();
       mapv.rebuildOverlay();
       detailsAnimator.target(height);
     }
-    else if (monthMin != monthLabels[settingsView.monthSlider.minIndex()] || monthMax != monthLabels[settingsView.monthSlider.maxIndex()]){
+    else if (!monthMin.equals(monthLabels[settingsView.monthSlider.minIndex()]) || !monthMax.equals(monthLabels[settingsView.monthSlider.maxIndex()])){
+      println("Entro byMonth");
       monthMin =  monthLabels[settingsView.monthSlider.minIndex()];
       monthMax = monthLabels[settingsView.monthSlider.maxIndex()];
       reloadCitySightingCounts();
       mapv.rebuildOverlay();
       detailsAnimator.target(height);
     }
-    else  if (timeMin != timeLabels[settingsView.timeSlider.minIndex()]+":00" || timeMax != timeLabels[settingsView.timeSlider.maxIndex()]+":00"){
+    else  if (!timeMin.equals(timeLabels[settingsView.timeSlider.minIndex()]+":00") || !timeMax.equals(timeLabels[settingsView.timeSlider.maxIndex()]+":00")){
       timeMin =  timeLabels[settingsView.timeSlider.minIndex()]+":00"; 
       timeMax = timeLabels[settingsView.timeSlider.maxIndex()]+":00";
       reloadCitySightingCounts();