labels bit up

bigomics · Mar 17, 2023 · be35a75 · be35a75
1 parent e38a6ff
commit be35a75
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 8 deletions.
diff --git a/VERSION b/VERSION
@@ -1,4 +1,4 @@
-v3.0-rc1
+v3.0-rc2
 
 - V3.0 release candidate 1 (16 mar 2023)
 - First beta release (1 mar 2023)
diff --git a/components/board.dataview/R/dataview_plot_boxplot.R b/components/board.dataview/R/dataview_plot_boxplot.R
@@ -69,6 +69,10 @@ dataview_plot_boxplot_server <- function(id, parent.input, getCountsTable, water
       shiny::req(res)
 
       df <- res$counts[, ]
+      if(nrow(df)>1000) {
+        sel <- sample(nrow(df),1000)
+        df <- df[sel,]
+      }
       long.df <- reshape2::melt(df)
       colnames(long.df) <- c("gene", "sample", "value")
 

diff --git a/components/board.dataview/R/dataview_ui.R b/components/board.dataview/R/dataview_ui.R
@@ -166,15 +166,15 @@ DataViewUI <- function(id) {
 #          div(
 #            class = "row",
             div(
-              class = "col-lg-9 col-xxl-6 col-xxxl-3",
+              class = "col-lg-9 col-xxl-7 col-xxxl-5",
               dataview_plot_correlation_ui(
                 ns("correlationplot"),
                 height = imgH,
                 label = "d"
               )
             ),
             div(
-              class = "col-lg-9 col-xxl-6 col-xxxl-3",
+              class = "col-lg-9 col-xxl-5 col-xxxl-3",
               dataview_plot_tissue_ui(
                 ns("tissueplot"),
                 height = imgH,

diff --git a/components/board.loading/R/loading_tsneplot.R b/components/board.loading/R/loading_tsneplot.R
@@ -95,7 +95,7 @@ loading_tsne_server <- function(id, pgx.dirRT,
       df <- plot_data()
       shiny::req(df)
 
-      dataset.pos <- df[[2]]
+      dataset_pos <- df[[2]]
       marker_size <- ifelse( nrow(df[[1]]) > 50, 5, 10)
 
       fig <- plotly::plot_ly(
@@ -109,16 +109,27 @@ loading_tsne_server <- function(id, pgx.dirRT,
           size = marker_size,
           line = list(
             color = omics_colors("super_dark_grey"),
-            width = 1.2
+            width = 1.0
           )
         )
       )
 
+      dy <- diff(range(dataset_pos[,"y"]))
+      dbg("[loading_tsneplot.R] range.y=",dy)
+
       fig <- fig %>%
         plotly::add_annotations(
-          x = dataset.pos[, "x"],
-          y = dataset.pos[, "y"],
-          text = rownames(dataset.pos),
+          x = dataset_pos[,"x"],
+          y = dataset_pos[,"y"],
+          text = rownames(dataset_pos),
+          xref = "x",
+          yref = "y",          
+          ## textposition = 'top',
+          xanchor = "middle",
+          yanchor = "bottom",
+          yshift = 0.02*dy,
+#          ax = 0,
+#          ay = -0.05 * dy,
           showarrow = FALSE
         )