Checkpoint

This commit is contained in:
Emanuele Bezzi
2021-12-06 14:57:10 -05:00
parent b1ff638879
commit b048bbfd0c
4 changed files with 12 additions and 6 deletions
@@ -56,15 +56,15 @@ export default function drawSpatialImageRegl(regl) {
a_position: [ a_position: [
0, 0,
0, 0,
0 + 2000, 0 + 1921,
0, 0,
0, 0,
0 + 2000, 0 + 2000,
0, 0,
0 + 2000, 0 + 2000,
0 + 2000, 0 + 1921,
0, 0,
0 + 2000, 0 + 1921,
0 + 2000, 0 + 2000,
], ],
}, },
@@ -73,7 +73,8 @@ export default function drawSpatialImageRegl(regl) {
projView: regl.prop("projView"), projView: regl.prop("projView"),
u_image: regl.prop("spatialImageAsTexture"), u_image: regl.prop("spatialImageAsTexture"),
color: [1, 0, 0, 1], color: [1, 0, 0, 1],
u_resolution: [2000, 2000], u_resolution: [1921, 2000],
// translate:
}, },
count: 6, count: 6,
+2
View File
@@ -122,6 +122,7 @@ class Graph extends React.Component {
positions[2 * i] = p[0]; positions[2 * i] = p[0];
positions[2 * i + 1] = p[1]; positions[2 * i + 1] = p[1];
} }
console.log({ transformed: positions });
return positions; return positions;
}); });
@@ -759,6 +760,7 @@ class Graph extends React.Component {
const { positions, colors, flags, height, width } = asyncProps; const { positions, colors, flags, height, width } = asyncProps;
this.cachedAsyncProps = asyncProps; this.cachedAsyncProps = asyncProps;
const { pointBuffer, colorBuffer, flagBuffer } = this.state; const { pointBuffer, colorBuffer, flagBuffer } = this.state;
console.log({ pos2: positions });
let needToRenderCanvas = false; let needToRenderCanvas = false;
if (height !== prevAsyncProps?.height || width !== prevAsyncProps?.width) { if (height !== prevAsyncProps?.height || width !== prevAsyncProps?.width) {
+1 -1
View File
@@ -420,7 +420,7 @@ def spatial_image_get(request, data_adaptor):
return abort_and_log(HTTPStatus.BAD_REQUEST, f"spatial information does not contain requested resolution '{resolution}'") return abort_and_log(HTTPStatus.BAD_REQUEST, f"spatial information does not contain requested resolution '{resolution}'")
response_image = io.BytesIO() response_image = io.BytesIO()
img = np.flipud(spatial[library_id]["images"][resolution]) img = spatial[library_id]["images"][resolution]
matplotlib.pyplot.imsave(response_image, img) matplotlib.pyplot.imsave(response_image, img)
response_image.seek(0) response_image.seek(0)
+4 -1
View File
@@ -363,7 +363,10 @@ class DataAdaptor(metaclass=ABCMeta):
print(f"scale {scale}, translate {translate}") print(f"scale {scale}, translate {translate}")
normalized_layout = normalized_layout.astype(dtype=np.float32) A = embedding * 0.17011142
A = np.column_stack([A[:, 0] / 1921, A[:, 1] / 2000])
normalized_layout = A.astype(dtype=np.float32)
return normalized_layout return normalized_layout
def layout_to_fbs_matrix(self, fields): def layout_to_fbs_matrix(self, fields):