Merge pull request #183 from NREL/SAM_1616

Fix wxDVDMapPlot dithering issue for sub-hourly timesteps

Author: brtietz

src/dview/dvdmapctrl.cpp

@@ -100,8 +100,9 @@ class wxDVDMapPlot : public wxPLPlottable {
 
         dc.Pen(*wxWHITE, 0, wxPLOutputDevice::NONE);
         dc.Brush(*wxRED, wxPLOutputDevice::HATCH);
+        dc.Brush(m_colourMap->ColourForValue(m_data->At(0).y));
         dc.Rect(pos.x, pos.y, size.x + 1, size.y + 1);
-
+        
         wxRealPoint wmin = map.GetWorldMinimum();
         wxRealPoint wmax = map.GetWorldMaximum();
         double xlen = wmax.x - wmin.x;
@@ -125,24 +126,22 @@ class wxDVDMapPlot : public wxPLPlottable {
             int worldXDay = int(m_data->At(i).x) / 24; //x-res does not change with higher res data.
 
             double worldY = fmod(m_data->At(i).x, 24.0);
-            worldY -= fmod(worldY,
-                           m_data->GetTimeStep()); // This makes sure the entire plot doesn't shift up for something like 1/2 hour data.
+            worldY -= fmod(worldY, m_data->GetTimeStep()); // This makes sure the entire plot doesn't shift up for something like 1/2 hour data.
             if (worldY < wmin.y)
                 continue;
             if (worldY >= wmax.y)
                 continue;
             worldY -= wmin.y;
 
             double x = pos.x + (worldXDay - wmin.x / 24) * dRectWidth;
-            double y = pos.y + size.y - dRectHeight * (worldY / m_data->GetTimeStep() +
-                                                       1); //+1 is because we have top corner, not bottom.
+            double y = pos.y + size.y - dRectHeight * (worldY / m_data->GetTimeStep() + 1); //+1 is because we have top corner, not bottom.
 
             dc.Brush(m_colourMap->ColourForValue(m_data->At(i).y));
 
             // increase rect dimensions by about 0.5 point to
             // make sure they render overlapped without white space
             // showing in between
-            dc.Rect(x, y, ceil(dRectWidth + 0.5), ceil(dRectHeight + 0.5)); //+1s cover empty spaces between rects.
+            dc.Rect(x, y, ceil(dRectWidth + 1.0 / m_data->GetTimeStep()), ceil(dRectHeight + 1.0 / m_data->GetTimeStep())); // +- 1/timesteps to cover empty spaces between rects.
         }
     }