Merge branch 'devel' of https://github.com/IGS/gEAR into devel

IGS · Dec 13, 2024 · 3da7d3c · 3da7d3c
2 parents 7a03d86 + e725ccb
commit 3da7d3c
Show file tree

Hide file tree

Showing 36 changed files with 255 additions and 1 deletion.
diff --git a/docs/Documentation/Screenshots/AddingDatasetsToNewProfile.png b/docs/Documentation/Screenshots/AddingDatasetsToNewProfile.png
diff --git a/docs/Documentation/Screenshots/AnalysisToolsDropDownSelections.png b/docs/Documentation/Screenshots/AnalysisToolsDropDownSelections.png
diff --git a/docs/Documentation/Screenshots/AnalysisToolsFromDatasetExplorer.png b/docs/Documentation/Screenshots/AnalysisToolsFromDatasetExplorer.png
diff --git a/docs/Documentation/Screenshots/AnalysisToolsFromNavBar.png b/docs/Documentation/Screenshots/AnalysisToolsFromNavBar.png
diff --git a/docs/Documentation/Screenshots/ArrangeDatasetCollection.png b/docs/Documentation/Screenshots/ArrangeDatasetCollection.png
diff --git a/docs/Documentation/Screenshots/CompareTool.png b/docs/Documentation/Screenshots/CompareTool.png
diff --git a/docs/Documentation/Screenshots/CompareToolDropdownCuration.png b/docs/Documentation/Screenshots/CompareToolDropdownCuration.png
diff --git a/docs/Documentation/Screenshots/CompareToolMakeGeneList.png b/docs/Documentation/Screenshots/CompareToolMakeGeneList.png
diff --git a/docs/Documentation/Screenshots/CompareToolSelectGenes.png b/docs/Documentation/Screenshots/CompareToolSelectGenes.png
diff --git a/docs/Documentation/Screenshots/CreateNewGeneList.png b/docs/Documentation/Screenshots/CreateNewGeneList.png
diff --git a/docs/Documentation/Screenshots/DatasetInfoFromGeneExpressionSearch.png b/docs/Documentation/Screenshots/DatasetInfoFromGeneExpressionSearch.png
diff --git a/docs/Documentation/Screenshots/DownloadData.png b/docs/Documentation/Screenshots/DownloadData.png
diff --git a/docs/Documentation/Screenshots/EditDataSetInfoAfterUpload.png b/docs/Documentation/Screenshots/EditDataSetInfoAfterUpload.png
diff --git a/docs/Documentation/Screenshots/GeneListManager.png b/docs/Documentation/Screenshots/GeneListManager.png
diff --git a/docs/Documentation/Screenshots/GeneListManagerCreateNewList.png b/docs/Documentation/Screenshots/GeneListManagerCreateNewList.png
diff --git a/docs/Documentation/Screenshots/MultiGeneDisplays.png b/docs/Documentation/Screenshots/MultiGeneDisplays.png
diff --git a/docs/Documentation/Screenshots/OpenCuratorFromGeneExpression.png b/docs/Documentation/Screenshots/OpenCuratorFromGeneExpression.png
diff --git a/docs/Documentation/Screenshots/SCWorkbench.png b/docs/Documentation/Screenshots/SCWorkbench.png
diff --git a/docs/Documentation/Screenshots/ScreenshotAnnotation.png b/docs/Documentation/Screenshots/ScreenshotAnnotation.png
diff --git a/docs/Documentation/Screenshots/ScreenshotCreateNewCollection.png b/docs/Documentation/Screenshots/ScreenshotCreateNewCollection.png
diff --git a/docs/Documentation/Screenshots/ScreenshotDashboard.png b/docs/Documentation/Screenshots/ScreenshotDashboard.png
diff --git a/docs/Documentation/Screenshots/ScreenshotDataSetExplorer.png b/docs/Documentation/Screenshots/ScreenshotDataSetExplorer.png
diff --git a/docs/Documentation/Screenshots/ScreenshotDatasetCollection_FromGeneExpression.png b/docs/Documentation/Screenshots/ScreenshotDatasetCollection_FromGeneExpression.png
diff --git a/docs/Documentation/Screenshots/ScreenshotDatasetInformation.png b/docs/Documentation/Screenshots/ScreenshotDatasetInformation.png
diff --git a/docs/Documentation/Screenshots/ScreenshotGeneExpressionSearch.png b/docs/Documentation/Screenshots/ScreenshotGeneExpressionSearch.png
diff --git a/docs/Documentation/Screenshots/ScreenshotNavBar.png b/docs/Documentation/Screenshots/ScreenshotNavBar.png
diff --git a/docs/Documentation/Screenshots/SearchDataSetCollectionForMultiGeneDisplay.png b/docs/Documentation/Screenshots/SearchDataSetCollectionForMultiGeneDisplay.png
diff --git a/docs/Documentation/Screenshots/SearchGeneExpressionUsingGeneList.png b/docs/Documentation/Screenshots/SearchGeneExpressionUsingGeneList.png
diff --git a/docs/Documentation/Screenshots/ShareDatasetOrCollection.png b/docs/Documentation/Screenshots/ShareDatasetOrCollection.png
diff --git a/docs/Documentation/Screenshots/Single-GeneCurator-FromGeneExpression.png b/docs/Documentation/Screenshots/Single-GeneCurator-FromGeneExpression.png
diff --git a/docs/Documentation/Screenshots/SingleGeneCurator.png b/docs/Documentation/Screenshots/SingleGeneCurator.png
diff --git a/docs/Documentation/Screenshots/ToggleToMultiGeneDisplaysWithGeneList.png b/docs/Documentation/Screenshots/ToggleToMultiGeneDisplaysWithGeneList.png
diff --git a/docs/Documentation/Screenshots/UsingGeneListInMultiGeneCurator.png b/docs/Documentation/Screenshots/UsingGeneListInMultiGeneCurator.png
diff --git a/docs/Documentation/Screenshots/ViewDataSetInfo.png b/docs/Documentation/Screenshots/ViewDataSetInfo.png
diff --git a/docs/Documentation/gEARWiki.md b/docs/Documentation/gEARWiki.md
diff --git a/www/api/resources/tsne_data.py b/www/api/resources/tsne_data.py
@@ -517,7 +517,7 @@ def post(self, dataset_id):
         dpi = io_fig.dpi    # default dpi is 100, but will be saved as 150 later on
         # With 2 plots as a default (gene expression and colorize_by), we want to grow the figure size slowly based on the number of plots
 
-        num_plots_wide = max_columns if max_columns else num_plots
+        num_plots_wide = max_columns if plot_by_group and max_columns else num_plots
         num_plots_high = ceil(num_plots / num_plots_wide)
 
         # set the figsize based on the number of plots