Skip to content

Commit d495efa

Browse files
authored
Merge pull request mlavik1#47 from mlavik1/unity2018
manifest.json fix + DICOM fix
2 parents 2fe71a7 + 3731c42 commit d495efa

File tree

2 files changed

+6
-45
lines changed

2 files changed

+6
-45
lines changed

Assets/Scripts/Importing/DICOMImporter.cs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ private class DICOMSliceFile
3333
private IEnumerable<string> fileCandidates;
3434
private string datasetName;
3535

36+
private int iFallbackLoc = 0;
37+
3638
public DICOMImporter(IEnumerable<string> files, string name = "DICOM_Dataset")
3739
{
3840
this.fileCandidates = files;
@@ -162,8 +164,9 @@ private DICOMSliceFile ReadDICOMFile(string filePath)
162164
}
163165
else
164166
{
165-
Debug.LogError($"Missing location/position tag in file: {filePath}.\n The file will not be imported");
166-
return null;
167+
Debug.LogError($"Missing location/position tag in file: {filePath}.\n The file will not be imported correctly.");
168+
// Fallback: use counter as location
169+
slice.location = (float)iFallbackLoc++;
167170
}
168171

169172
// Read intercept

Packages/manifest.json

Lines changed: 1 addition & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,7 @@
11
{
22
"dependencies": {
3-
"com.unity.ads": "3.6.1",
4-
"com.unity.analytics": "3.3.5",
5-
"com.unity.collab-proxy": "1.2.16",
6-
"com.unity.ext.nunit": "1.0.6",
7-
"com.unity.ide.rider": "1.1.4",
8-
"com.unity.ide.vscode": "1.2.3",
9-
"com.unity.multiplayer-hlapi": "1.0.8",
10-
"com.unity.purchasing": "3.0.1",
11-
"com.unity.test-framework": "1.1.22",
12-
"com.unity.textmeshpro": "2.0.1",
13-
"com.unity.timeline": "1.2.18",
14-
"com.unity.toolchain.linux-x86_64": "0.1.18-preview",
15-
"com.unity.ugui": "1.0.0",
16-
"com.unity.xr.legacyinputhelpers": "2.1.7",
17-
"com.unity.modules.ai": "1.0.0",
18-
"com.unity.modules.androidjni": "1.0.0",
19-
"com.unity.modules.animation": "1.0.0",
20-
"com.unity.modules.assetbundle": "1.0.0",
21-
"com.unity.modules.audio": "1.0.0",
22-
"com.unity.modules.cloth": "1.0.0",
23-
"com.unity.modules.director": "1.0.0",
243
"com.unity.modules.imageconversion": "1.0.0",
254
"com.unity.modules.imgui": "1.0.0",
26-
"com.unity.modules.jsonserialize": "1.0.0",
27-
"com.unity.modules.particlesystem": "1.0.0",
28-
"com.unity.modules.physics": "1.0.0",
29-
"com.unity.modules.physics2d": "1.0.0",
30-
"com.unity.modules.screencapture": "1.0.0",
31-
"com.unity.modules.terrain": "1.0.0",
32-
"com.unity.modules.terrainphysics": "1.0.0",
33-
"com.unity.modules.tilemap": "1.0.0",
34-
"com.unity.modules.ui": "1.0.0",
35-
"com.unity.modules.uielements": "1.0.0",
36-
"com.unity.modules.umbra": "1.0.0",
37-
"com.unity.modules.unityanalytics": "1.0.0",
38-
"com.unity.modules.unitywebrequest": "1.0.0",
39-
"com.unity.modules.unitywebrequestassetbundle": "1.0.0",
40-
"com.unity.modules.unitywebrequestaudio": "1.0.0",
41-
"com.unity.modules.unitywebrequesttexture": "1.0.0",
42-
"com.unity.modules.unitywebrequestwww": "1.0.0",
43-
"com.unity.modules.vehicles": "1.0.0",
44-
"com.unity.modules.video": "1.0.0",
45-
"com.unity.modules.vr": "1.0.0",
46-
"com.unity.modules.wind": "1.0.0",
47-
"com.unity.modules.xr": "1.0.0"
5+
"com.unity.modules.jsonserialize": "1.0.0"
486
}
497
}

0 commit comments

Comments
 (0)