Skip to content

Commit 457a139

Browse files
trautmanetrautmane
committed
change encodedViridisShader to encodedRedGreenShader for neuroglancer cross correlation URLs
1 parent 9dfcc82 commit 457a139

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

‎render-ws-java-client/src/main/java/org/janelia/render/client/n5/CrossCorrelationWithNextRegionalDataN5Writer.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -283,8 +283,8 @@ private static String buildNgUrlString(final StackMetaData stackMetaData,
283283
basePath,
284284
rendererUrl,
285285
stackDimensions);
286-
@SuppressWarnings("SpellCheckingInspection")
287-
final String encodedViridisShader = "%22shader%22:%22#uicontrol%20invlerp%20normalized%5Cn%5Cnvec3%20viridis_quintic%28%20float%20x%20%29%5Cn%7B%5Cn%5Ctvec4%20x1%20=%20vec4%28%201.0%2C%20x%2C%20x%20%2A%20x%2C%20x%20%2A%20x%20%2A%20x%20%29%3B%20//%201%20x%20x2%20x3%5Cn%5Ctvec4%20x2%20=%20x1%20%2A%20x1.w%20%2A%20x%3B%20//%20x4%20x5%20x6%20x7%5Cn%5Ctreturn%20vec3%28%5Cn%5Ct%5Ctdot%28%20x1.xyzw%2C%20vec4%28%20+0.280268003%2C%20-0.143510503%2C%20+2.225793877%2C%20-14.815088879%20%29%20%29%20+%20dot%28%20x2.xy%2C%20vec2%28%20+25.212752309%2C%20-11.772589584%20%29%20%29%2C%5Cn%5Ct%5Ctdot%28%20x1.xyzw%2C%20vec4%28%20-0.002117546%2C%20+1.617109353%2C%20-1.909305070%2C%20+2.701152864%20%29%20%29%20+%20dot%28%20x2.xy%2C%20vec2%28%20-1.685288385%2C%20+0.178738871%20%29%20%29%2C%5Cn%5Ct%5Ctdot%28%20x1.xyzw%2C%20vec4%28%20+0.300805501%2C%20+2.614650302%2C%20-12.019139090%2C%20+28.933559110%20%29%20%29%20+%20dot%28%20x2.xy%2C%20vec2%28%20-33.491294770%2C%20+13.762053843%20%29%20%29%20%29%3B%5Cn%7D%5Cn%20%20%5Cnvoid%20main%28%29%20%7B%5Cn%20%20vec3%20color%20=%20viridis_quintic%28normalized%28%29%29%3B%5Cn%20%20float%20alpha%20=%20normalized%28%29%3B%5Cn%20%20emitRGBA%28vec4%28color%2C%20alpha%29%29%3B%5Cn%7D%5Cn%22%2C";
286+
final String encodedRedGreenShader = "%22shader%22:%22#uicontrol%20invlerp%20normalized%5Cn%5Cnfloat%20colormap_red%28float%20x%29%20%7B%5Cn%5Ctif%20%28x%20%3C%200.09825118520770205%29%20%7B%5Cn%5Ct%5Ctreturn%205.07556923076926E+02%20%2A%20x%20+%201.64923076923077E+02%3B%5Cn%5Ct%7D%20else%20if%20%28x%20%3C%200.2009111350471108%29%20%7B%5Cn%5Ct%5Ctreturn%202.86362637362647E+02%20%2A%20x%20+%201.86655677655676E+02%3B%5Cn%5Ct%7D%20else%20if%20%28x%20%3C%200.2994418666360456%29%20%7B%5Cn%5Ct%5Ctreturn%208.90415982485030E+01%20%2A%20x%20+%202.26299671592774E+02%3B%5Cn%5Ct%7D%20else%20if%20%28x%20%3C%200.5001300871372223%29%20%7B%5Cn%5Ct%5Ctreturn%209.81627851140242E+00%20%2A%20x%20+%202.50023049219689E+02%3B%5Cn%5Ct%7D%20else%20if%20%28x%20%3C%200.9039205014705658%29%20%7B%5Cn%5Ct%5Ctreturn%20%28%28-3.30848798119696E+01%20%2A%20x%20-%205.65722561191396E+02%29%20%2A%20x%20+%202.78046782759626E+02%29%20%2A%20x%20+%202.61515979057614E+02%3B%5Cn%5Ct%7D%20else%20%7B%5Cn%5Ct%5Ctreturn%20-2.53583846153761E+02%20%2A%20x%20+%202.55396153846073E+02%3B%5Cn%5Ct%7D%5Cn%7D%5Cn%5Cnfloat%20colormap_green%28float%20x%29%20%7B%5Cn%5Ctif%20%28x%20%3C%200.1105575469849737%29%20%7B%5Cn%5Ct%5Ctreturn%204.79433455433456E+02%20%2A%20x%20+%203.65079365079361E-01%3B%5Cn%5Ct%7D%20else%20if%20%28x%20%3C%200.3151890079472769%29%20%7B%5Cn%5Ct%5Ctreturn%206.25896582484846E+02%20%2A%20x%20-%201.58275246854709E+01%3B%5Cn%5Ct%7D%20else%20if%20%28x%20%3C%200.4023888287265409%29%20%7B%5Cn%5Ct%5Ctreturn%204.80700000000005E+02%20%2A%20x%20+%202.99368421052611E+01%3B%5Cn%5Ct%7D%20else%20if%20%28x%20%3C%200.5007980763912201%29%20%7B%5Cn%5Ct%5Ctreturn%203.22042124542111E+02%20%2A%20x%20+%209.37789987790044E+01%3B%5Cn%5Ct%7D%20else%20if%20%28x%20%3C%200.9266376793384552%29%20%7B%5Cn%5Ct%5Ctreturn%20%28%28-2.91150627193739E+02%20%2A%20x%20+%202.73891595228739E+02%29%20%2A%20x%20-%201.97954551648389E+02%29%20%2A%20x%20+%203.22069054828072E+02%3B%5Cn%5Ct%7D%20else%20%7B%5Cn%5Ct%5Ctreturn%20-4.70385384615211E+02%20%2A%20x%20+%205.78034615384465E+02%3B%5Cn%5Ct%7D%5Cn%7D%5Cn%5Cnfloat%20colormap_blue%28float%20x%29%20%7B%5Cn%5Ctif%20%28x%20%3C%200.1007720845701718%29%20%7B%5Cn%5Ct%5Ctreturn%201.66813186813184E+01%20%2A%20x%20+%203.72910052910053E+01%3B%5Cn%5Ct%7D%20else%20if%20%28x%20%3C%200.2891807195246389%29%20%7B%5Cn%5Ct%5Ctreturn%202.86155895159223E+02%20%2A%20x%20+%201.01354904806627E+01%3B%5Cn%5Ct%7D%20else%20if%20%28x%20%3C%200.4061884871072265%29%20%7B%5Cn%5Ct%5Ctreturn%204.02182758620675E+02%20%2A%20x%20-%202.34172413793071E+01%3B%5Cn%5Ct%7D%20else%20if%20%28x%20%3C%200.5018816861329155%29%20%7B%5Cn%5Ct%5Ctreturn%205.35500000000025E+02%20%2A%20x%20-%207.75691699604942E+01%3B%5Cn%5Ct%7D%20else%20if%20%28x%20%3C%200.604070194492165%29%20%7B%5Cn%5Ct%5Ctreturn%20-5.10170329670400E+02%20%2A%20x%20+%204.47233618233660E+02%3B%5Cn%5Ct%7D%20else%20if%20%28x%20%3C%200.7060918916718424%29%20%7B%5Cn%5Ct%5Ctreturn%20-3.26878215654109E+02%20%2A%20x%20+%203.36512315270959E+02%3B%5Cn%5Ct%7D%20else%20if%20%28x%20%3C%200.812819402403008%29%20%7B%5Cn%5Ct%5Ctreturn%20-6.62557264957455E+01%20%2A%20x%20+%201.52488888888906E+02%3B%5Cn%5Ct%7D%20else%20%7B%5Cn%5Ct%5Ctreturn%20-2.16444081632622E+02%20%2A%20x%20+%202.74564897959153E+02%3B%5Cn%5Ct%7D%5Cn%7D%5Cn%5Cnvec4%20colormap%28float%20x%29%20%7B%5Cn%5Ctfloat%20r%20=%20clamp%28colormap_red%28x%29%20/%20255.0%2C%200.0%2C%201.0%29%3B%5Cn%5Ctfloat%20g%20=%20clamp%28colormap_green%28x%29%20/%20255.0%2C%200.0%2C%201.0%29%3B%5Cn%5Ctfloat%20b%20=%20clamp%28colormap_blue%28x%29%20/%20255.0%2C%200.0%2C%201.0%29%3B%5Cn%5Ctreturn%20vec4%28r%2C%20g%2C%20b%2C%201.0%29%3B%5Cn%7D%5Cn%20%20%5Cnvoid%20main%28%29%20%7B%5Cn%20%20vec4%20color%20=%20colormap%28normalized%28%29%29%3B%5Cn%20%20emitRGBA%28color%29%3B%5Cn%7D%5Cn%22%2C%22";
287+
// final String encodedViridisShader = "%22shader%22:%22#uicontrol%20invlerp%20normalized%5Cn%5Cnvec3%20viridis_quintic%28%20float%20x%20%29%5Cn%7B%5Cn%5Ctvec4%20x1%20=%20vec4%28%201.0%2C%20x%2C%20x%20%2A%20x%2C%20x%20%2A%20x%20%2A%20x%20%29%3B%20//%201%20x%20x2%20x3%5Cn%5Ctvec4%20x2%20=%20x1%20%2A%20x1.w%20%2A%20x%3B%20//%20x4%20x5%20x6%20x7%5Cn%5Ctreturn%20vec3%28%5Cn%5Ct%5Ctdot%28%20x1.xyzw%2C%20vec4%28%20+0.280268003%2C%20-0.143510503%2C%20+2.225793877%2C%20-14.815088879%20%29%20%29%20+%20dot%28%20x2.xy%2C%20vec2%28%20+25.212752309%2C%20-11.772589584%20%29%20%29%2C%5Cn%5Ct%5Ctdot%28%20x1.xyzw%2C%20vec4%28%20-0.002117546%2C%20+1.617109353%2C%20-1.909305070%2C%20+2.701152864%20%29%20%29%20+%20dot%28%20x2.xy%2C%20vec2%28%20-1.685288385%2C%20+0.178738871%20%29%20%29%2C%5Cn%5Ct%5Ctdot%28%20x1.xyzw%2C%20vec4%28%20+0.300805501%2C%20+2.614650302%2C%20-12.019139090%2C%20+28.933559110%20%29%20%29%20+%20dot%28%20x2.xy%2C%20vec2%28%20-33.491294770%2C%20+13.762053843%20%29%20%29%20%29%3B%5Cn%7D%5Cn%20%20%5Cnvoid%20main%28%29%20%7B%5Cn%20%20vec3%20color%20=%20viridis_quintic%28normalized%28%29%29%3B%5Cn%20%20float%20alpha%20=%20normalized%28%29%3B%5Cn%20%20emitRGBA%28vec4%28color%2C%20alpha%29%29%3B%5Cn%7D%5Cn%22%2C";
288288

289289
final String shaderControls = // note: ng range precision needs to be <= 6 to avoid json parse error
290290
String.format("\"shaderControls\":{\"normalized\":{\"range\":[%8.6f,%8.6f]}}",
@@ -301,7 +301,7 @@ private static String buildNgUrlString(final StackMetaData stackMetaData,
301301
"\"selectedLayer\":{\"size\":460,\"visible\":true,\"layer\":\"" + ngLayerName + "\"},\"layout\":\"4panel\"}";
302302

303303
return rendererUrl + "/ng/#!" + URLEncoder.encode(ngJsonPreShader, StandardCharsets.UTF_8) +
304-
encodedViridisShader + URLEncoder.encode(ngJsonPostShader, StandardCharsets.UTF_8);
304+
encodedRedGreenShader + URLEncoder.encode(ngJsonPostShader, StandardCharsets.UTF_8);
305305
}
306306

307307
@SuppressWarnings("SameParameterValue")

0 commit comments

Comments
 (0)