From 6e51e1ec4df7bf514d5a1b8cec43c7217ef079b7 Mon Sep 17 00:00:00 2001 From: Jefferson Casimir Date: Mon, 10 Jul 2023 14:46:41 -0400 Subject: [PATCH 1/3] Added line between chunks to prevent gap + Formatting --- .../src/series/components/LineChunk.tsx | 91 +++++++++++-------- .../src/series/components/SeriesRenderer.tsx | 12 ++- 2 files changed, 64 insertions(+), 39 deletions(-) diff --git a/modules/electrophysiology_browser/jsx/react-series-data-viewer/src/series/components/LineChunk.tsx b/modules/electrophysiology_browser/jsx/react-series-data-viewer/src/series/components/LineChunk.tsx index f1f0dee0565..d6c784dd399 100644 --- a/modules/electrophysiology_browser/jsx/react-series-data-viewer/src/series/components/LineChunk.tsx +++ b/modules/electrophysiology_browser/jsx/react-series-data-viewer/src/series/components/LineChunk.tsx @@ -8,24 +8,27 @@ import {colorOrder} from '../../color'; const LineMemo = R.memoizeWith( ({amplitudeScale, filters, channelIndex, traceIndex, - chunkIndex, isStacked, DCOffset, numChannels, numChunks}) => + chunkIndex, isStacked, DCOffset, numChannels, + numChunks, previousPoint}) => `${amplitudeScale},${filters.join('-')},` + `${channelIndex}-${traceIndex}-${chunkIndex},` - + `${isStacked},${DCOffset},${numChannels},${numChunks}`, + + `${isStacked},${DCOffset},${numChannels},` + + `${numChunks},${previousPoint}`, ({ - channelIndex, - traceIndex, - chunkIndex, - interval, - seriesRange, - amplitudeScale, - filters, - values, - isStacked, - DCOffset, - numChannels, - numChunks, - ...rest + channelIndex, + traceIndex, + chunkIndex, + interval, + seriesRange, + amplitudeScale, + filters, + values, + isStacked, + DCOffset, + numChannels, + numChunks, + previousPoint, + ...rest }) => { const scales = [ scaleLinear() @@ -36,14 +39,26 @@ const LineMemo = R.memoizeWith( .range([-0.5, 0.5]), ]; - const points = values.map((value, i) => - vec2.fromValues( - scales[0]( - interval[0] + (i / values.length) * (interval[1] - interval[0]) - ), - -(scales[1](value) - DCOffset) + const points = [ + ... previousPoint === null + ? [] + : [ + vec2.fromValues( + scales[0]( + interval[0] - (1 / values.length) * (interval[1] - interval[0]) + ), + -(scales[1](previousPoint) - DCOffset) + ) + ], + ...values.map((value, i) => + vec2.fromValues( + scales[0]( + interval[0] + (i / values.length) * (interval[1] - interval[0]) + ), + -(scales[1](value) - DCOffset) + ) ) - ); + ]; return ( { const {interval, values} = chunk; @@ -151,6 +169,7 @@ const LineChunk = ({ DCOffset={withDCOffset} numChannels={numChannels} numChunks={numChunks} + previousPoint={previousPoint} /> diff --git a/modules/electrophysiology_browser/jsx/react-series-data-viewer/src/series/components/SeriesRenderer.tsx b/modules/electrophysiology_browser/jsx/react-series-data-viewer/src/series/components/SeriesRenderer.tsx index 62500b0a2be..73436fb5bd4 100644 --- a/modules/electrophysiology_browser/jsx/react-series-data-viewer/src/series/components/SeriesRenderer.tsx +++ b/modules/electrophysiology_browser/jsx/react-series-data-viewer/src/series/components/SeriesRenderer.tsx @@ -623,7 +623,8 @@ const SeriesRenderer: FunctionComponent = ({ /> - {channelList.map((channel, i) => { + { + channelList.map((channel, i) => { if (!channelMetadata[channel.index]) { return null; } @@ -733,12 +734,12 @@ const SeriesRenderer: FunctionComponent = ({ : 0; return ( - trace.chunks.map((chunk, k) => ( + trace.chunks.map((chunk, k, chunks) => ( = ({ withDCOffset={DCOffset} numChannels={numDisplayedChannels} numChunks={numChunks} + previousPoint={ + k === 0 + ? null + : chunks[k - 1].values.slice(-1)[0] + } /> )) ); From 572da97750ac8dbca4a21fa25ce90e6d039ea7d7 Mon Sep 17 00:00:00 2001 From: Jefferson Casimir Date: Thu, 13 Jul 2023 16:34:20 -0400 Subject: [PATCH 2/3] Improved formatting --- .../src/series/components/LineChunk.tsx | 25 ++++++++++--------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/modules/electrophysiology_browser/jsx/react-series-data-viewer/src/series/components/LineChunk.tsx b/modules/electrophysiology_browser/jsx/react-series-data-viewer/src/series/components/LineChunk.tsx index d6c784dd399..7f1bde16625 100644 --- a/modules/electrophysiology_browser/jsx/react-series-data-viewer/src/series/components/LineChunk.tsx +++ b/modules/electrophysiology_browser/jsx/react-series-data-viewer/src/series/components/LineChunk.tsx @@ -39,17 +39,18 @@ const LineMemo = R.memoizeWith( .range([-0.5, 0.5]), ]; - const points = [ - ... previousPoint === null - ? [] - : [ - vec2.fromValues( - scales[0]( - interval[0] - (1 / values.length) * (interval[1] - interval[0]) - ), - -(scales[1](previousPoint) - DCOffset) - ) - ], + const points = previousPoint === null + ? [] + : [ + vec2.fromValues( + scales[0]( + interval[0] - (1 / values.length) * (interval[1] - interval[0]) + ), + -(scales[1](previousPoint) - DCOffset) + ) + ]; + + points.push( ...values.map((value, i) => vec2.fromValues( scales[0]( @@ -58,7 +59,7 @@ const LineMemo = R.memoizeWith( -(scales[1](value) - DCOffset) ) ) - ]; + ); return ( Date: Tue, 23 Jan 2024 12:01:39 -0500 Subject: [PATCH 3/3] Revert "[examiner] Only show active examiner sites (#8967)" This reverts commit ed5df9c646896f50efc2c57cb3f4d780c5dc53d4. --- CHANGELOG.md | 1 - .../php/examinerprovisioner.class.inc | 37 ++++++++++--------- 2 files changed, 20 insertions(+), 18 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b9c75f69d4c..ad468b3cb59 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,7 +14,6 @@ changes in the following format: PR #1234*** - Add OpenID Connect authorization support to LORIS (PR #8255) #### Bug Fixes -- Fix examiner site display (PR #8967) - bvl_feedback updates in real-time (PR #8966) - DoB and DoD format respected in candidate parameters (PR #9001) diff --git a/modules/examiner/php/examinerprovisioner.class.inc b/modules/examiner/php/examinerprovisioner.class.inc index 91ece0dfd00..47c1b9ffc06 100644 --- a/modules/examiner/php/examinerprovisioner.class.inc +++ b/modules/examiner/php/examinerprovisioner.class.inc @@ -37,23 +37,26 @@ class ExaminerProvisioner extends \LORIS\Data\Provisioners\DBRowProvisioner function __construct() { parent::__construct( - "SELECT - e.full_name as Examiner, - u.Email, - GROUP_CONCAT(DISTINCT epr.CenterID) as centerIds, - e.examinerID as ID, - e.radiologist as Radiologist, - GROUP_CONCAT(DISTINCT tn.full_name SEPARATOR ', ') as - Certification - FROM examiners e - LEFT JOIN examiners_psc_rel epr ON - (epr.examinerID=e.examinerID) - LEFT JOIN certification c ON - (c.examinerID=e.examinerID and c.pass = 'certified') - LEFT JOIN test_names tn ON (tn.ID = c.testID) - LEFT JOIN users u ON u.ID=e.userID - WHERE epr.active='Y' - GROUP BY e.examinerID + " + select + e.full_name as Examiner, + u.Email, + GROUP_CONCAT(DISTINCT psc.CenterID) as centerIds, + e.examinerID as ID, + + e.radiologist as Radiologist, + GROUP_CONCAT(DISTINCT tn.full_name SEPARATOR ', ') as + Certification + + FROM examiners e + LEFT JOIN examiners_psc_rel epr ON + (epr.examinerID=e.examinerID) + LEFT JOIN psc ON (epr.centerID=psc.CenterID) + LEFT JOIN certification c ON + (c.examinerID=e.examinerID and c.pass = 'certified') + LEFT JOIN test_names tn ON (tn.ID = c.testID) + LEFT JOIN users u ON u.ID=e.userID + group by e.examinerID ", [], );