remember selectedColor
This commit is contained in:
parent
1f70d78fae
commit
e1801e0ee5
|
@ -38,7 +38,7 @@ export type CanvasState = {
|
||||||
historicalTime: string,
|
historicalTime: string,
|
||||||
// object with all canvas informations from all canvases like colors and size
|
// object with all canvas informations from all canvases like colors and size
|
||||||
canvases: Object,
|
canvases: Object,
|
||||||
// last canvas view, scale and viewscale
|
// last canvas view, scale, selectedColor and viewscale
|
||||||
// just used to get back to the previous coordinates when switching
|
// just used to get back to the previous coordinates when switching
|
||||||
// between canvases an back
|
// between canvases an back
|
||||||
// { 0: {scale: 12, viewscale: 12, view: [122, 1232]}, ... }
|
// { 0: {scale: 12, viewscale: 12, view: [122, 1232]}, ... }
|
||||||
|
@ -276,16 +276,6 @@ export default function canvasReducer(
|
||||||
canvasId = DEFAULT_CANVAS_ID;
|
canvasId = DEFAULT_CANVAS_ID;
|
||||||
canvas = canvases[DEFAULT_CANVAS_ID];
|
canvas = canvases[DEFAULT_CANVAS_ID];
|
||||||
}
|
}
|
||||||
// get previous view, scale and viewscale if possible
|
|
||||||
let viewscale = DEFAULT_SCALE;
|
|
||||||
let scale = DEFAULT_SCALE;
|
|
||||||
let view = [0, 0, 0];
|
|
||||||
if (prevCanvasCoords[canvasId]) {
|
|
||||||
view = prevCanvasCoords[canvasId].view;
|
|
||||||
viewscale = prevCanvasCoords[canvasId].viewscale;
|
|
||||||
scale = prevCanvasCoords[canvasId].scale;
|
|
||||||
}
|
|
||||||
//---
|
|
||||||
const {
|
const {
|
||||||
size: canvasSize,
|
size: canvasSize,
|
||||||
sd: canvasStartDate,
|
sd: canvasStartDate,
|
||||||
|
@ -294,6 +284,18 @@ export default function canvasReducer(
|
||||||
cli: clrIgnore,
|
cli: clrIgnore,
|
||||||
colors,
|
colors,
|
||||||
} = canvas;
|
} = canvas;
|
||||||
|
// get previous view, scale and viewscale if possible
|
||||||
|
let viewscale = DEFAULT_SCALE;
|
||||||
|
let scale = DEFAULT_SCALE;
|
||||||
|
let view = [0, 0, 0];
|
||||||
|
let selectedColor = clrIgnore;
|
||||||
|
if (prevCanvasCoords[canvasId]) {
|
||||||
|
view = prevCanvasCoords[canvasId].view;
|
||||||
|
viewscale = prevCanvasCoords[canvasId].viewscale;
|
||||||
|
scale = prevCanvasCoords[canvasId].scale;
|
||||||
|
selectedColor = prevCanvasCoords[canvasId].selectedColor;
|
||||||
|
}
|
||||||
|
//---
|
||||||
const isHistoricalView = !is3D && state.isHistoricalView;
|
const isHistoricalView = !is3D && state.isHistoricalView;
|
||||||
const historicalCanvasSize = getHistoricalCanvasSize(
|
const historicalCanvasSize = getHistoricalCanvasSize(
|
||||||
state.historicalDate,
|
state.historicalDate,
|
||||||
|
@ -304,16 +306,11 @@ export default function canvasReducer(
|
||||||
if (!is3D) {
|
if (!is3D) {
|
||||||
view.length = 2;
|
view.length = 2;
|
||||||
}
|
}
|
||||||
const {
|
|
||||||
view: prevView,
|
|
||||||
scale: prevScale,
|
|
||||||
viewscale: prevViewscale,
|
|
||||||
} = state;
|
|
||||||
return {
|
return {
|
||||||
...state,
|
...state,
|
||||||
canvasId,
|
canvasId,
|
||||||
canvasIdent,
|
canvasIdent,
|
||||||
selectedColor: clrIgnore,
|
selectedColor,
|
||||||
canvasSize,
|
canvasSize,
|
||||||
is3D,
|
is3D,
|
||||||
canvasStartDate,
|
canvasStartDate,
|
||||||
|
@ -328,9 +325,10 @@ export default function canvasReducer(
|
||||||
prevCanvasCoords: {
|
prevCanvasCoords: {
|
||||||
...state.prevCanvasCoords,
|
...state.prevCanvasCoords,
|
||||||
[prevCanvasId]: {
|
[prevCanvasId]: {
|
||||||
view: prevView,
|
view: state.view,
|
||||||
scale: prevScale,
|
scale: state.scale,
|
||||||
viewscale: prevViewscale,
|
viewscale: state.viewscale,
|
||||||
|
selectedColor: state.selectedColor,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in New Issue
Block a user