Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

135 theme concept #137

Merged
merged 27 commits into from
Mar 18, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
833901a
Draft of a theme maker app
pchelle Jan 12, 2021
313e668
Include Wrapper for theme maker app
pchelle Jan 19, 2021
fd1047f
Remove data from internal package data
pchelle Feb 15, 2021
e616adb
Create smarter R6 Theme and related classes
pchelle Feb 15, 2021
08e9c0b
Fixes and reconcile plot configuration with new theme workflow
pchelle Feb 15, 2021
599901a
Fixes atom plots with new plot configurations and themes
pchelle Feb 15, 2021
c7b44ca
Provide user interface drafts for molecule plots
pchelle Feb 23, 2021
d877838
A test data set and theme template available in extdata
pchelle Feb 23, 2021
1faea9e
Fix boxplots with new theme configuration
pchelle Feb 23, 2021
daa4212
Fix histograms with new theme configuration
pchelle Feb 23, 2021
dafa563
Fix pk and ddi ratio plots with new theme configuration
pchelle Feb 23, 2021
444e0ad
Fix time profile and obs vs pred plots with new theme configuration
pchelle Feb 23, 2021
079d59f
Throw a warning when data has no row in input
pchelle Feb 25, 2021
c922322
Provide default for all plot configurations
pchelle Feb 25, 2021
a78c0c4
Update tornado plot
pchelle Feb 25, 2021
966ac79
Add mapping defaults
pchelle Feb 25, 2021
989fed0
Fix tests
pchelle Feb 25, 2021
0d4a4b2
Fix vignettes
pchelle Feb 25, 2021
160df3e
Update namespace with the app wrappers
pchelle Feb 25, 2021
004049c
add example data and meta data in extdata
pchelle Feb 25, 2021
84c57bb
Fix vignette buidling fail
pchelle Feb 25, 2021
7dd67ea
Remove theme from example in documentation
pchelle Feb 25, 2021
6250450
Fix background and plot configuration theme
pchelle Mar 12, 2021
8017f3c
Increment version 1.1 -> 1.2
pchelle Mar 12, 2021
713bd59
Import jsonlite in namespace
pchelle Mar 16, 2021
345e544
Make theme features cloneable and clone them within plot configurations
pchelle Mar 16, 2021
ead7e0f
Fix setDefaultWatermark by not overwriting fonts if character
pchelle Mar 16, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Package: tlf
Type: Package
Title: TLF Library
Version: 1.1.0
Version: 1.2.0
Authors@R:
c(person(given = "Open-Systems-Pharmacology Community",
role = "cph"),
Expand All @@ -25,7 +25,8 @@ BugReports: https://github.com/open-systems-pharmacology/tlf-library/issues
Imports:
ggplot2 (>= 3.3.0),
R6,
reshape2
reshape2,
jsonlite
Depends:
R (>= 3.5)
Encoding: UTF-8
Expand All @@ -46,9 +47,7 @@ Collate:
'atom-plots.R'
'boxwhisker-datamapping.R'
'boxwhisker-get-measure.R'
'boxwhisker-plot.R'
'boxwhisker-plotconfiguration.R'
'data-description.R'
'datamapping-grouping.R'
'datamapping-groupmapping.R'
'datamapping-range.R'
Expand All @@ -57,7 +56,6 @@ Collate:
'ddiratio-datamapping.R'
'ddiratio-plotconfiguration.R'
'error-checks.R'
'utils.R'
'font.R'
'histogram-datamapping.R'
'histogram-plotconfiguration.R'
Expand All @@ -66,9 +64,11 @@ Collate:
'metadata-helper.R'
'obs-vs-pred-datamapping.R'
'obs-vs-pred-plotconfiguration.R'
'observed-data-mapping.R'
'pkratio-datamapping.R'
'pkratio-get-measure.R'
'pkratio-plotconfiguration.R'
'plot-boxwhisker.R'
'plot-ddiratio.R'
'plot-histogram.R'
'plot-obs-vs-pred.R'
Expand All @@ -88,9 +88,11 @@ Collate:
'tlf-env.R'
'tornado-datamapping.R'
'tornado-plotconfiguration.R'
'utilities-aesthetics.R'
'utilities-axis.R'
'utilities-background.R'
'utilities-export.R'
'utilities-label.R'
'utilities-legend.R'
'utilities-mapping.R'
'utils.R'
32 changes: 25 additions & 7 deletions NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,16 @@ export("median+1.5IQR")
export("median+IQR")
export("median-1.5IQR")
export("median-IQR")
export(AestheticSelectionKeys)
export(AggregationInput)
export(AggregationSummary)
export(AxisConfiguration)
export(BackgroundConfiguration)
export(BackgroundElementConfiguration)
export(BackgroundElement)
export(BoxWhiskerDataMapping)
export(BoxWhiskerPlotConfiguration)
export(ColorMaps)
export(DDIComparisonTypes)
export(DDIRatioDataMapping)
export(DDIRatioPlotConfiguration)
export(ExportConfiguration)
Expand All @@ -47,16 +50,23 @@ export(LabelConfiguration)
export(LegendConfiguration)
export(LegendPositions)
export(LegendTypes)
export(LineElement)
export(Linetypes)
export(ObsVsPredDataMapping)
export(ObsVsPredPlotConfiguration)
export(ObservedDataMapping)
export(PKRatioDataMapping)
export(PKRatioPlotConfiguration)
export(PlotConfiguration)
export(RangeDataMapping)
export(Scaling)
export(Shapes)
export(Theme)
export(ThemeAesProperties)
export(ThemeAestheticMaps)
export(ThemeAestheticSelections)
export(ThemeBackground)
export(ThemeFont)
export(ThemePlotConfigurations)
export(TimeProfileDataMapping)
export(TimeProfilePlotConfiguration)
export(TornadoDataMapping)
Expand All @@ -71,17 +81,16 @@ export(addRibbon)
export(addScatter)
export(addWatermark)
export(asLabel)
export(bigTheme)
export(bwTheme)
export(createWatermarkGrob)
export(defaultTheme)
export(exportPlot)
export(getBoxWhiskerMeasure)
export(getDefaultCaptions)
export(getGuestValues)
export(getLabelWithUnit)
export(getLegendCaption)
export(getPKRatioMeasure)
export(initializePlot)
export(loadThemeFromJson)
export(metaDataHelper)
export(plotBoxWhisker)
export(plotDDIRatio)
Expand All @@ -90,7 +99,14 @@ export(plotObsVsPred)
export(plotPKRatio)
export(plotTimeProfile)
export(plotTornado)
export(runDDIRatioPlot)
export(runObsVsPredPlot)
export(runPKRatioPlot)
export(runThemeMaker)
export(saveThemeToJson)
export(setBackground)
export(setBackgroundPanelArea)
export(setBackgroundPlotArea)
export(setCaptionColor)
export(setCaptionFill)
export(setCaptionLabels)
Expand All @@ -106,10 +122,10 @@ export(setDefaultExportName)
export(setDefaultExportParameters)
export(setDefaultLegendPosition)
export(setDefaultWatermark)
export(setFontProperties)
export(setGrid)
export(setLegend)
export(setLegendCaption)
export(setLegendFont)
export(setLegendPosition)
export(setLegendTitle)
export(setPlotExport)
Expand All @@ -118,10 +134,12 @@ export(setPlotExportSize)
export(setPlotLabels)
export(setWatermark)
export(setXAxis)
export(setXGrid)
export(setYAxis)
export(setYGrid)
export(tlfStatFunctions)
export(tlfTheme)
export(updateLegendCaption)
export(useTheme)
import(ggplot2)
import(jsonlite)
import(utils)
Loading