From 4b66a0a3e4238105272eb9c73f77302c1751a954 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Todor=20Kondi=C4=87?= <todor.kondic@uni.lu>
Date: Wed, 30 Sep 2020 08:16:26 +0200
Subject: [PATCH] Added Marc's fix and updated the description
---
DESCRIPTION | 11 +++++++++--
R/shinyUI.R | 24 ++++++++++++++++++------
2 files changed, 27 insertions(+), 8 deletions(-)
diff --git a/DESCRIPTION b/DESCRIPTION
index 8feb58a..8ee4b42 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,6 +1,6 @@
Package: shinyscreen
Title: Pre-screening of Mass Spectrometry Data
-Version: 0.8
+Version: 0.8.1
Author: Todor Kondić
Maintainer: Todor Kondić <todor.kondic@uni.lu>
Authors@R:
@@ -24,7 +24,14 @@ Authors@R:
person(given = "Anjana",
family = "Elapavalore",
role = c("ctb"),
- email = "anjana.elapavalore@ext.uni.lu"))
+ email = "anjana.elapavalore@ext.uni.lu"),
+ person(given = "Adelene",
+ family = "Lai",
+ email = "adelene.lai@uni.lu",
+ role = c("ctb")),
+ person(given = "Emma",
+ family = "Schymanski",
+ role = c("ctb")))
Description: Pre-screening of Mass Spectrometry Data.
License: Apache License (>= 2.0)
Encoding: UTF-8
diff --git a/R/shinyUI.R b/R/shinyUI.R
index c1f658f..2cd677f 100644
--- a/R/shinyUI.R
+++ b/R/shinyUI.R
@@ -253,6 +253,23 @@ mkUI <- function(fnStyle) {
+ ## presPlotBox <- shinydashboard::box(title = "Plot",
+ ## width = NULL,color = "olive",
+ ## solidHeader = FALSE,
+ ## collapsible = TRUE,
+ ## shiny::plotOutput("chromGram",
+ ## width = "100%",
+ ## height = "750px",
+ ## click = NULL,
+ ## dblclick = NULL,
+ ## hover = NULL,
+ ## hoverDelay = NULL,
+ ## hoverDelayType = NULL,
+ ## brush = NULL,
+ ## clickId = NULL,
+ ## hoverId = NULL))
+
+ ## Marc Omar Warmoes fix for newer versions of R/Shiny.
presPlotBox <- shinydashboard::box(title = "Plot",
width = NULL,color = "olive",
solidHeader = FALSE,
@@ -262,12 +279,7 @@ mkUI <- function(fnStyle) {
height = "750px",
click = NULL,
dblclick = NULL,
- hover = NULL,
- hoverDelay = NULL,
- hoverDelayType = NULL,
- brush = NULL,
- clickId = NULL,
- hoverId = NULL))
+ hover = NULL))
presChromPropMS1<-shinydashboard::box(title="Chromatogram (MS1)",
width=NULL,
--
GitLab