Skip to content

Change number of points slider to use a log scale and some other small cleanup #10

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

Open
alexprand wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Change number of points slider to use a log scale and some other small cleanup #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5e45b6f
Changing number of points slider to a log scale
alexprand Jan 5, 2020
d1f6340
Tweaks to remove some compiler warnings
alexprand Jan 5, 2020
53015cb
Removing some unecessary code.
alexprand Jan 7, 2020
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
4 changes: 2 additions & 2 deletions src/App.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ class App extends Component {
constructor(props) {
super(props);
this.state = {
numPoints: 2500,
numPoints: 1000,
backgroundColor:"#fdfdfd", // doesn't work with white or black -- strange
circleSpacing: 3,
shape: 'triangles',
Expand Down Expand Up @@ -193,7 +193,7 @@ class App extends Component {
circleSpacing: this.state.shape !== "circles",
smoothIters: this.state.smoothType === "none",
contrastIters: this.state.smoothType === "none",
backgroundColor: this.state.shape != "circles" && this.state.fill ? true : false
backgroundColor: this.state.shape !== "circles" && this.state.fill ? true : false
}

return (
Expand Down
13 changes: 12 additions & 1 deletion src/ControlPanel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,6 @@ class ControlPanel extends Component {
</div>
break;
case 'slider':

ele = <div key={ control.id } className="sliderWrapper">
{ (control.getDisabled === undefined || (control.getDisabled !== undefined && !control.getDisabled(this.props.disabled[control.id]))) &&
<div>
Expand All @@ -122,6 +121,18 @@ class ControlPanel extends Component {
</div> }
</div>
break;
case 'logslider':
ele = <div key={ control.id } className="sliderWrapper">
{ (control.getDisabled === undefined || (control.getDisabled !== undefined && !control.getDisabled(this.props.disabled[control.id]))) &&
<div>
<label>
{ control.getLabel(this.props.status[control.id]) }
</label>
<Slider id={ control.id } min={ 0 } max={ 100 } step={ 0.25 } onChange={ (e, val) => this.handleSliderChange(control.id, Math.round(Math.pow(10,(val/25+1)))) } onDragStop={ (e) => this.props.update(e, control.id, this.state[control.id]) }
defaultValue={ Math.log10(this.props.status[control.id])*25-25 } sliderStyle={ this.state.styles.slider } />
</div> }
</div>
break;
case 'checkbox':
ele = <div key={ control.id }>
{ (control.getDisabled === undefined || (control.getDisabled !== undefined && !control.getDisabled(this.props.disabled[control.id]))) &&
Expand Down
5 changes: 2 additions & 3 deletions src/ControlSettings.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,10 @@ const ControlSettings = [{
}]
}, {
id: 'numPoints',
type: 'slider',
type: 'logslider',
getLabel: (num) => "# of Points: " + num,
min: 10,
max: 50000,
step: 100
max: 100000
},
{
id: 'fitToScreen',
Expand Down
46 changes: 14 additions & 32 deletions src/PolygonUtils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,38 +123,20 @@ const PolygonUtils = {
let weight = 0;
let counter = 0;
for (let iW =0; iW < width; ++iW) {
if (iW % 2 === 0) {
for (let iH=0; iH < height; ++iH) {
weight = weights[counter];
++counter; // note: counter = iW*height+iH; but this is a little faster?
if (weight > 0.0) {
site = diagram.find(iW, iH).index; // find which polygon contains this pixels
if (weightedCentroidData[site][2] === 0.0) {
weightedCentroidData[site][0] = weight*iW;
weightedCentroidData[site][1] = weight*iH;
} else {
weightedCentroidData[site][0] += weight*iW;
weightedCentroidData[site][1] += weight*iH;
}
weightedCentroidData[site][2] += weight;
for (let iH=0; iH < height; ++iH) {
weight = weights[counter];
++counter; // note: counter = iW*height+iH; but this is a little faster?
if (weight > 0.0) {
site = diagram.find(iW, iH).index; // find which polygon contains this pixels
if (weightedCentroidData[site][2] === 0.0) {
weightedCentroidData[site][0] = weight*iW;
weightedCentroidData[site][1] = weight*iH;
} else {
weightedCentroidData[site][0] += weight*iW;
weightedCentroidData[site][1] += weight*iH;
}
}
} else {
for (let iH=height-1; iH >= 0; --iH) {
weight = weights[counter];
++counter; // note: counter = iW*height+iH; but this is a little faster?
if (weight > 0.0) {
site = diagram.find(iW, iH).index; // find which polygon contains this pixel
if (weightedCentroidData[site][2] === 0.0) {
weightedCentroidData[site][0] = weight*iW;
weightedCentroidData[site][1] = weight*iH;
} else {
weightedCentroidData[site][0] += weight*iW;
weightedCentroidData[site][1] += weight*iH;
}
weightedCentroidData[site][2] += weight;
}
}
weightedCentroidData[site][2] += weight;
}
}
}

Expand All @@ -169,7 +151,7 @@ const PolygonUtils = {
let snappedAny = false;
// Sites that edges of Voronoi cells that lie on the perimeter of
// the polygon will be snapped to the perimeter.
diagram.edges.map(function(edge) {
diagram.edges.forEach(function(edge) {
// Perimeter edges don't have a neighboring Voronoi site.
if (typeof edge.right === 'undefined') {
// If the site has already been snapped to the perimeter, skip it.
Expand Down
10 changes: 2 additions & 8 deletions src/Resampler.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,14 +113,8 @@ class Resampler {
this.weights = [];
if (this.smoothType === 'contrastWeighted') {
for (let iW =0; iW < this.width; ++iW) {
if (iW % 2 === 0) {
for (let iH=0; iH < this.height; ++iH) {
this.weights.push(this.approximateGradient(iW, iH, 1) + 1.0);
}
} else {
for (let iH=this.height-1; iH >= 0; --iH) {
this.weights.push(this.approximateGradient(iW, iH, 1) + 1.0);
}
for (let iH=0; iH < this.height; ++iH) {
this.weights.push(this.approximateGradient(iW, iH, 1) + 1.0);
}
}
// only need to redo the smoothing if we are using weighted smoothing
Expand Down