Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions src/components/GridfinityCalculator.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ const GridfinityCalculator: React.FC = () => {
customPrinterSize: settings.customPrinterSize,
useHalfSize: settings.useHalfSize,
preferHalfSize: settings.preferHalfSize,
preferUniformBaseplates: settings.preferUniformBaseplates,
numDrawers: settings.numDrawers,
});

Expand Down Expand Up @@ -102,6 +103,8 @@ const GridfinityCalculator: React.FC = () => {
setUseHalfSize={settings.setUseHalfSize}
preferHalfSize={settings.preferHalfSize}
setPreferHalfSize={settings.setPreferHalfSize}
preferUniformBaseplates={settings.preferUniformBaseplates}
setPreferUniformBaseplates={settings.setPreferUniformBaseplates}
/>
</CardContent>
</Card>
Expand Down
12 changes: 12 additions & 0 deletions src/components/GridfinityCalculator/BinOptions.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ const BinOptions = ({
setUseHalfSize,
preferHalfSize,
setPreferHalfSize,
preferUniformBaseplates,
setPreferUniformBaseplates,
}) => {
return (
<div className="space-y-6 p-4">
Expand Down Expand Up @@ -38,6 +40,16 @@ const BinOptions = ({
}}
/>
</div>
<div className="flex items-center justify-between">
<Label htmlFor="prefer-uniform-baseplates" className="flex-1">
Prefer uniform baseplate sizes
</Label>
<Switch
id="prefer-uniform-baseplates"
checked={preferUniformBaseplates}
onCheckedChange={setPreferUniformBaseplates}
/>
</div>
</div>
</div>
);
Expand Down
4 changes: 2 additions & 2 deletions src/contexts/SettingsContext.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ export const usePrinterSettings = () => {

// eslint-disable-next-line react-refresh/only-export-components
export const useBinOptions = () => {
const { useHalfSize, setUseHalfSize, preferHalfSize, setPreferHalfSize } = useSettings();
return { useHalfSize, setUseHalfSize, preferHalfSize, setPreferHalfSize };
const { useHalfSize, setUseHalfSize, preferHalfSize, setPreferHalfSize, preferUniformBaseplates, setPreferUniformBaseplates } = useSettings();
return { useHalfSize, setUseHalfSize, preferHalfSize, setPreferHalfSize, preferUniformBaseplates, setPreferUniformBaseplates };
};

// eslint-disable-next-line react-refresh/only-export-components
Expand Down
8 changes: 8 additions & 0 deletions src/hooks/useGridfinityCalculation.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ describe.skip('useGridfinityCalculation', () => {
customPrinterSize: null,
useHalfSize: false,
preferHalfSize: false,
preferUniformBaseplates: false,
numDrawers: 1,
})
);
Expand All @@ -64,6 +65,7 @@ describe.skip('useGridfinityCalculation', () => {
customPrinterSize: customSize,
useHalfSize: false,
preferHalfSize: false,
preferUniformBaseplates: false,
numDrawers: 1,
})
);
Expand All @@ -79,6 +81,7 @@ describe.skip('useGridfinityCalculation', () => {
customPrinterSize: null,
useHalfSize: true,
preferHalfSize: false,
preferUniformBaseplates: false,
numDrawers: 1,
})
);
Expand All @@ -95,6 +98,7 @@ describe.skip('useGridfinityCalculation', () => {
customPrinterSize: null,
useHalfSize: false,
preferHalfSize: false,
preferUniformBaseplates: false,
numDrawers: 3,
})
);
Expand All @@ -111,6 +115,7 @@ describe.skip('useGridfinityCalculation', () => {
customPrinterSize: null,
useHalfSize: false,
preferHalfSize: false,
preferUniformBaseplates: false,
numDrawers: 1,
}),
{
Expand Down Expand Up @@ -138,6 +143,7 @@ describe.skip('useGridfinityCalculation', () => {
customPrinterSize: null,
useHalfSize: false,
preferHalfSize: false,
preferUniformBaseplates: false,
numDrawers: 1,
})
);
Expand All @@ -154,6 +160,7 @@ describe.skip('useGridfinityCalculation', () => {
customPrinterSize: null,
useHalfSize: false,
preferHalfSize: false,
preferUniformBaseplates: false,
numDrawers: 1,
})
);
Expand All @@ -170,6 +177,7 @@ describe.skip('useGridfinityCalculation', () => {
customPrinterSize: null,
useHalfSize,
preferHalfSize: false,
preferUniformBaseplates: false,
numDrawers: 1,
}),
{
Expand Down
7 changes: 5 additions & 2 deletions src/hooks/useGridfinityCalculation.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ export interface CalculationInput {
customPrinterSize?: PrinterSize;
useHalfSize: boolean;
preferHalfSize: boolean;
preferUniformBaseplates: boolean;
numDrawers: number;
}

Expand Down Expand Up @@ -42,6 +43,7 @@ export const useGridfinityCalculation = ({
customPrinterSize,
useHalfSize,
preferHalfSize,
preferUniformBaseplates,
numDrawers,
}: CalculationInput): CalculationOutput => {
const [result, setResult] = useState<CalculationResultWithDrawers | null>(null);
Expand All @@ -63,9 +65,10 @@ export const useGridfinityCalculation = ({
drawerSize,
printerSize,
useHalfSize,
preferHalfSize
preferHalfSize,
preferUniformBaseplates
);
}, [drawerSize, printerSize, useHalfSize, preferHalfSize]);
}, [drawerSize, printerSize, useHalfSize, preferHalfSize, preferUniformBaseplates]);

// Update state when calculation changes
useEffect(() => {
Expand Down
10 changes: 10 additions & 0 deletions src/hooks/useGridfinitySettings.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ export interface GridfinitySettings {
setUseHalfSize: (value: boolean) => void;
preferHalfSize: boolean;
setPreferHalfSize: (value: boolean) => void;
preferUniformBaseplates: boolean;
setPreferUniformBaseplates: (value: boolean) => void;

// Drawer count
numDrawers: number;
Expand Down Expand Up @@ -63,6 +65,11 @@ export const useGridfinitySettings = (): GridfinitySettings => {
false
);

const [preferUniformBaseplates, setPreferUniformBaseplates] = usePersistedState<boolean>(
'gridfinity_preferUniformBaseplates',
false
);

// Number of drawers
const [numDrawers, setNumDrawers] = usePersistedState<number>(
'gridfinity_numDrawers',
Expand Down Expand Up @@ -98,6 +105,7 @@ export const useGridfinitySettings = (): GridfinitySettings => {
setSelectedPrinter('Bambu Lab A1');
setUseHalfSize(false);
setPreferHalfSize(false);
setPreferUniformBaseplates(false);
setNumDrawers(1);
setUseMm(false);
setCustomPrinterSize({ x: 200, y: 200, z: 200 });
Expand All @@ -117,6 +125,8 @@ export const useGridfinitySettings = (): GridfinitySettings => {
setUseHalfSize: handleUseHalfSizeChange,
preferHalfSize,
setPreferHalfSize: handlePreferHalfSizeChange,
preferUniformBaseplates,
setPreferUniformBaseplates,

// Drawer count
numDrawers,
Expand Down
Loading
Loading