Doni/ModelHandle
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Better error message in case of the file is found, but failed to load.

Browse Source
This commit is contained in:
kovacsv 2021-12-13 11:09:33 +01:00
parent 6fd498d4a8
commit c698117302
5 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source/import/importer.js
View File

@ -9,8 +9,9 @@ OV.ImportSettings = class
OV.ImportErrorCode =
{
NoImportableFile : 1,
ImportFailed : 2,
UnknownError : 3
FailedToLoadFile : 2,
ImportFailed : 3,
UnknownError : 4
};
OV.ImportError = class
@ -179,7 +180,7 @@ OV.Importer = class
ImportLoadedMainFile (mainFile, settings, callbacks)
{
if (mainFile === null || mainFile.file === null || mainFile.file.content === null) {
callbacks.onImportError (new OV.ImportError (OV.ImportErrorCode.NoImportableFile, null));
callbacks.onImportError (new OV.ImportError (OV.ImportErrorCode.FailedToLoadFile, null));
return;
}

2
source/viewer/domviewer.js
View File

@ -77,6 +77,8 @@ OV.Init3DViewerElement = function (parentDiv, modelUrls, parameters)
let message = 'Unknown error';
if (importError.code === OV.ImportErrorCode.NoImportableFile) {
message = 'No importable file found';
} else if (importError.code === OV.ImportErrorCode.FailedToLoadFile) {
message = 'Failed load file for import.';
} else if (importError.code === OV.ImportErrorCode.ImportFailed) {
message = 'Failed to import model.';
}

2
test/tests/importer_test.js
View File

@ -46,7 +46,7 @@ describe ('Importer Test', function () {
assert.fail ();
},
error : function (importer, importError) {
assert.strictEqual (importError.code, OV.ImportErrorCode.NoImportableFile);
assert.strictEqual (importError.code, OV.ImportErrorCode.FailedToLoadFile);
done ();
}
});

6
website/o3dv/js/threemodelloaderui.js
View File

@ -67,6 +67,12 @@ OV.ThreeModelLoaderUI = class
'No importable file found.',
importError.message
);
} else if (importError.code === OV.ImportErrorCode.FailedToLoadFile) {
return OV.ShowMessageDialog (
'Something went wrong',
'Failed load file for import.',
importError.message
);
} else if (importError.code === OV.ImportErrorCode.ImportFailed) {
return OV.ShowMessageDialog (
'Something went wrong',

2
website/o3dv/js/website.js
View File

@ -373,6 +373,8 @@ OV.Website = class
let reason = 'unknown';
if (importError.code === OV.ImportErrorCode.NoImportableFile) {
reason = 'no_importable_file';
} else if (importError.code === OV.ImportErrorCode.FailedToLoadFile) {
reason = 'failed_to_load_file';
} else if (importError.code === OV.ImportErrorCode.ImportFailed) {
reason = 'import_failed';
}