@ohif/app 3.7.0-beta.43 → 3.7.0-beta.46
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/{150.bundle.94cbce497cafacd4a7d7.js → 150.bundle.2fa62b4d658df1500a7a.js} +71 -3
- package/dist/{181.bundle.817ca1ba6479fca5fd15.js → 181.bundle.f5476625f4ca901a1b91.js} +13 -34
- package/dist/{236.bundle.3c5f844ce9de4ec0777d.js → 236.bundle.c0a68163699ecfe3169a.js} +25 -11
- package/dist/{250.bundle.ee4bcf159c4d610acc3e.js → 250.bundle.1c1cb3520a9285138cfa.js} +18 -6
- package/dist/{30.bundle.8fb93818b3a58f29f7e3.js → 30.bundle.c0b2fa8984080ebcfbbc.js} +3 -1
- package/dist/{378.bundle.c908a6194c50544b45db.js → 378.bundle.61261ee41e0ea0955440.js} +8 -6
- package/dist/{869.bundle.c9c018e6757410919ed8.js → 451.bundle.a08889b823fb10803bd8.js} +38 -68
- package/dist/{810.bundle.b3e2cf57e00d35a12f30.js → 471.bundle.3238a0647d80970085f7.js} +36 -65
- package/dist/{506.bundle.44629077a406500707ea.js → 506.bundle.b23fa19d91dd23ab44be.js} +73 -4
- package/dist/{663.bundle.2dcb8a60d59464f4e563.js → 663.bundle.f5db124e3e922e61e76b.js} +27 -9
- package/dist/{678.bundle.13062f7926c30056aee1.js → 678.bundle.c07616be5e27371d875c.js} +103 -21
- package/dist/{821.bundle.d4120df6baeed120be9e.js → 821.bundle.d175d0a8f3f0148a1993.js} +79 -29
- package/dist/{app.bundle.2905ffdd301e3c34286e.js → app.bundle.7e5633a7d73fc76a884d.js} +255 -95
- package/dist/index.html +1 -1
- package/dist/sw.js +1 -1
- package/package.json +18 -18
- /package/dist/{12.bundle.f46296f27a36e6b95f76.js → 12.bundle.cff58bede0136dc8d013.js} +0 -0
- /package/dist/{128.bundle.963d34d21c01231fc804.js → 128.bundle.620a2fdce44958dbb9fb.js} +0 -0
- /package/dist/{281.bundle.ac92bd142441f317f308.js → 281.bundle.be238c748373d907dffe.js} +0 -0
- /package/dist/{348.bundle.323f57efcc2239950451.js → 348.bundle.dcebcb7b75ff9fcc1d5b.js} +0 -0
- /package/dist/{359.bundle.3ae0f07b1c428eeb00a8.js → 359.bundle.3cdac00ab9649a10741b.js} +0 -0
- /package/dist/{410.bundle.b3cbeff9c619149a2234.js → 410.bundle.fe0269b702be9c375abb.js} +0 -0
- /package/dist/{782.bundle.c511611d980f9aa6563b.js → 782.bundle.f2a1076331c6a6816314.js} +0 -0
- /package/dist/{814.bundle.8391ddacf39d7c699c5f.js → 814.bundle.69e55909aa8b5a776fe4.js} +0 -0
|
@@ -708,12 +708,16 @@ class StaticWadoClient extends dicomweb_client_es.api.DICOMwebClient {
|
|
|
708
708
|
* @returns
|
|
709
709
|
*/
|
|
710
710
|
async searchForStudies(options) {
|
|
711
|
-
if (!this.staticWado)
|
|
711
|
+
if (!this.staticWado) {
|
|
712
|
+
return super.searchForStudies(options);
|
|
713
|
+
}
|
|
712
714
|
const searchResult = await super.searchForStudies(options);
|
|
713
715
|
const {
|
|
714
716
|
queryParams
|
|
715
717
|
} = options;
|
|
716
|
-
if (!queryParams)
|
|
718
|
+
if (!queryParams) {
|
|
719
|
+
return searchResult;
|
|
720
|
+
}
|
|
717
721
|
const lowerParams = this.toLowerParams(queryParams);
|
|
718
722
|
const filtered = searchResult.filter(study => {
|
|
719
723
|
for (const key of Object.keys(StaticWadoClient.studyFilterKeys)) {
|
|
@@ -726,12 +730,16 @@ class StaticWadoClient extends dicomweb_client_es.api.DICOMwebClient {
|
|
|
726
730
|
return filtered;
|
|
727
731
|
}
|
|
728
732
|
async searchForSeries(options) {
|
|
729
|
-
if (!this.staticWado)
|
|
733
|
+
if (!this.staticWado) {
|
|
734
|
+
return super.searchForSeries(options);
|
|
735
|
+
}
|
|
730
736
|
const searchResult = await super.searchForSeries(options);
|
|
731
737
|
const {
|
|
732
738
|
queryParams
|
|
733
739
|
} = options;
|
|
734
|
-
if (!queryParams)
|
|
740
|
+
if (!queryParams) {
|
|
741
|
+
return searchResult;
|
|
742
|
+
}
|
|
735
743
|
const lowerParams = this.toLowerParams(queryParams);
|
|
736
744
|
const filtered = searchResult.filter(series => {
|
|
737
745
|
for (const key of Object.keys(StaticWadoClient.seriesFilterKeys)) {
|
|
@@ -767,8 +775,12 @@ class StaticWadoClient extends dicomweb_client_es.api.DICOMwebClient {
|
|
|
767
775
|
actual = actual.Alphabetic;
|
|
768
776
|
}
|
|
769
777
|
if (typeof actual == 'string') {
|
|
770
|
-
if (actual.length === 0)
|
|
771
|
-
|
|
778
|
+
if (actual.length === 0) {
|
|
779
|
+
return true;
|
|
780
|
+
}
|
|
781
|
+
if (desired.length === 0 || desired === '*') {
|
|
782
|
+
return true;
|
|
783
|
+
}
|
|
772
784
|
if (desired[0] === '*' && desired[desired.length - 1] === '*') {
|
|
773
785
|
// console.log(`Comparing ${actual} to ${desired.substring(1, desired.length - 1)}`)
|
|
774
786
|
return actual.indexOf(desired.substring(1, desired.length - 1)) != -1;
|
|
@@ -783,9 +795,13 @@ class StaticWadoClient extends dicomweb_client_es.api.DICOMwebClient {
|
|
|
783
795
|
|
|
784
796
|
/** Compares a pair of dates to see if the value is within the range */
|
|
785
797
|
compareDateRange(range, value) {
|
|
786
|
-
if (!value)
|
|
798
|
+
if (!value) {
|
|
799
|
+
return true;
|
|
800
|
+
}
|
|
787
801
|
const dash = range.indexOf('-');
|
|
788
|
-
if (dash === -1)
|
|
802
|
+
if (dash === -1) {
|
|
803
|
+
return this.compareValues(range, value);
|
|
804
|
+
}
|
|
789
805
|
const start = range.substring(0, dash);
|
|
790
806
|
const end = range.substring(dash + 1);
|
|
791
807
|
return (!start || value >= start) && (!end || value <= end);
|
|
@@ -802,11 +818,17 @@ class StaticWadoClient extends dicomweb_client_es.api.DICOMwebClient {
|
|
|
802
818
|
*/
|
|
803
819
|
filterItem(key, queryParams, study, sourceFilterMap) {
|
|
804
820
|
const altKey = sourceFilterMap[key] || key;
|
|
805
|
-
if (!queryParams)
|
|
821
|
+
if (!queryParams) {
|
|
822
|
+
return true;
|
|
823
|
+
}
|
|
806
824
|
const testValue = queryParams[key] || queryParams[altKey];
|
|
807
|
-
if (!testValue)
|
|
825
|
+
if (!testValue) {
|
|
826
|
+
return true;
|
|
827
|
+
}
|
|
808
828
|
const valueElem = study[key] || study[altKey];
|
|
809
|
-
if (!valueElem)
|
|
829
|
+
if (!valueElem) {
|
|
830
|
+
return false;
|
|
831
|
+
}
|
|
810
832
|
if (valueElem.vr == 'DA') {
|
|
811
833
|
return this.compareDateRange(testValue, valueElem.Value[0]);
|
|
812
834
|
}
|
|
@@ -867,8 +889,12 @@ const getDirectURL = (config, params) => {
|
|
|
867
889
|
singlepart: fetchPart = 'video'
|
|
868
890
|
} = params;
|
|
869
891
|
const value = instance[tag];
|
|
870
|
-
if (!value)
|
|
871
|
-
|
|
892
|
+
if (!value) {
|
|
893
|
+
return undefined;
|
|
894
|
+
}
|
|
895
|
+
if (value.DirectRetrieveURL) {
|
|
896
|
+
return value.DirectRetrieveURL;
|
|
897
|
+
}
|
|
872
898
|
if (value.InlineBinary) {
|
|
873
899
|
const blob = src.utils.b64toBlob(value.InlineBinary, defaultType);
|
|
874
900
|
value.DirectRetrieveURL = URL.createObjectURL(blob);
|
|
@@ -1418,7 +1444,9 @@ function createDicomJSONApi(dicomJsonConfig) {
|
|
|
1418
1444
|
query,
|
|
1419
1445
|
url
|
|
1420
1446
|
} = _ref;
|
|
1421
|
-
if (!url)
|
|
1447
|
+
if (!url) {
|
|
1448
|
+
url = query.get('url');
|
|
1449
|
+
}
|
|
1422
1450
|
let metaData = getMetaDataByURL(url);
|
|
1423
1451
|
|
|
1424
1452
|
// if we have already cached the data from this specific url
|
|
@@ -1565,7 +1593,9 @@ function createDicomJSONApi(dicomJsonConfig) {
|
|
|
1565
1593
|
return obj;
|
|
1566
1594
|
});
|
|
1567
1595
|
storeInstances(instances);
|
|
1568
|
-
if (index === numberOfSeries - 1)
|
|
1596
|
+
if (index === numberOfSeries - 1) {
|
|
1597
|
+
setSuccessFlag();
|
|
1598
|
+
}
|
|
1569
1599
|
});
|
|
1570
1600
|
}
|
|
1571
1601
|
}
|
|
@@ -1640,8 +1670,12 @@ const END_MODALITIES = {
|
|
|
1640
1670
|
};
|
|
1641
1671
|
const compareValue = function (v1, v2) {
|
|
1642
1672
|
let def = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
|
|
1643
|
-
if (v1 === v2)
|
|
1644
|
-
|
|
1673
|
+
if (v1 === v2) {
|
|
1674
|
+
return def;
|
|
1675
|
+
}
|
|
1676
|
+
if (v1 < v2) {
|
|
1677
|
+
return -1;
|
|
1678
|
+
}
|
|
1645
1679
|
return 1;
|
|
1646
1680
|
};
|
|
1647
1681
|
|
|
@@ -2177,8 +2211,8 @@ function ViewerLayout(_ref) {
|
|
|
2177
2211
|
hotkeyDefinitions,
|
|
2178
2212
|
hotkeyDefaults
|
|
2179
2213
|
} = hotkeysManager;
|
|
2180
|
-
const versionNumber = "3.7.0-beta.
|
|
2181
|
-
const commitHash = "
|
|
2214
|
+
const versionNumber = "3.7.0-beta.46";
|
|
2215
|
+
const commitHash = "b55518e08ec9c9ab23e74aa4987927d8d75ae909";
|
|
2182
2216
|
const menuOptions = [{
|
|
2183
2217
|
title: t('Header:About'),
|
|
2184
2218
|
icon: 'info',
|
|
@@ -3370,7 +3404,9 @@ function _mapMeasurementToDisplay(measurement, index, types) {
|
|
|
3370
3404
|
if (findingSites) {
|
|
3371
3405
|
const siteText = [];
|
|
3372
3406
|
findingSites.forEach(site => {
|
|
3373
|
-
if (site?.text !== label)
|
|
3407
|
+
if (site?.text !== label) {
|
|
3408
|
+
siteText.push(site.text);
|
|
3409
|
+
}
|
|
3374
3410
|
});
|
|
3375
3411
|
displayText = [...siteText, ...displayText];
|
|
3376
3412
|
}
|
|
@@ -4671,10 +4707,14 @@ const reuseCachedLayout = (state, hangingProtocolService, syncService) => {
|
|
|
4671
4707
|
displaySetOptions,
|
|
4672
4708
|
displaySetInstanceUIDs
|
|
4673
4709
|
} = viewport;
|
|
4674
|
-
if (!displaySetOptions)
|
|
4710
|
+
if (!displaySetOptions) {
|
|
4711
|
+
continue;
|
|
4712
|
+
}
|
|
4675
4713
|
for (let i = 0; i < displaySetOptions.length; i++) {
|
|
4676
4714
|
const displaySetUID = displaySetInstanceUIDs[i];
|
|
4677
|
-
if (!displaySetUID)
|
|
4715
|
+
if (!displaySetUID) {
|
|
4716
|
+
continue;
|
|
4717
|
+
}
|
|
4678
4718
|
if (idx === activeViewportIndex && i === 0) {
|
|
4679
4719
|
displaySetSelectorMap[`${activeStudyUID}:activeDisplaySet:0`] = displaySetUID;
|
|
4680
4720
|
}
|
|
@@ -4707,9 +4747,11 @@ const reuseCachedLayout = (state, hangingProtocolService, syncService) => {
|
|
|
4707
4747
|
*/
|
|
4708
4748
|
const findViewportsByPosition_findOrCreateViewport = (hangingProtocolService, viewportsByPosition, viewportIndex, positionId, options) => {
|
|
4709
4749
|
const byPositionViewport = viewportsByPosition?.[positionId];
|
|
4710
|
-
if (byPositionViewport)
|
|
4711
|
-
|
|
4712
|
-
|
|
4750
|
+
if (byPositionViewport) {
|
|
4751
|
+
return {
|
|
4752
|
+
...byPositionViewport
|
|
4753
|
+
};
|
|
4754
|
+
}
|
|
4713
4755
|
const {
|
|
4714
4756
|
protocolId,
|
|
4715
4757
|
stageIndex
|
|
@@ -4893,7 +4935,9 @@ const commandsModule = _ref => {
|
|
|
4893
4935
|
stage
|
|
4894
4936
|
} = hangingProtocolService.getActiveProtocol();
|
|
4895
4937
|
const enableListener = button => {
|
|
4896
|
-
if (!button.id)
|
|
4938
|
+
if (!button.id) {
|
|
4939
|
+
return;
|
|
4940
|
+
}
|
|
4897
4941
|
const {
|
|
4898
4942
|
commands,
|
|
4899
4943
|
items
|
|
@@ -4902,7 +4946,9 @@ const commandsModule = _ref => {
|
|
|
4902
4946
|
items.forEach(enableListener);
|
|
4903
4947
|
}
|
|
4904
4948
|
const hpCommand = commands?.find?.(isHangingProtocolCommand);
|
|
4905
|
-
if (!hpCommand)
|
|
4949
|
+
if (!hpCommand) {
|
|
4950
|
+
return;
|
|
4951
|
+
}
|
|
4906
4952
|
const {
|
|
4907
4953
|
protocolId,
|
|
4908
4954
|
stageIndex,
|
|
@@ -5869,12 +5915,16 @@ function getCustomizationModule() {
|
|
|
5869
5915
|
{
|
|
5870
5916
|
id: 'ohif.overlayItem',
|
|
5871
5917
|
content: function (props) {
|
|
5872
|
-
if (this.condition && !this.condition(props))
|
|
5918
|
+
if (this.condition && !this.condition(props)) {
|
|
5919
|
+
return null;
|
|
5920
|
+
}
|
|
5873
5921
|
const {
|
|
5874
5922
|
instance
|
|
5875
5923
|
} = props;
|
|
5876
5924
|
const value = instance && this.attribute ? instance[this.attribute] : this.contentF && typeof this.contentF === 'function' ? this.contentF(props) : null;
|
|
5877
|
-
if (!value)
|
|
5925
|
+
if (!value) {
|
|
5926
|
+
return null;
|
|
5927
|
+
}
|
|
5878
5928
|
return /*#__PURE__*/react.createElement("span", {
|
|
5879
5929
|
className: "overlay-item flex flex-row",
|
|
5880
5930
|
style: {
|