Skip to content

Align crowding bounds with the displayed triplet #121

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
sajjad-mazaheri wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Align crowding bounds with the displayed triplet #121

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
60935e4
for threshold: Bug fix: use selected target and flankers for typograp…
sajjad-mazaheri Jul 19, 2026
1cd0b43
Guard selected typographic crowding characters
sajjad-mazaheri Jul 21, 2026
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
19 changes: 15 additions & 4 deletions components/boundingNew.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,6 +324,7 @@ export const restrictLevelBeforeFixation = (
fontCharacterSet,
spacingDirection = "horizontal",
targetSizeIsHeightBool = false,
letterCharacters,
) => {
const quickCase = getQuickCase(
targetTask,
Expand All @@ -347,10 +348,20 @@ export const restrictLevelBeforeFixation = (
targetString = sampleWithoutReplacement(fontCharacterSet, 1)[0];
characterSet = targetString;
} else if (quickCase === "typographicCrowding") {
[targetString, flanker1String, flanker2String] = sampleWithoutReplacement(
fontCharacterSet,
3,
);
const { target, flanker1, flanker2 } = letterCharacters ?? {};
const selectedCharacters = [target, flanker1, flanker2];
if (
selectedCharacters.some(
(character) => typeof character !== "string" || character.length === 0,
)
) {
throw new Error(
"Typographic crowding requires a selected target and two flankers.",
);
}
targetString = target;
flanker1String = flanker1;
flanker2String = flanker2;
characterSet = [flanker1String, targetString, flanker2String];
Comment on lines 350 to 365
} else if (quickCase === "ratioCrowding") {
switch (spacingDirection) {
Expand Down
7 changes: 5 additions & 2 deletions components/stimulusGeneration.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import type {
RsvpReadingStimulusResults,
VernierStimulusResults,
TextStimsLetter,
CharactersLetter,
} from "./stimulus";
import { rc, viewingDistanceCm } from "./global";
import { Screens } from "./multiple-displays/globals";
Expand Down Expand Up @@ -127,7 +128,7 @@ const getLettersStimulus = (
reader,
extraInfo.characterSetBoundingRect,
extraInfo.stage as PartOfTrial,
extraInfo.characters.target,
extraInfo.characters,
extraInfo.proposedLevel,
));
}
Expand Down Expand Up @@ -272,13 +273,14 @@ const getLettersStimulusV2 = (
reader: ParamReader,
characterSetBoundingRectOld: any,
stage: PartOfTrial,
targetCharacter?: string,
letterCharacters: CharactersLetter,
proposedLevel?: number,
): {
level: number;
stimulusParameters: any;
characterSetBoundingRect: any;
} => {
const targetCharacter = letterCharacters.target;
if (stage === "afterFixation" && !(targetCharacter && proposedLevel)) {
throw new Error(
`targetCharacter (${targetCharacter}) and proposedLevel (${proposedLevel}) must be provided for afterFixation letter stimulus generation.`,
Expand All @@ -304,6 +306,7 @@ const getLettersStimulusV2 = (
String(reader.read("fontCharacterSet", block_condition)).split(""),
reader.read("spacingDirection", block_condition),
reader.read("targetSizeIsHeightBool", block_condition),
letterCharacters,
);
} else if (stage === "afterFixation") {
[level, stimulusParameters] = restrictLevelAfterFixation(
Expand Down