rport updates, new logo, app.r logic updated, 4pl XL made nicer

R/Global.R

@@ -340,7 +340,7 @@ plot_f <- function(dat, TransFlag = F) { # sigmoid,det_sig,
     scale_x_continuous(breaks = scales::pretty_breaks(n = 10)) +
     scale_y_continuous(breaks = scales::pretty_breaks(n = 10)) +
     # theme_bw() +
-    theme(axis.text = element_text(size = 14))
+    theme(axis.text.x = element_text(size = 12, angle=90), axis.text.y = element_text(size = 12))
 
   p2 <- p + geom_line(
     data = as.data.frame(pl_df), aes(x = seq_x, y = SAMPLE), color = "#C2173F",
@@ -1315,7 +1315,7 @@ tests_FUNC <- function(ro_new, Lim, PureErrFlag) {
       "EQ test ratio of lower asymptotes",
       "EQ test ratio of Hill slopes",
       "EQ test ratio of upper asymptotes",
-      "F-test on non-linearity*",
+      "F-test on Lack-of-Fit*",
       "EQ test ratio of asymptote difference",
       "geom. rel. CI restr. model",
       "geom. rel. CI unrestr. model"
@@ -1396,7 +1396,7 @@ ANOVA4plUnresfunc <- function(ro_new) {
   # PureErr
   SSE <- round(FitAnova[4, 3], 5)
   SSE_df <- FitAnova[4, 1]
-  # Non-Linearity
+  # Lack-of-Fit
   SSnonlin <- round(sum((predict(lm(readout ~ factor(Conc) * isSample, all_l)) - smuPREDs)^2), 4)
   LoF_df <- FitAnova[1, 1] + FitAnova[2, 1]
   ## Total
@@ -1413,7 +1413,7 @@ ANOVA4plUnresfunc <- function(ro_new) {
   ANOVAtab <- data.frame(
     Source = c(
       "Treatment", "Preparation", "Regression",
-      "Non-Parallelism", "Residual Error", "Non-linearity",
+      "Non-Parallelism", "Residual Error", "Lack-of-Fit",
       "Pure Error", "Total"
     ),
     DF = AnovaDFs,