bombinans/poptimal
1
0
Fork 0
Code Issues 11 Pull Requests Packages Projects 1 Releases Wiki Activity

Merge branch 'main' into rc-1.2.1

Browse Source
This commit is contained in:
Mike Lynch 2025-04-20 14:58:46 +10:00
commit 31c093e1ed
3 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
poptimal.js
View File

@ -18,7 +18,7 @@ import {ColourNamer} from './src/components/colour_namer.js';
const CELL = 10; const CELL = 10;
const MAG = 2; const MAG = 2;
const WIDTH = 20; const WIDTH = 200;
const HEIGHT = WIDTH; const HEIGHT = WIDTH;
// number of pixels which have to be visible for a colour to be // number of pixels which have to be visible for a colour to be
// mentioned in the alt text // mentioned in the alt text
@ -36,10 +36,12 @@ function randomise_params() {
f: random.choice(RADIUS_OPTS), f: random.choice(RADIUS_OPTS),
r: random.float(0, 0.4), r: random.float(0, 0.4),
}}); }});
const cell = 5 + random.float() * random.float() * 55;
return { return {
background: palette[0], background: palette[0],
palette: palette_name, palette: palette_name,
patterns: patterns patterns: patterns,
cell: cell,
} }
} }
@ -134,18 +136,21 @@ function poptimal_svg(params) {
const document = window.document; const document = window.document;
const container = d3.select(document.body).append("div"); const container = d3.select(document.body).append("div");
const dm = new DotMaker(WIDTH); const width = WIDTH / params.cell;
const height = WIDTH / params.cell;
const dm = new DotMaker(width, height);
const svg = container.append("svg") const svg = container.append("svg")
.attr("width", WIDTH * CELL * MAG) .attr("width", WIDTH * MAG)
.attr("height", HEIGHT * CELL * MAG) .attr("height", HEIGHT * MAG)
.attr("viewBox", [ 0, 0, WIDTH, HEIGHT ]); .attr("viewBox", [ 0, 0, width, height ]);
const background = svg.append("rect") const background = svg.append("rect")
.attr("x", 0) .attr("x", 0)
.attr("y", 0) .attr("y", 0)
.attr("width", WIDTH) .attr("width", width)
.attr("height", WIDTH) .attr("height", height)
.attr("fill", params.background); .attr("fill", params.background);
@ -227,7 +232,6 @@ async function main() {
const colourf = params.palette === 'grayscale' ? cf['grayscale'] : cf['colour']; const colourf = params.palette === 'grayscale' ? cf['grayscale'] : cf['colour'];
const namer = new ColourNamer(); const namer = new ColourNamer();
console.log(`Loading colours ${colourf}`);
await namer.load_colours(colourf); await namer.load_colours(colourf);
@ -250,7 +254,7 @@ async function main() {
// so we don't include obscured colours // so we don't include obscured colours
const hist = await get_histogram(imgfile); const hist = await get_histogram(imgfile);
const alt_text = image_description(namer, params, hist); const alt_text = image_description(namer, params, hist);
params.alt_text = alt_text;
await save_params(paramsfile, params); await save_params(paramsfile, params);
console.log(alt_text); console.log(alt_text);
console.log(imgfile); console.log(imgfile);

1
src/components/dots.js
View File

@ -57,7 +57,6 @@ function int_range(v1, v2) {
class DotMaker { class DotMaker {
constructor(width, height) { constructor(width, height) {
console.log(width, height);
this.width = width; this.width = width;
this.height = height; this.height = height;
this.wh = 0.5 * (width + height); this.wh = 0.5 * (width + height);

4
src/index.md
View File

@ -144,8 +144,8 @@ const dots2 = dm.dots(1 / m2, n2, false);
const svg = d3.create("svg") const svg = d3.create("svg")
.attr("width", width * cell * MAG) .attr("width", WIDTH * MAG)
.attr("height", height * cell * MAG) .attr("height", HEIGHT * MAG)
.attr("viewBox", [ 0, 0, width, height ]); .attr("viewBox", [ 0, 0, width, height ]);