voxcity 0.3.23__py3-none-any.whl → 0.3.25__py3-none-any.whl

voxcity/utils/visualization.py

@@ -923,9 +923,14 @@ def visualize_point_grid_on_basemap(point_gdf, value_name='value', **kwargs):
     plt.tight_layout()
     plt.show()
 
-def create_multi_view_scene(meshes, output_directory="output"):
+def create_multi_view_scene(meshes, output_directory="output", projection_type="perspective", distance_factor=1.0):
     """
     Create multiple views of the scene from different angles.
+    
+    Args:
+        meshes: Dictionary of meshes to visualize
+        output_directory: Directory to save output images
+        projection_type: Either "perspective" or "orthographic" (default: "perspective")
     """
     # Compute overall bounding box across all meshes
     vertices_list = [mesh.vertices for mesh in meshes.values()]
@@ -939,8 +944,11 @@ def create_multi_view_scene(meshes, output_directory="output"):
     center = (bbox[1] + bbox[0]) / 2
     diagonal = np.linalg.norm(bbox[1] - bbox[0])
 
-    # Use the diagonal to set the camera distance
-    distance = diagonal * 2
+    # Adjust distance based on projection type
+    if projection_type.lower() == "orthographic":
+        distance = diagonal * 5  # Increase distance for orthographic to capture full scene
+    else:
+        distance = diagonal * 1.8 * distance_factor  # Original distance for perspective
 
     # Define the isometric viewing angles
     iso_angles = {
@@ -972,6 +980,15 @@ def create_multi_view_scene(meshes, output_directory="output"):
     for view_name, camera_pos in camera_positions.items():
         # Create new plotter for each view
         plotter = pv.Plotter(notebook=True, off_screen=True)
+        
+        # Set the projection type
+        if projection_type.lower() == "orthographic":
+            plotter.enable_parallel_projection()
+            # Set parallel scale to ensure the whole scene is visible
+            plotter.camera.parallel_scale = diagonal * 0.4 * distance_factor  # Adjust this factor as needed
+
+        elif projection_type.lower() != "perspective":
+            print(f"Warning: Unknown projection_type '{projection_type}'. Using perspective projection.")
 
         # Add each mesh to the scene
         for class_id, mesh in meshes.items():
@@ -1038,6 +1055,8 @@ def visualize_voxcity_multi_view(voxel_array, meshsize, **kwargs):
     cmap_name = kwargs.get("colormap", "viridis")
     vmin = kwargs.get("vmin", np.nanmin(sim_grid))
     vmax = kwargs.get("vmax", np.nanmax(sim_grid))
+    projection_type = kwargs.get("projection_type", "perspective")
+    distance_factor = kwargs.get("distance_factor", 1.0)
 
     # Create meshes
     print("Creating voxel meshes...")
@@ -1078,7 +1097,115 @@ def visualize_voxcity_multi_view(voxel_array, meshsize, **kwargs):
     print("Creating multiple views...")        
     # Create output directory if it doesn't exist
     os.makedirs(output_directory, exist_ok=True)
-    image_files = create_multi_view_scene(meshes, output_directory=output_directory)
+    image_files = create_multi_view_scene(meshes, output_directory=output_directory, projection_type=projection_type, distance_factor=distance_factor)
+
+    # Display each view separately
+    for view_name, img_file in image_files:
+        plt.figure(figsize=(12, 8))
+        img = plt.imread(img_file)
+        plt.imshow(img)
+        plt.title(view_name.replace('_', ' ').title(), pad=20)
+        plt.axis('off')
+        plt.show()
+        plt.close()
+
+def visualize_voxcity_multi_view_with_multiple_sim_grids(voxel_array, meshsize, sim_configs, **kwargs):
+    """
+    Create multiple views of the voxel city data with multiple simulation grids.
+    
+    Args:
+        voxel_array: 3D numpy array containing voxel data
+        meshsize: Size of each voxel/cell
+        sim_configs: List of dictionaries, each containing configuration for a simulation grid:
+            {
+                'sim_grid': 2D numpy array of simulation values,
+                'z_offset': height offset in meters (default: 1.5),
+                'cmap_name': colormap name (default: 'viridis'),
+                'vmin': minimum value for colormap (optional),
+                'vmax': maximum value for colormap (optional),
+                'label': label for the colorbar (optional)
+            }
+        **kwargs: Additional arguments including:
+            - vox_dict: Dictionary mapping voxel values to colors
+            - output_directory: Directory to save output images
+            - output_file_name: Base filename for exports
+            - dem_grid: DEM grid for height information
+            - projection_type: 'perspective' or 'orthographic'
+            - distance_factor: Factor to adjust camera distance
+    """
+    os.system('Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &')
+    os.environ['DISPLAY'] = ':99'
+
+    # Configure PyVista settings
+    pv.set_plot_theme('document')
+    pv.global_theme.background = 'white'
+    pv.global_theme.window_size = [1024, 768]
+    pv.global_theme.jupyter_backend = 'static'
+
+    # Parse general kwargs
+    vox_dict = kwargs.get("vox_dict", get_default_voxel_color_map())
+    output_directory = kwargs.get("output_directory", 'output')
+    base_filename = kwargs.get("output_file_name", None)
+    dem_grid_ori = kwargs.get("dem_grid", None)
+    projection_type = kwargs.get("projection_type", "perspective")
+    distance_factor = kwargs.get("distance_factor", 1.0)
+
+    if dem_grid_ori is not None:
+        dem_grid = dem_grid_ori - np.min(dem_grid_ori)
+    
+    # Create meshes
+    print("Creating voxel meshes...")
+    meshes = create_city_meshes(voxel_array, vox_dict, meshsize=meshsize)
+
+    # Process each simulation grid
+    for i, config in enumerate(sim_configs):
+        sim_grid = config['sim_grid']
+        if sim_grid is None or dem_grid is None:
+            continue
+
+        z_offset = config.get('z_offset', 1.5)
+        cmap_name = config.get('cmap_name', 'viridis')
+        vmin = config.get('vmin', np.nanmin(sim_grid))
+        vmax = config.get('vmax', np.nanmax(sim_grid))
+        label = config.get('label', f'Simulation {i+1}')
+
+        print(f"Creating sim_grid surface mesh for {label}...")
+        sim_mesh = create_sim_surface_mesh(
+            sim_grid, dem_grid,
+            meshsize=meshsize,
+            z_offset=z_offset,
+            cmap_name=cmap_name,
+            vmin=vmin,
+            vmax=vmax
+        )
+        
+        if sim_mesh is not None:
+            meshes[f"sim_surface_{i}"] = sim_mesh
+            
+            # Create colorbar for this simulation
+            norm = mcolors.Normalize(vmin=vmin, vmax=vmax)
+            scalar_map = cm.ScalarMappable(norm=norm, cmap=cmap_name)
+            
+            fig, ax = plt.subplots(figsize=(6, 1))
+            plt.colorbar(scalar_map, cax=ax, orientation='horizontal', label=label)
+            plt.tight_layout()
+            plt.show()
+
+    # Export if filename provided
+    if base_filename is not None:
+        print(f"Exporting files to '{base_filename}.*' ...")
+        os.makedirs(output_directory, exist_ok=True)
+        export_meshes(meshes, output_directory, base_filename)
+
+    # Create and save multiple views
+    print("Creating multiple views...")        
+    os.makedirs(output_directory, exist_ok=True)
+    image_files = create_multi_view_scene(
+        meshes, 
+        output_directory=output_directory,
+        projection_type=projection_type,
+        distance_factor=distance_factor
+    )
 
     # Display each view separately
     for view_name, img_file in image_files:
@@ -1090,6 +1217,8 @@ def visualize_voxcity_multi_view(voxel_array, meshsize, **kwargs):
         plt.show()
         plt.close()
 
+    return meshes
+
 # def create_interactive_scene(meshes):
 #     scene = trimesh.Scene()
 #     scene.ambient_light = np.array([0.1, 0.1, 0.1, 1.0])

{voxcity-0.3.23.dist-info → voxcity-0.3.25.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: voxcity
-Version: 0.3.23
+Version: 0.3.25
 Summary: voxcity is an easy and one-stop tool to output 3d city models for microclimate simulation by integrating multiple geospatial open-data
 Author-email: Kunihiko Fujiwara <kunihiko@nus.edu.sg>
 Maintainer-email: Kunihiko Fujiwara <kunihiko@nus.edu.sg>

{voxcity-0.3.23.dist-info → voxcity-0.3.25.dist-info}/RECORD

@@ -27,11 +27,11 @@ voxcity/simulator/view.py,sha256=zNbfTLQ2Jo0V5-rFA3-xamRjOuw3H3MBrLKpQp8x3hY,367
 voxcity/utils/__init_.py,sha256=nLYrj2huBbDBNMqfchCwexGP8Tlt9O_XluVDG7MoFkw,98
 voxcity/utils/lc.py,sha256=RwPd-VY3POV3gTrBhM7TubgGb9MCd3nVah_G8iUEF7k,11562
 voxcity/utils/material.py,sha256=Vt3IID5Ft54HNJcEC4zi31BCPqi_687X3CSp7rXaRVY,5907
-voxcity/utils/visualization.py,sha256=0igc1s9cu0K8RF5SVmd1THDXBvXH0sZ-ohlEtMIvAsY,48682
+voxcity/utils/visualization.py,sha256=ufS6aMIaDUmFNTiqQS5If7SgHxMm6unKIIOkFdnSkOQ,54253
 voxcity/utils/weather.py,sha256=P6s1y_EstBL1OGP_MR_6u3vr-t6Uawg8uDckJnoI7FI,21482
-voxcity-0.3.23.dist-info/AUTHORS.rst,sha256=m82vkI5QokEGdcHof2OxK39lf81w1P58kG9ZNNAKS9U,175
-voxcity-0.3.23.dist-info/LICENSE,sha256=-hGliOFiwUrUSoZiB5WF90xXGqinKyqiDI2t6hrnam8,1087
-voxcity-0.3.23.dist-info/METADATA,sha256=3d-aX-RUTzV_M3d78PDxTVG3HwIdbc_Af4bEa4ZMxZE,25186
-voxcity-0.3.23.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-voxcity-0.3.23.dist-info/top_level.txt,sha256=00b2U-LKfDllt6RL1R33MXie5MvxzUFye0NGD96t_8I,8
-voxcity-0.3.23.dist-info/RECORD,,
+voxcity-0.3.25.dist-info/AUTHORS.rst,sha256=m82vkI5QokEGdcHof2OxK39lf81w1P58kG9ZNNAKS9U,175
+voxcity-0.3.25.dist-info/LICENSE,sha256=-hGliOFiwUrUSoZiB5WF90xXGqinKyqiDI2t6hrnam8,1087
+voxcity-0.3.25.dist-info/METADATA,sha256=-ACnXtIlIX4rZdBuReFW4yBujdzDcSrmTtyTEs1HdO0,25186
+voxcity-0.3.25.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+voxcity-0.3.25.dist-info/top_level.txt,sha256=00b2U-LKfDllt6RL1R33MXie5MvxzUFye0NGD96t_8I,8
+voxcity-0.3.25.dist-info/RECORD,,