SHOW:
|
|
- or go back to the newest paste.
| 1 | Index: ExportSurface.cs | |
| 2 | =================================================================== | |
| 3 | --- ExportSurface.cs (revision 6363) | |
| 4 | +++ ExportSurface.cs (working copy) | |
| 5 | - | @@ -24,12 +24,11 @@ |
| 5 | + | @@ -24,7 +24,7 @@ |
| 6 | ||
| 7 | public override bool RunImp(Task task, AppEnv appEnv, bool withChildren) | |
| 8 | {
| |
| 9 | - string tempDir = appEnv.TempDir + @"export-surface\"; | |
| 10 | - | - string cutinDir = tempDir + @"rrr_and_airfields_cutin\"; |
| 10 | + | + string tempDir = appEnv.SurfaceTempDir; |
| 11 | - | - string filterByPropertiesDir = tempDir + @"filter-by-properties-luas\"; |
| 11 | + | string cutinDir = tempDir + @"rrr_and_airfields_cutin\"; |
| 12 | - | - string airfieldSurfaceDir = tempDir + @"airfield-surface\"; |
| 12 | + | string filterByPropertiesDir = tempDir + @"filter-by-properties-luas\"; |
| 13 | - | - string airfieldSuperficialDir = tempDir + @"airfield-superficial\"; |
| 13 | + | string airfieldSurfaceDir = tempDir + @"airfield-surface\"; |
| 14 | - | - string tempSurfaceDir = tempDir + @"airfield-temp\"; |
| 14 | + | @@ -152,7 +152,7 @@ |
| 15 | - | + string cutinDir = appEnv.SurfaceTempDir + @"rrr_and_airfields_cutin\"; |
| 15 | + | |
| 16 | - | + string filterByPropertiesDir = appEnv.SurfaceTempDir + @"filter-by-properties-luas\"; |
| 16 | + | |
| 17 | - | + string airfieldSurfaceDir = appEnv.SurfaceTempDir + @"airfield-surface\"; |
| 17 | + | |
| 18 | - | + string airfieldSuperficialDir = appEnv.SurfaceTempDir + @"airfield-superficial\"; |
| 18 | + | |
| 19 | - | + string tempSurfaceDir = appEnv.SurfaceTempDir + @"airfield-temp\"; |
| 19 | + | + tempDir = appEnv.SurfaceTempDir; |
| 20 | System.IO.Directory.CreateDirectory(tempDir); | |
| 21 | - | string terrainCfg = appEnv.vars["TERRAIN_CONFIG"].StringValue; |
| 21 | + | Tools.Path.CleanupDir(tempDir); |
| 22 | - | string rrrOutput = appEnv.vars["RRR_OUTPUT"].StringValue; |
| 22 | + | |
| 23 | - | @@ -39,8 +38,8 @@ |
| 23 | + | @@ -252,7 +252,7 @@ |
| 24 | } | |
| 25 | - | task.AddVariables(SettingsPanel.vars); |
| 25 | + | |
| 26 | // build-surface-by-vector-data-5 | |
| 27 | - | - System.IO.Directory.CreateDirectory(tempDir); |
| 27 | + | |
| 28 | - | - Tools.Path.CleanupDir(tempDir); |
| 28 | + | |
| 29 | - | + System.IO.Directory.CreateDirectory(appEnv.SurfaceTempDir); |
| 29 | + | |
| 30 | - | + Tools.Path.CleanupDir(appEnv.SurfaceTempDir); |
| 30 | + | |
| 31 | - | System.IO.Directory.CreateDirectory(cutinDir); |
| 31 | + | |
| 32 | - | System.IO.Directory.CreateDirectory(filterByPropertiesDir); |
| 32 | + | @@ -562,7 +562,7 @@ |
| 33 | - | System.IO.Directory.CreateDirectory(airfieldSurfaceDir); |
| 33 | + | |
| 34 | - | @@ -48,10 +47,10 @@ |
| 34 | + | |
| 35 | ||
| 36 | - | if (appEnv.terrainConfig.Lsa5) |
| 36 | + | |
| 37 | + var surfaceL0filename = appEnv.SurfaceL0Output; | |
| 38 | - | - tempDir = appEnv.TempDir + @"export-lsa5\"; |
| 38 | + | var mergedL0filename = tempDir + "mergedL0.ofsh"; |
| 39 | - | + string Lsa5TempDir = appEnv.TempDir + @"export-lsa5\"; |
| 39 | + | var finalL0filename = tempDir + "finalL0.ofsh"; |
| 40 | var cutL0filename = tempDir + "cutL0.ofsh"; |
