feat: Segmentations Settings UI - Phase 1 #1391 (#1392)

* Filter segs and fetch correct metadata. * Initiate seg loading logic on series load into viewport. Need to write. * Automatic consumption of SEG functional. * Pull in master. * Fix issues after pulling in master. * Clean up old segmentation handlers. * WIP * WIP * Poppulate viewport with metadata. * Show hide/segmentation in react-vtkjs-viewport. * feat: 🎸 View segmentations in vtkjs viewport * Filter segs and fetch correct metadata. * Initiate seg loading logic on series load into viewport. Need to write. * Automatic consumption of SEG functional. * Pull in master. * Fix issues after pulling in master. * Clean up old segmentation handlers. * WIP * WIP * Poppulate viewport with metadata. * Show hide/segmentation in react-vtkjs-viewport. * feat: 🎸 View segmentations in vtkjs viewport * Rebase on master. * format format format * add basic extension parts * Updated yarn lock * Fetch derived/referenced displaysets in sidepanel * Add buttons, expose seriesDescription, write notes for Danny. * Add growcut tool extention. -> Move to a seperate repo. * Change some text fields. * expose dialog provider * hide draggable area * No pointer events for now; need to revisit * Don't filter seg from the outset for now * fiddling about * fix path to series data * fix logic to determine next available labelmapindex * Ability to swtich between labelmaps * Return a promise so we can make sure our labelmap is loaded before pulling metadata * Better UI to toggle labelmaps * Fix accidental untoggle of active labelmap for ui * Remove brush tool from cornerstone extension * Add cstools in preInit for seg extension * Add buttons for seg magic * Hide the measurements panel for now * Slightly better seg/scissor icons * Add eraser * ability to switch segments * seg color / switcher * Fix vtk labelmap cache. * sidepanel should scroll if there's overflow * Use a fancier range slider * Slightly prettier buttons * Push in progress * A bit more reactive; handle no-meta * Update to vtk.js 11.14.0 and react-vtkjs-viewport 0.6.0 * chore: kickstart preview * Fix conflict issues * Refactor panel * Isolate increment functions * Wip segment table * Hide selector and add scroll to segmentation * Increase width of segment description * Hide not used items * Add new select for segmentations * Align ui * Fix default segmentation * Fix broken import test * Get measurements panel back and add spacing to grouped buttons * Hide brush and selector and refresh when switching segmentations * Add pointer events back and fix broken tests for measurement table * Update segment list when switching humbnails * CR Update: Minor UI adjustments * CR Update: Set active segment * Move components to components folder * Add new settings ui * Integrate configuration * Improve styles * Float numbers * Improve css * Refresh settings menu if side panel changed * Fix settings rendering logic and remove comments * Extract components * Remove not used tools * Remove non used extension * Use style variables and remove comments * Remove non used dep from lock * Remove tools * Remove segmentation from toolbar * Add todo and brushradius from config * Fix packagejson growcut import * Remove webpack config already defined in parent * Update package json description * Change component name to british english to us * Improve prop types * Rename cornerstone label map event * Scope css * Extract and add doc to helper * Update jsdocs for getDerivedDatasets * Add proptypes and cr updates * Update tablistitem proptypes * config is readonly, rollback destructuring * Remove event for side panel * Add jsdocs for util * Extract getimageid to studymetada * Use ohif log instead of console * Remove specific style from side panel * Fix default props for brush radius * Descructure configuration props from settings component to avoid invalid props * Update proptypes to be required (settings) * Update readme * Remove commandsmodule * Get configuration module inside the component * Set selected segment * Rename extension and use modality to filter * Fix for failing tests (#1423) * hello world * Finish rebase for Igor. * Re-fix cornerstoneTools version that got messed up in merge. * Fix reactivity of isDisabled, write implementation for the SEG panel. * Nuke yarn.lock to stack CST to 4.12.0 * Remove debugger statements. * fix: bump cornerstone-tools version to address toFixed issue * test: force tests for MISTER^MR to navigate to study directly * test: remove eraser tool test * test: count is off by one * test: don't save SR state for the time being * test: disable more tests Co-authored-by: James A. Petts <jamesapetts@gmail.com> Co-authored-by: dannyrb <danny.ri.brown@gmail.com> Co-authored-by: igoroctaviano] <igoroctaviano@users.noreply.github.com> Co-authored-by: Mirna Silva <mirna.silva@radicalimaging.com>
2020-03-13 15:45:26 -04:00
1 parent d426b78967
commit e8842cf8ae
@@ -0,0 +1,95 @@
+.dcmseg-segmentation-settings {
+  display: flex;
+  flex-direction: column;
+  padding: 20px;
+}
+
+.dcmseg-segmentation-settings .range label {
+  display: block;
+  margin-bottom: 8px;
+}
+
+.dcmseg-segmentation-settings .settings-title {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: space-between;
+  padding-bottom: 20px;
+}
+
+.dcmseg-segmentation-settings .settings-title h3 {
+  color: var(--text-primary-color);
+  margin: 0;
+  padding: 0;
+}
+
+.dcmseg-segmentation-settings .settings-group {
+  display: flex;
+  flex-direction: column;
+  color: var(--text-primary-color);
+  font-size: 12px;
+}
+
+.dcmseg-segmentation-settings .settings-group .range {
+  display: flex;
+  padding: 20px 15px;
+}
+
+.dcmseg-segmentation-settings .settings-group .range:not(:last-of-type) {
+  padding-bottom: 0;
+}
+
+.dcmseg-segmentation-settings .settings-group .range label {
+  margin: 0;
+  display: unset;
+  min-width: 40px;
+  max-width: 40px;
+}
+
+.dcmseg-segmentation-settings .settings-group .range input {
+  width: 100%;
+  padding: 0 20px 0 20px;
+}
+
+.dcmseg-segmentation-settings .custom-check label {
+  font-weight: bold;
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: space-between;
+  border-bottom: 2px solid black;
+  padding: 10px 15px;
+}
+
+.dcmseg-segmentation-settings .custom-check input {
+  width: 15px;
+  height: 15px;
+}
+
+.dcmseg-segmentation-settings .settings-group {
+  background-color: var(--ui-gray-dark);
+  border-radius: 5px;
+}
+
+.dcmseg-segmentation-settings .return-button {
+  color: #333;
+  background-color: #fff;
+  padding: 4px 12px;
+  line-height: 1.4;
+  text-align: center;
+  white-space: nowrap;
+  vertical-align: middle;
+  cursor: pointer;
+  user-select: none;
+  border: 1px solid #ccc;
+  border-radius: 4px;
+  transition: all 0.15s ease;
+}
+
+.dcmseg-segmentation-settings .return-button:hover,
+.dcmseg-segmentation-settings .return-button:active,
+.dcmseg-segmentation-settings .return-button.active {
+  background-color: var(--active-color);
+  border-color: var(--ui-border-color-active);
+  color: #fff;
+}
@@ -0,0 +1,178 @@
+import React, { useState, useEffect } from 'react';
+import PropTypes from 'prop-types';
+import { Range } from '@ohif/ui';
+
+import './SegmentationSettings.css';
+
+const SegmentationSettings = ({ configuration, onBack, onChange }) => {
+  const [state, setState] = useState({
+    renderFill: configuration.renderFill,
+    renderOutline: configuration.renderOutline,
+    shouldRenderInactiveLabelmaps: configuration.shouldRenderInactiveLabelmaps,
+    fillAlpha: configuration.fillAlpha,
+    outlineAlpha: configuration.outlineAlpha,
+    outlineWidth: configuration.outlineWidth,
+    fillAlphaInactive: configuration.fillAlphaInactive,
+    outlineAlphaInactive: configuration.outlineAlphaInactive
+  });
+
+  useEffect(() => {
+    onChange(state);
+  }, [state]);
+
+  const check = field => {
+    setState(state => ({ ...state, [field]: !state[field] }));
+  };
+
+  const save = (field, value) => {
+    setState(state => ({ ...state, [field]: value }));
+  };
+
+  const toFloat = value => parseFloat(value / 100).toFixed(2);
+
+  return (
+    <div className="dcmseg-segmentation-settings">
+      <div className="settings-title">
+        <h3>Segmentations Settings</h3>
+        <button className="return-button" onClick={onBack}>
+          Back
+        </button>
+      </div>
+      <div
+        className="settings-group"
+        style={{ marginBottom: state.renderFill ? 15 : 0 }}
+      >
+        <CustomCheck
+          label="Segment Fill"
+          checked={state.renderFill}
+          onChange={() => check('renderFill')}
+        />
+        {state.renderFill && (
+          <CustomRange
+            label="Opacity"
+            step={1}
+            min={0}
+            max={100}
+            value={state.fillAlpha * 100}
+            onChange={event => save('fillAlpha', toFloat(event.target.value))}
+            showPercentage
+          />
+        )}
+      </div>
+      <div
+        className="settings-group"
+        style={{ marginBottom: state.renderOutline ? 15 : 0 }}
+      >
+        <CustomCheck
+          label="Segment Outline"
+          checked={state.renderOutline}
+          onChange={() => check('renderOutline')}
+        />
+        {state.renderOutline && (
+          <>
+            <CustomRange
+              value={state.outlineAlpha * 100}
+              label="Opacity"
+              showPercentage
+              step={1}
+              min={0}
+              max={100}
+              onChange={event => save('outlineAlpha', toFloat(event.target.value))}
+            />
+            <CustomRange
+              value={state.outlineWidth}
+              label="Width"
+              showValue
+              step={1}
+              min={0}
+              max={5}
+              onChange={event => save('outlineWidth', parseInt(event.target.value))}
+            />
+          </>
+        )}
+      </div>
+      {(state.renderFill || state.renderOutline) && (
+        <div
+          className="settings-group"
+          style={{ marginBottom: state.shouldRenderInactiveLabelmaps ? 15 : 0 }}
+        >
+          <CustomCheck
+            label="Render inactive segmentations"
+            checked={state.shouldRenderInactiveLabelmaps}
+            onChange={() => check('shouldRenderInactiveLabelmaps')}
+          />
+          {state.shouldRenderInactiveLabelmaps && (
+            <>
+              {state.renderFill && (
+                <CustomRange
+                  label="Fill Opacity"
+                  showPercentage
+                  step={1}
+                  min={0}
+                  max={100}
+                  value={state.fillAlphaInactive * 100}
+                  onChange={event => save('fillAlphaInactive', toFloat(event.target.value))}
+                />
+              )}
+              {state.renderOutline && (
+                <CustomRange
+                  label="Outline Opacity"
+                  showPercentage
+                  step={1}
+                  min={0}
+                  max={100}
+                  value={state.outlineAlphaInactive * 100}
+                  onChange={event => save('outlineAlphaInactive', toFloat(event.target.value))}
+                />
+              )}
+            </>
+          )}
+        </div>
+      )}
+    </div>
+  );
+};
+
+const CustomCheck = ({ label, checked, onChange }) => {
+  return (
+    <div className="custom-check">
+      <label>
+        <span>{label}</span>
+        <input type="checkbox" checked={checked} onChange={onChange} />
+      </label>
+    </div>
+  );
+};
+
+const CustomRange = props => {
+  const { label, onChange } = props;
+  return (
+    <div className="range">
+      <label htmlFor="range">{label}</label>
+      <Range
+        {...props}
+        onChange={event => {
+          event.persist();
+          onChange(event);
+        }}
+      />
+    </div>
+  );
+};
+
+SegmentationSettings.propTypes = {
+  configuration: PropTypes.shape({
+    renderFill: PropTypes.bool.isRequired,
+    renderOutline: PropTypes.bool.isRequired,
+    shouldRenderInactiveLabelmaps: PropTypes.bool.isRequired,
+    fillAlpha: PropTypes.oneOfType([PropTypes.string, PropTypes.number]).isRequired, /* TODO: why fillAlpha is string? */
+    outlineAlpha: PropTypes.oneOfType([PropTypes.string, PropTypes.number]).isRequired, /* TODO: why fillAlpha is string? */
+    outlineWidth: PropTypes.number.isRequired,
+    fillAlphaInactive: PropTypes.number.isRequired,
+    outlineAlphaInactive: PropTypes.number.isRequired,
+  }).isRequired,
+  onBack: PropTypes.func.isRequired,
+  onChange: PropTypes.func.isRequired,
+};
+
+export default SegmentationSettings;