Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revert "Kpmp 3106 remove slide size limit" #75

Merged
merged 2 commits into from
Oct 29, 2021
Merged

Revert "Kpmp 3106 remove slide size limit" #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a7bff62
Revert "Kpmp 3106 remove slide size limit"
abarkellumich Oct 28, 2021
230bf09
up slide grid limit
abarkellumich Oct 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 4 additions & 8 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion src/components/Slides/Menu/Menu.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ class Menu extends Component {
customCrossIcon={false} >
<SlideListContainer
showGrid={this.props.showGrid}
slideTooLarge={this.props.slideTooLarge}
isPilotSlide={this.props.isPilotSlide}
rlreamy marked this conversation as resolved.
Show resolved Hide resolved
showGridLabel={this.props.showGridLabel}
handleShowGridToggle={this.props.handleShowGridToggle}
handleShowLabelToggle={this.props.handleShowLabelToggle}
Expand All @@ -47,4 +49,4 @@ class Menu extends Component {

}

export default Menu;
export default Menu;
106 changes: 51 additions & 55 deletions src/components/Slides/Menu/SlideList.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,64 +1,60 @@
import React, { Component } from "react";
import { Col, Row } from "reactstrap";
import { noSlidesFound, getStainImageName } from "../slideHelpers.js";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import { faBorderAll } from "@fortawesome/free-solid-svg-icons";
import React, { Component } from 'react';
import { Col, Row } from 'reactstrap';
import {
noSlidesFound,
getStainImageName,
determineIfSlideTooLargeForGrid,
determineIfPilotSlide
} from '../slideHelpers.js';
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
import { faBorderAll } from '@fortawesome/free-solid-svg-icons';

import Header from "./Header";

import Header from './Header';

class SlideList extends Component {
constructor(props) {
super(props);
this.handleSelectSlide = this.handleSelectSlide.bind(this);
}

handleSelectSlide(slide) {
this.props.setSelectedSlide(slide);
this.props.toggleMenu(true);
}
constructor(props) {
super(props);
this.handleSelectSlide = this.handleSelectSlide.bind(this);
}

handleSelectSlide(slide) {
this.props.setSelectedSlide(slide);
this.props.toggleMenu(true);
}

componentDidUpdate() {
noSlidesFound(this.props.selectedParticipant);
}

componentDidUpdate() {
noSlidesFound(this.props.selectedParticipant);
}
render() {
const isPilotSlide = determineIfPilotSlide(this.props.participants, this.props.selectedParticipant)
return (
<div id="menu-slide-list">
<Header {...this.props} />
<Col id="slides-col">
<div id="menu-slide-list-slides">
{
this.props.selectedParticipant.slides.map(function (slide, index) {
let slideTooLarge = determineIfSlideTooLargeForGrid(slide.metadata)
let highlightedClass = this.props.selectedParticipant.selectedSlide.id === slide.id ? " slide-highlighted" : "";
let thumbnailSrc = "img/thumbnail_stain_" + getStainImageName(slide.stain.type) + ".png";
return (
<Row className={"slide-menu-item " + highlightedClass} onClick={() => this.handleSelectSlide(slide)}>
<Col xs={{ size: "auto" }} className="no-padding"><img className="thumbnail noselect" src={thumbnailSrc} alt="" /></Col>
<Col xs={{ size: "auto" }} className="slide-name">{slide.slideName}</Col>
{slideTooLarge || isPilotSlide ? "" : <Col className="grid-icon" xs={{ size: "auto" }}><FontAwesomeIcon icon={faBorderAll} /></Col>}
</Row>
)
}, this)
}
</div>
</Col>
</div>
);

render() {
return (
<div id="menu-slide-list">
<Header {...this.props} />
<Col id="slides-col">
<div id="menu-slide-list-slides">
{this.props.selectedParticipant.slides.map(function (slide, index) {
let highlightedClass =
this.props.selectedParticipant.selectedSlide.id === slide.id
? " slide-highlighted"
: "";
let thumbnailSrc =
"img/thumbnail_stain_" +
getStainImageName(slide.stain.type) +
".png";
return (
<Row
className={"slide-menu-item " + highlightedClass}
onClick={() => this.handleSelectSlide(slide)}
>
<Col xs={{ size: "auto" }} className="no-padding">
<img
className="thumbnail noselect"
src={thumbnailSrc}
alt=""
/>
</Col>
<Col xs={{ size: "auto" }} className="slide-name">
{slide.slideName}
</Col>
</Row>
);
}, this)}
</div>
</Col>
</div>
);
}
}
}

export default SlideList;
19 changes: 15 additions & 4 deletions src/components/Slides/SlideViewer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React, { Component } from 'react';
import OpenSeadragon from 'openseadragon';
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
import { faPlus, faMinus, faCrosshairs } from '@fortawesome/free-solid-svg-icons';
import { noSlidesFound, getNextLetterInAlphabet } from './slideHelpers';
import { noSlidesFound, determineIfSlideTooLargeForGrid, determineIfPilotSlide, getNextLetterInAlphabet } from './slideHelpers';
import Menu from './Menu/Menu';
import PropTypes from 'prop-types';
import DivOverlays from './DivOverlays';
Expand All @@ -28,6 +28,8 @@ class SlideViewer extends Component {
overlayLabel: [],
renderLabels: true,
labelSetId: 0,
slideTooLarge: false,
isPilotSlide: false,
gridOverlay: []
}
}
Expand Down Expand Up @@ -59,12 +61,19 @@ class SlideViewer extends Component {
return false;
}


async renderOverlayLabels() {

await this.setState({slideTooLarge: determineIfSlideTooLargeForGrid(this.props.selectedParticipant.selectedSlide.metadata, this.state.vertical),
isPilotSlide: determineIfPilotSlide(this.props.participants, this.props.selectedParticipant)});

if (!this.state.isPilotSlide && !this.state.slideTooLarge ) {
const [gridOverlay, overlayLabel] = await this.getGridOverlay( // eslint-disable-line
this.props.selectedParticipant.selectedSlide.metadata,
this.state.labelSetId + 1);
await this.setState({ overlayLabel, gridOverlay, renderLabels: false, labelSetId: this.state.labelSetId + 1 })
await this.setState({ renderLabels: true })
}
}

getNextLetterInAlphabet(currentLetter = '') {
Expand Down Expand Up @@ -153,7 +162,7 @@ class SlideViewer extends Component {
}

handleShowGridToggle() {
if (this.state.showGrid) {
if (this.state.showGrid || this.state.slideTooLarge || this.state.isPilotSlide) {
this.setState({ showGrid: false, showGridLabel: false })
} else {
this.setState({ showGrid: true })
Expand Down Expand Up @@ -193,6 +202,8 @@ class SlideViewer extends Component {
handleCancelGridPropertiesClick={this.handleCancelGridPropertiesClick}
showGrid={this.state.showGrid}
showGridLabel={this.state.showGridLabel}
slideTooLarge={this.state.slideTooLarge}
isPilotSlide={this.state.isPilotSlide}
handleSetGridPropertiesClick={this.handleSetGridPropertiesClick}
vertical={this.state.vertical}
horizontal={this.state.horizontal}
Expand All @@ -201,7 +212,7 @@ class SlideViewer extends Component {
selectedParticipant={this.props.selectedParticipant} />

<div className="osd-div" ref={node => { this.el = node; }}>
<div className={`openseadragon ${(this.state.showGrid) ? 'showGridlines' : 'hideGridlines'}`} id="osdId"></div>
<div className={`openseadragon ${(this.state.showGrid && !this.state.slideTooLarge && !this.state.isPilotSlide) ? 'showGridlines' : 'hideGridlines'}`} id="osdId"></div>
<ul className="osd-toolbar">
<li><div className="osd-button" id="zoom-in"><FontAwesomeIcon icon={faPlus} /></div></li>
<li><div className="osd-button" id="zoom-out"><FontAwesomeIcon icon={faMinus} /></div></li>
Expand All @@ -221,4 +232,4 @@ SlideViewer.propTypes = {
selectedParticipant: PropTypes.object.isRequired,
};

export default SlideViewer;
export default SlideViewer;
4 changes: 2 additions & 2 deletions src/components/Slides/slideHelpers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ export const determineIfSlideTooLargeForGrid = (metadata, verticalGridSize = 500
let innerLoopCount = (width - (vertical * 4)) / vertical;
let numberOfLabels = Math.ceil(outerLoopCount) * Math.ceil(innerLoopCount);

if (numberOfLabels > 620) {
if (numberOfLabels > 775) {
return true;
} else {
return false;
Expand Down Expand Up @@ -194,4 +194,4 @@ export const getGridOverlay = (metadata, labelSetId, verticalSize, horizontalSiz
console.error('Metadata not provided with slide')
}
return [overlay, overlayLabel];
}
}
32 changes: 32 additions & 0 deletions src/components/Slides/slideHelpers.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,38 @@ describe('getStainImageName', () => {
});
});

describe('determineIfSlideTooLargeForGrid', () => {

it('should return true for large images', () => {
let metadata = {
aperio : {
originalWidth: 164592,
originalHeight: 67372
},
openSlide : {
mpp_y: .25
}
};
let result = determineIfSlideTooLargeForGrid(metadata, 500);
expect(result).toEqual(true)
});

it('should return false for small enough images', () => {
let metadata = {
aperio : {
originalWidth: 44592,
originalHeight: 67372
},
openSlide : {
mpp_y: .25
}
};
let result = determineIfSlideTooLargeForGrid(metadata, 500);
expect(result).toEqual(false);
})

});

describe('getNextLetterInAlphabet', () => {

it('should return the next letter', () => {
Expand Down