Added new scatter plot

tests/draw_test.py

@@ -2,7 +2,7 @@
 import os
 from worldengine.draw import _biome_colors, Image, draw_simple_elevation, elevation_color, \
     draw_elevation, draw_riversmap, draw_grayscale_heightmap, draw_ocean, draw_precipitation, \
-    draw_world, draw_temperature_levels, draw_biome
+    draw_world, draw_temperature_levels, draw_biome, draw_scatter_plot
 from worldengine.biome import Biome
 from worldengine.world import World
 
@@ -162,5 +162,10 @@ def test_draw_biome(self):
         draw_biome(w, target)
         self._assert_img_equal("biome_28070", target)
 
+    def test_draw_scatter_plot(self):
+        w = World.open_protobuf("%s/seed_28070.world" % self.tests_data_dir)
+        target = PixelCollector(16, 16)
+        draw_scatter_plot(w, 16, target)
+
 if __name__ == '__main__':
     unittest.main()

worldengine/cli/main.py

@@ -8,7 +8,7 @@
 from worldengine.common import array_to_matrix, set_verbose, print_verbose
 from worldengine.draw import draw_ancientmap_on_file, draw_biome_on_file, draw_ocean_on_file, \
     draw_precipitation_on_file, draw_grayscale_heightmap_on_file, draw_simple_elevation_on_file, \
-    draw_temperature_levels_on_file, draw_riversmap_on_file
+    draw_temperature_levels_on_file, draw_riversmap_on_file, draw_scatter_plot_on_file
 from worldengine.plates import world_gen, generate_plates_simulation
 from worldengine.imex import export
 from worldengine.step import Step
@@ -78,6 +78,10 @@ def generate_rivers_map(world, filename):
     draw_riversmap_on_file(world, filename)
     print("+ rivers map generated in '%s'" % filename)
 
+def draw_scatter_plot(world, filename):
+    draw_scatter_plot_on_file(world, filename)
+    print("+ scatter plot generated in '%s'" % filename)
+
 
 def generate_plates(seed, world_name, output_dir, width, height,
                     num_plates=10):
@@ -302,6 +306,8 @@ def main():
     g_generate.add_argument('--not-fade-borders', dest='fade_borders', action="store_false",
                                help="Not fade borders",
                                default=True)
+    g_generate.add_argument('--scatter', dest='scatter_plot',
+                            action="store_true", help="generate scatter plot")
 
     # -----------------------------------------------------
     g_ancient_map = parser.add_argument_group(
@@ -417,6 +423,9 @@ def main():
     if args.rivers_map and not generation_operation:
         usage(error="Rivers map can be produced only during world generation")
 
+    if args.scatter_plot and not generation_operation:
+        usage(error="Scatter plot can be produced only during world generation")
+
     print('Worldengine - a world generator (v. %s)' % VERSION)
     print('-----------------------')
     print(' operation         : %s generation' % operation)
@@ -431,6 +440,7 @@ def main():
         print(' step                 : %s' % step.name)
         print(' greyscale heightmap  : %s' % args.grayscale_heightmap)
         print(' rivers map           : %s' % args.rivers_map)
+        print(' scatter plot         : %s' % args.scatter_plot)
         print(' fade borders         : %s' % args.fade_borders)
     if operation == 'ancient_map':
         print(' resize factor          : %i' % args.resize_factor)
@@ -458,6 +468,9 @@ def main():
         if args.rivers_map:
             generate_rivers_map(world,
             '%s/%s_rivers.png' % (args.output_dir, world_name))
+        if args.scatter_plot:
+            draw_scatter_plot(world,
+            '%s/%s_scatter.png' % (args.output_dir, world_name))    
 
     elif operation == 'plates':
         print('')  # empty line

worldengine/draw.py

@@ -406,6 +406,83 @@ def draw_biome(world, target):
             v = biome[y, x]
             target.set_pixel(x, y, _biome_colors[v])
 
+def draw_scatter_plot(world, size, target):
+    """ This function can be used on a generic canvas (either an image to save
+        on disk or a canvas part of a GUI)
+    """
+    min_humidity = None
+    max_humidity = None
+    min_temperature = None
+    max_temperature = None
+    for y in range(world.height):
+        for x in range(world.width):
+            if world.is_land((x, y)):
+                t = world.temperature_at((x, y))
+                p = world.humidity['data'][y, x]
+                if min_temperature is None or t < min_temperature:
+                    min_temperature = t
+                if max_temperature is None or t > max_temperature:
+                    max_temperature = t
+                if min_humidity is None or p < min_humidity:
+                    min_humidity = p
+                if max_humidity is None or p > max_humidity:
+                    max_humidity = p
+
+    temperature_delta = max_temperature - min_temperature
+    humidity_delta = max_humidity - min_humidity
+
+    for y in range(0, size):
+        for x in range(0, size):
+            target.set_pixel(x, y, (255, 255, 255, 255))
+    for t in range(0, 6):
+        v = (size - 1) * ((world.temperature['thresholds'][t][1] - min_temperature) / temperature_delta)
+        for y in range(0, size):
+            target.set_pixel(int(v), y, (0, 0, 0, 255))
+    ranges = ['87', '75', '62', '50', '37', '25', '12']
+    for p in ranges:
+        h = (size - 1) * ((world.humidity['quantiles'][p] - min_humidity) / humidity_delta)
+        for x in range(0, size):
+            target.set_pixel(x, int(h), (0, 0, 0, 255))
+
+    for y in range(world.height):
+        for x in range(world.width):
+            if world.is_land((x, y)):
+                t = world.temperature_at((x, y))
+                p = world.humidity['data'][y, x]
+                if world.is_temperature_polar((x, y)):
+                    r = 0
+                elif world.is_temperature_alpine((x, y)):
+                    r = 42
+                elif world.is_temperature_boreal((x, y)):
+                    r = 85
+                elif world.is_temperature_cool((x, y)):
+                    r = 128
+                elif world.is_temperature_warm((x, y)):
+                    r = 170
+                elif world.is_temperature_subtropical((x, y)):
+                    r = 213
+                elif world.is_temperature_tropical((x, y)):
+                    r = 255
+                if world.is_humidity_superarid((x, y)):
+                    b = 32
+                elif world.is_humidity_perarid((x, y)):
+                    b = 64
+                elif world.is_humidity_arid((x, y)):
+                    b = 96
+                elif world.is_humidity_semiarid((x, y)):
+                    b = 128
+                elif world.is_humidity_subhumid((x, y)):
+                    b = 160
+                elif world.is_humidity_humid((x, y)):
+                    b = 192
+                elif world.is_humidity_perhumid((x, y)):
+                    b = 224
+                elif world.is_humidity_superhumid((x, y)):
+                    b = 255
+                nx = (size - 1) * ((t - min_temperature) / temperature_delta)
+                ny = (size - 1) * ((p - min_humidity) / humidity_delta)
+                target.set_pixel(int(nx), int(ny), (r, 128, b, 255))
+
 
 # -------------
 # Draw on files
@@ -477,3 +554,8 @@ def draw_ancientmap_on_file(world, filename, resize_factor=1,
                     draw_biome, draw_rivers, draw_mountains, draw_outer_land_border, 
                     verbose)
     img.complete()
+
+def draw_scatter_plot_on_file(world, filename):
+    img = ImagePixelSetter(512, 512, filename)
+    draw_scatter_plot(world, 512, img)
+    img.complete()

worldengine/generation.py

@@ -199,6 +199,7 @@ def generate_world(w, step):
     if not step.include_precipitations:
         return w
 
+    TemperatureSimulation().execute(w, seed)
     # Precipitation with thresholds
     PrecipitationSimulation().execute(w, seed)
 
@@ -212,7 +213,7 @@ def generate_world(w, step):
 
     # FIXME: create setters
     IrrigationSimulation().execute(w, seed)
-    TemperatureSimulation().execute(w, seed)
+
     HumiditySimulation().execute(w, seed)