kopia lustrzana https://github.com/OpenDroneMap/WebODM
Automatically select 2/98 percentile values in plant health
rodzic
e8f8f2f130
commit
ed6a43699f
|
@ -207,6 +207,8 @@ class Metadata(TaskNestedView):
|
||||||
for b in info['statistics']:
|
for b in info['statistics']:
|
||||||
info['statistics'][b]['min'] = hrange[0]
|
info['statistics'][b]['min'] = hrange[0]
|
||||||
info['statistics'][b]['max'] = hrange[1]
|
info['statistics'][b]['max'] = hrange[1]
|
||||||
|
info['statistics'][b]['percentiles'][0] = max(hrange[0], info['statistics'][b]['percentiles'][0])
|
||||||
|
info['statistics'][b]['percentiles'][1] = min(hrange[1], info['statistics'][b]['percentiles'][1])
|
||||||
|
|
||||||
cmap_labels = {
|
cmap_labels = {
|
||||||
"viridis": "Viridis",
|
"viridis": "Viridis",
|
||||||
|
|
|
@ -10,13 +10,17 @@ export default class Histogram extends React.Component {
|
||||||
colorMap: null,
|
colorMap: null,
|
||||||
onUpdate: null,
|
onUpdate: null,
|
||||||
loading: false,
|
loading: false,
|
||||||
|
min: null,
|
||||||
|
max: null
|
||||||
};
|
};
|
||||||
static propTypes = {
|
static propTypes = {
|
||||||
statistics: PropTypes.object.isRequired,
|
statistics: PropTypes.object.isRequired,
|
||||||
colorMap: PropTypes.array,
|
colorMap: PropTypes.array,
|
||||||
width: PropTypes.number,
|
width: PropTypes.number,
|
||||||
onUpdate: PropTypes.func,
|
onUpdate: PropTypes.func,
|
||||||
loading: PropTypes.bool
|
loading: PropTypes.bool,
|
||||||
|
min: PropTypes.number,
|
||||||
|
max: PropTypes.number
|
||||||
}
|
}
|
||||||
|
|
||||||
constructor(props){
|
constructor(props){
|
||||||
|
@ -53,11 +57,19 @@ export default class Histogram extends React.Component {
|
||||||
this.rangeX = [minX, maxX];
|
this.rangeX = [minX, maxX];
|
||||||
this.rangeY = [minY, maxY];
|
this.rangeY = [minY, maxY];
|
||||||
|
|
||||||
|
let min = minX;
|
||||||
|
let max = maxX;
|
||||||
|
|
||||||
|
if (this.props.min !== null && this.props.max !== null){
|
||||||
|
min = this.props.min;
|
||||||
|
max = this.props.max;
|
||||||
|
}
|
||||||
|
|
||||||
const st = {
|
const st = {
|
||||||
min: minX.toFixed(3),
|
min: min,
|
||||||
max: maxX.toFixed(3),
|
max: max,
|
||||||
minInput: minX.toFixed(3),
|
minInput: min.toFixed(3),
|
||||||
maxInput: maxX.toFixed(3)
|
maxInput: max.toFixed(3)
|
||||||
};
|
};
|
||||||
|
|
||||||
if (!this.state){
|
if (!this.state){
|
||||||
|
@ -183,7 +195,7 @@ export default class Histogram extends React.Component {
|
||||||
maxLine.setAttribute('x2', newX);
|
maxLine.setAttribute('x2', newX);
|
||||||
|
|
||||||
if (prevX !== newX){
|
if (prevX !== newX){
|
||||||
self.setState({max: (self.rangeX[0] + ((self.rangeX[1] - self.rangeX[0]) / width) * newX).toFixed(3)});
|
self.setState({max: (self.rangeX[0] + ((self.rangeX[1] - self.rangeX[0]) / width) * newX)});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
@ -201,7 +213,7 @@ export default class Histogram extends React.Component {
|
||||||
minLine.setAttribute('x2', newX);
|
minLine.setAttribute('x2', newX);
|
||||||
|
|
||||||
if (prevX !== newX){
|
if (prevX !== newX){
|
||||||
self.setState({min: (self.rangeX[0] + ((self.rangeX[1] - self.rangeX[0]) / width) * newX).toFixed(3)});
|
self.setState({min: (self.rangeX[0] + ((self.rangeX[1] - self.rangeX[0]) / width) * newX)});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
@ -237,8 +249,9 @@ export default class Histogram extends React.Component {
|
||||||
}
|
}
|
||||||
|
|
||||||
componentDidUpdate(prevProps, prevState){
|
componentDidUpdate(prevProps, prevState){
|
||||||
if (prevState.min !== this.state.min) this.state.minInput = this.state.min;
|
if (prevState.min !== this.state.min || prevState.max !== this.state.max){
|
||||||
if (prevState.max !== this.state.max) this.state.maxInput = this.state.max;
|
this.setState({minInput: this.state.min.toFixed(3), maxInput: this.state.max.toFixed(3)});
|
||||||
|
}
|
||||||
|
|
||||||
if (prevState.min !== this.state.min ||
|
if (prevState.min !== this.state.min ||
|
||||||
prevState.max !== this.state.max ||
|
prevState.max !== this.state.max ||
|
||||||
|
|
|
@ -65,7 +65,6 @@ export default class LayersControlLayer extends React.Component {
|
||||||
exportLoading: false,
|
exportLoading: false,
|
||||||
error: ""
|
error: ""
|
||||||
};
|
};
|
||||||
|
|
||||||
this.rescale = params.rescale || "";
|
this.rescale = params.rescale || "";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -170,7 +169,14 @@ export default class LayersControlLayer extends React.Component {
|
||||||
// Update rescale values
|
// Update rescale values
|
||||||
const { statistics } = this.tmeta;
|
const { statistics } = this.tmeta;
|
||||||
if (statistics && statistics["1"]){
|
if (statistics && statistics["1"]){
|
||||||
this.rescale = `${statistics["1"]["min"]},${statistics["1"]["max"]}`;
|
let min = Infinity;
|
||||||
|
let max = -Infinity;
|
||||||
|
|
||||||
|
for (let b in statistics){
|
||||||
|
min = Math.min(statistics[b]["percentiles"][0]);
|
||||||
|
max = Math.max(statistics[b]["percentiles"][1]);
|
||||||
|
}
|
||||||
|
this.rescale = `${min},${max}`;
|
||||||
}
|
}
|
||||||
|
|
||||||
this.updateLayer();
|
this.updateLayer();
|
||||||
|
@ -270,6 +276,16 @@ export default class LayersControlLayer extends React.Component {
|
||||||
cmapValues = (color_maps.find(c => c.key === colorMap) || {}).color_map;
|
cmapValues = (color_maps.find(c => c.key === colorMap) || {}).color_map;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
let hmin = null;
|
||||||
|
let hmax = null;
|
||||||
|
if (this.rescale){
|
||||||
|
let parts = decodeURIComponent(this.rescale).split(",");
|
||||||
|
if (parts.length === 2 && parts[0] && parts[1]){
|
||||||
|
hmin = parseFloat(parts[0]);
|
||||||
|
hmax = parseFloat(parts[1]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return (<div className="layers-control-layer">
|
return (<div className="layers-control-layer">
|
||||||
{!this.props.overlay ? <ExpandButton bind={[this, 'expanded']} /> : <div className="overlayIcon"><i className={meta.icon || "fa fa-vector-square fa-fw"}></i></div>}<Checkbox bind={[this, 'visible']}/>
|
{!this.props.overlay ? <ExpandButton bind={[this, 'expanded']} /> : <div className="overlayIcon"><i className={meta.icon || "fa fa-vector-square fa-fw"}></i></div>}<Checkbox bind={[this, 'visible']}/>
|
||||||
<a title={meta.name} className="layer-label" href="javascript:void(0);" onClick={this.handleLayerClick}>{meta.name}</a>
|
<a title={meta.name} className="layer-label" href="javascript:void(0);" onClick={this.handleLayerClick}>{meta.name}</a>
|
||||||
|
@ -278,8 +294,10 @@ export default class LayersControlLayer extends React.Component {
|
||||||
<div className="layer-expanded">
|
<div className="layer-expanded">
|
||||||
<Histogram width={274}
|
<Histogram width={274}
|
||||||
loading={histogramLoading}
|
loading={histogramLoading}
|
||||||
statistics={tmeta.statistics}
|
statistics={tmeta.statistics}
|
||||||
colorMap={cmapValues}
|
colorMap={cmapValues}
|
||||||
|
min={hmin}
|
||||||
|
max={hmax}
|
||||||
onUpdate={this.handleHistogramUpdate} />
|
onUpdate={this.handleHistogramUpdate} />
|
||||||
|
|
||||||
<ErrorMessage bind={[this, "error"]} />
|
<ErrorMessage bind={[this, "error"]} />
|
||||||
|
|
|
@ -169,7 +169,22 @@ class Map extends React.Component {
|
||||||
const params = Utils.queryParams({search: tileUrl.slice(tileUrl.indexOf("?"))});
|
const params = Utils.queryParams({search: tileUrl.slice(tileUrl.indexOf("?"))});
|
||||||
if (statistics["1"]){
|
if (statistics["1"]){
|
||||||
// Add rescale
|
// Add rescale
|
||||||
params["rescale"] = encodeURIComponent(`${statistics["1"]["min"]},${statistics["1"]["max"]}`);
|
let min = Infinity;
|
||||||
|
let max = -Infinity;
|
||||||
|
if (type === 'plant'){
|
||||||
|
// percentile
|
||||||
|
for (let b in statistics){
|
||||||
|
min = Math.min(statistics[b]["percentiles"][0]);
|
||||||
|
max = Math.max(statistics[b]["percentiles"][1]);
|
||||||
|
}
|
||||||
|
}else{
|
||||||
|
// min/max
|
||||||
|
for (let b in statistics){
|
||||||
|
min = Math.min(statistics[b]["min"]);
|
||||||
|
max = Math.max(statistics[b]["max"]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
params["rescale"] = encodeURIComponent(`${min},${max}`);
|
||||||
}else{
|
}else{
|
||||||
console.warn("Cannot find min/max statistics for dataset, setting to -1,1");
|
console.warn("Cannot find min/max statistics for dataset, setting to -1,1");
|
||||||
params["rescale"] = encodeURIComponent("-1,1");
|
params["rescale"] = encodeURIComponent("-1,1");
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "WebODM",
|
"name": "WebODM",
|
||||||
"version": "2.4.1",
|
"version": "2.4.2",
|
||||||
"description": "User-friendly, extendable application and API for processing aerial imagery.",
|
"description": "User-friendly, extendable application and API for processing aerial imagery.",
|
||||||
"main": "index.js",
|
"main": "index.js",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
|
|
Ładowanie…
Reference in New Issue