othmane/ohif-viewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: duplicate measurements on hydration (#2047)

Browse Source 
* chore: remove lingering debugger statements

* fix: order of arguments on `MeasurementService.remove` calls

* fix: ensure report is dirty when intial measurements are added
This commit is contained in:
Danny Brown 2020-09-17 22:02:32 -04:00 committed by GitHub
parent 876cc58348
commit ba38cebcd7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/dicom-sr/src/viewports/ViewportOverlay.js
View File

@ -21,8 +21,6 @@ const ViewportOverlay = ({
const isZoomActive = activeTools.includes('Zoom'); const isZoomActive = activeTools.includes('Zoom');
const isWwwcActive = activeTools.includes('Wwwc'); const isWwwcActive = activeTools.includes('Wwwc');
debugger;
if (!imageId) { if (!imageId) {
return null; return null;
} }

4
extensions/measurement-tracking/src/contexts/TrackedMeasurementsContext/TrackedMeasurementsContext.jsx
View File

@ -67,7 +67,7 @@ function TrackedMeasurementsContextProvider(
const measurementIds = filteredMeasurements.map(fm => fm.id); const measurementIds = filteredMeasurements.map(fm => fm.id);
for (let i = 0; i < measurementIds.length; i++) { for (let i = 0; i < measurementIds.length; i++) {
MeasurementService.remove('app-source', measurementIds[i]); MeasurementService.remove(measurementIds[i], 'app-source');
} }
}, },
clearAllMeasurements: (ctx, evt) => { clearAllMeasurements: (ctx, evt) => {
@ -76,7 +76,7 @@ function TrackedMeasurementsContextProvider(
const measurementIds = measurements.map(fm => fm.id); const measurementIds = measurements.map(fm => fm.id);
for (let i = 0; i < measurementIds.length; i++) { for (let i = 0; i < measurementIds.length; i++) {
MeasurementService.remove('app-source', measurementIds[i]); MeasurementService.remove(measurementIds[i], 'app-source');
} }
}, },
}); });

5
extensions/measurement-tracking/src/contexts/TrackedMeasurementsContext/measurementTrackingMachine.js
View File

@ -32,6 +32,7 @@ const machineConfiguration = {
entry: 'clearContext', entry: 'clearContext',
on: { on: {
TRACK_SERIES: 'promptBeginTracking', TRACK_SERIES: 'promptBeginTracking',
// Unused? We may only do PROMPT_HYDRATE_SR now?
SET_TRACKED_SERIES: [ SET_TRACKED_SERIES: [
{ {
target: 'tracking', target: 'tracking',
@ -47,7 +48,7 @@ const machineConfiguration = {
onDone: [ onDone: [
{ {
target: 'tracking', target: 'tracking',
actions: ['setTrackedStudyAndSeries'], actions: ['setTrackedStudyAndSeries', 'setIsDirty'],
cond: 'shouldSetStudyAndSeries', cond: 'shouldSetStudyAndSeries',
}, },
{ {
@ -78,7 +79,7 @@ const machineConfiguration = {
UNTRACK_SERIES: [ UNTRACK_SERIES: [
{ {
target: 'tracking', target: 'tracking',
actions: ['removeTrackedSeries'], actions: ['removeTrackedSeries', 'setIsDirty'],
cond: 'hasRemainingTrackedSeries', cond: 'hasRemainingTrackedSeries',
}, },
{ {

2
platform/viewer/src/routes/WorkList/WorkList.jsx
View File

@ -111,7 +111,6 @@ function WorkList({
}; };
const onPageNumberChange = newPageNumber => { const onPageNumberChange = newPageNumber => {
debugger;
const oldPageNumber = filterValues.pageNumber; const oldPageNumber = filterValues.pageNumber;
const rollingPageNumberMod = Math.floor(101 / filterValues.resultsPerPage); const rollingPageNumberMod = Math.floor(101 / filterValues.resultsPerPage);
const rollingPageNumber = oldPageNumber % rollingPageNumberMod; const rollingPageNumber = oldPageNumber % rollingPageNumberMod;
@ -184,7 +183,6 @@ function WorkList({
// Query for series information // Query for series information
useEffect(() => { useEffect(() => {
const fetchSeries = async studyInstanceUid => { const fetchSeries = async studyInstanceUid => {
debugger;
try { try {
const series = await dataSource.query.series.search(studyInstanceUid); const series = await dataSource.query.series.search(studyInstanceUid);
seriesInStudiesMap.set( seriesInStudiesMap.set(