s434730/RandomSec
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Jackson deserialization for ScatterplotFacetConfig

Browse Source
This commit is contained in:
Antonin Delpeuch 2018-10-22 09:29:16 +01:00
parent d8bc841dae
commit e11145ce0d
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
main/src/com/google/refine/browsing/facets/ScatterplotFacet.java
View File

@ -124,8 +124,11 @@ public class ScatterplotFacet implements Facet {
@JsonProperty(TO_Y) @JsonProperty(TO_Y)
protected double to_y; protected double to_y;
protected boolean selected; // false if we're certain that all rows will match // false if we're certain that all rows will match
// and there isn't any filtering to do // and there isn't any filtering to do
protected boolean isSelected() {
return from_x > 0 || to_x < 1 || from_y > 0 || to_y < 1;
}
@JsonProperty(DIM_X) @JsonProperty(DIM_X)
public String getDimX() { public String getDimX() {
@ -154,7 +157,6 @@ public class ScatterplotFacet implements Facet {
if (o.has(FROM_X) && o.has(TO_X)) { if (o.has(FROM_X) && o.has(TO_X)) {
from_x = o.getDouble(FROM_X); from_x = o.getDouble(FROM_X);
to_x = o.getDouble(TO_X); to_x = o.getDouble(TO_X);
selected = true;
} else { } else {
from_x = 0; from_x = 0;
to_x = 1; to_x = 1;
@ -164,7 +166,6 @@ public class ScatterplotFacet implements Facet {
if (o.has(FROM_Y) && o.has(TO_Y)) { if (o.has(FROM_Y) && o.has(TO_Y)) {
from_y = o.getDouble(FROM_Y); from_y = o.getDouble(FROM_Y);
to_y = o.getDouble(TO_Y); to_y = o.getDouble(TO_Y);
selected = true;
} else { } else {
from_y = 0; from_y = 0;
to_y = 1; to_y = 1;
@ -423,7 +424,7 @@ public class ScatterplotFacet implements Facet {
@Override @Override
public RowFilter getRowFilter(Project project) { public RowFilter getRowFilter(Project project) {
if (config.selected && if (config.isSelected() &&
eval_x != null && errorMessage_x == null && eval_x != null && errorMessage_x == null &&
eval_y != null && errorMessage_y == null) eval_y != null && errorMessage_y == null)
{ {