Commit 974fceaa authored by Vorderman's avatar Vorderman

Add appropriate Option types for plot generator

parent 268a45a7
......@@ -26,8 +26,8 @@
<%@ var librariesCount: Int %>
<%@ var clipCount: Int %>
<%@ var paired: Boolean %>
<%@ var summaryPlotLinesR1: Some[Seq[String]] %>
<%@ var summaryPlotLinesR2: Some[Seq[String]] %>
<%@ var summaryPlotLinesR1: Option[Seq[String]] %>
<%@ var summaryPlotLinesR2: Option[Seq[String]] %>
<%@ var samples: Seq[Sample] %>
<%@ var libraries: Seq[Library] %>
<%@ var settings: Map[(Int, Int), Map[String, Option[Any]]]%>
......
......@@ -25,8 +25,8 @@
<%@ var seqstatQCStats: Map[(Int, Int), Map[String, Option[Any]]] %>
<%@ var clippingStats: Map[(Int, Int), Map[String, Option[Any]]] %>
<%@ var trimmingStats: Map[(Int, Int), Map[String, Option[Any]]] %>
<%@ var summaryPlotLinesR1: Some[Seq[String]] %>
<%@ var summaryPlotLinesR2: Some[Seq[String]] %>
<%@ var summaryPlotLinesR1: Option[Seq[String]] %>
<%@ var summaryPlotLinesR2: Option[Seq[String]] %>
#if (showIntro)
<br/>
......
......@@ -289,11 +289,11 @@ object FlexiprepReadSummary {
val clipCount = settings.count(_._2.getOrElse("skip_clip", None).contains(false))
val librariesCount = libraries.size
val summaryPlotLinesR1: Some[Seq[String]] =
val summaryPlotLinesR1: Option[Seq[String]] =
if (showPlot)
Some(FlexiprepReport.readSummaryPlotLines("R1", summary, sampleId = sampleId))
else None
val summaryPlotlinesR2: Some[Seq[String]] =
val summaryPlotlinesR2: Option[Seq[String]] =
if (showPlot && paired)
Some(FlexiprepReport.readSummaryPlotLines("R2", summary, sampleId = sampleId))
else None
......@@ -372,11 +372,11 @@ object FlexiprepBaseSummary {
.getOrElse("paired", None) == Some(true)
else settings.count(_._2.getOrElse("paired", None) == Some(true)) >= 1
val summaryPlotLinesR1: Some[Seq[String]] =
val summaryPlotLinesR1: Option[Seq[String]] =
if (showPlot)
Some(FlexiprepReport.readSummaryPlotLines("R1", summary, sampleId = sampleId))
else None
val summaryPlotlinesR2: Some[Seq[String]] =
val summaryPlotlinesR2: Option[Seq[String]] =
if (showPlot && paired)
Some(FlexiprepReport.readSummaryPlotLines("R2", summary, sampleId = sampleId))
else None
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment