Skip to content

Commit a996b44

Browse files
committed
Some small changes
1 parent 55b6a78 commit a996b44

File tree

2 files changed

+15
-8
lines changed

2 files changed

+15
-8
lines changed

src/main/java/at/gmi/nordborglab/widgets/geneviewer/client/GeneViewer.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@
44
import java.util.HashMap;
55
import java.util.List;
66

7+
import org.danvk.dygraphs.client.DygraphOptions;
8+
import org.danvk.dygraphs.client.DygraphOptions.SHOW_LEGEND;
79
import org.danvk.dygraphs.client.Dygraphs;
8-
import org.danvk.dygraphs.client.Dygraphs.Options.SHOW_LEGEND;
910
import org.danvk.dygraphs.client.events.UnderlayHandler;
1011

1112
import at.gmi.nordborglab.processingjs.client.Processing;
@@ -111,7 +112,7 @@ public enum SHOW_RANGE_SELECTOR {None,Bottom,Top};
111112
protected List<GenomeStat> currentGenomeStats;
112113
protected DataTable stackableGenomeStatsCache = null;
113114
protected HashMap<GenomeStat,DataTable> nonstackableGenomeStatsCache = new HashMap<GenomeStat,DataTable>();
114-
protected Dygraphs.Options options = Dygraphs.Options.create();
115+
protected DygraphOptions options = DygraphOptions.create();
115116
protected int width_offset = 31;
116117

117118
private final ScheduledCommand layoutCmd = new ScheduledCommand() {
@@ -609,7 +610,7 @@ protected DataView filterStatsToDisplay() {
609610
return view;
610611
}
611612

612-
private Dygraphs.Options createOptions(boolean stepPlot) {
613+
private DygraphOptions createOptions(boolean stepPlot) {
613614

614615
options.setRollerPeriod(1000);
615616
options.setshowRoller(true);
@@ -638,7 +639,8 @@ public void onUnderlay(UnderlayEvent event) {
638639
int zoomStart = processing.getInstance().getZoomStart();
639640
int zoomEnd = processing.getInstance().getZoomEnd();
640641
event.canvas.save();
641-
event.canvas.setFillStyle("yellow");
642+
event.canvas.setFillStyle("#FFFF00");
643+
event.canvas.setStrokeStyle("#000000");
642644
double left = event.dygraph.toDomXCoord(zoomStart);
643645
double right = event.dygraph.toDomXCoord(zoomEnd);
644646
double length = right - left;

src/main/java/at/gmi/nordborglab/widgets/geneviewer/client/datasource/impl/JBrowseDataSourceImpl.java

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -171,15 +171,20 @@ public void onError(Request request, Throwable exception) {
171171

172172
}
173173
}
174-
175-
@Override
176-
public void fetchGenomeStatsData(List<GenomeStat> genomeStats,String chr,
177-
final FetchGenomeStatsDataCallback callback) {
174+
175+
protected String getStatUrl(List<GenomeStat> genomeStats) {
178176
Iterator<GenomeStat> iterator = genomeStats.iterator();
179177
String stats = iterator.next().getName();
180178
while (iterator.hasNext()) {
181179
stats = stats + ","+iterator.next().getName();
182180
}
181+
return stats;
182+
}
183+
184+
@Override
185+
public void fetchGenomeStatsData(List<GenomeStat> genomeStats,String chr,
186+
final FetchGenomeStatsDataCallback callback) {
187+
String stats = getStatUrl(genomeStats);
183188
RequestBuilder request = new RequestBuilder(RequestBuilder.GET,url+"getGenomeStatsData?stats="+stats+"&chr="+chr);
184189
request.setCallback(new RequestCallback() {
185190

0 commit comments

Comments
 (0)