Counter

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: QA3D
 Title: Quality Assurance 3D
-Version: 0.0.4
+Version: 0.0.5
 Authors@R: person("Jeff", "Lynch", email = "[email protected]", role = c("aut","cre"))
 Description: QA3D (Quality Assurance 3D) is an R package that allows the error analysis of repeated scans from three-dimensional equipment. While not requiring the use of skeletal elements, this app was designed and intended to be used with repeated skeletal element scans. Given the rise in popularity of three-dimensional technology in forensic anthropology, there is a need for an FA specific tool to verify the quality of scanners for research and laboratory accreditation purposes. http://osteocoder.com/QA3D.html
 Depends:

README.md

@@ -1,11 +1,11 @@
-## QA3D 0.0.4
+## QA3D 0.0.5
 QA3D (Quality Assurance 3D) is an R package that allows the error analysis of repeated scans from three-dimensional equipment. While not requiring the use of skeletal elements, this app was designed and intended to be used with repeated skeletal element scans. Given the rise in popularity of three-dimensional technology in forensic anthropology, there is a need for an FA specific tool to verify the quality of scanners for research and laboratory accreditation purposes.
 
 ## Installation
 ```javascript
 install.packages("devtools")
 library(devtools)
-install_github("jjlynch2/QA3D", ref="v0.0.4")
+install_github("jjlynch2/QA3D", ref="v0.0.5")
 library(QA3D)
 QA3D()
 ```

inst/QA3D/server/QA3D.r

@@ -112,7 +112,7 @@ observeEvent(input$Process, {
 		subsample <- TRUE
 	}
 	ttime <- d1[[14]]
-	params_list <- list(choose = input$Choose, attributes = input$attributes, x = input$x, y = input$y, z = input$z, d = input$d, breake = input$breake, breakk = breakk, scannerid = input$scannerid, analyst = input$analyst, date = Sys.time(), iterations = input$iterations, subsample = subsample, pcalign = input$pcalign, kmeans = input$kmeans, procedure = input$Procedure, vara = input$vara, vara2 = input$vara2, report_pw = report_pw, report_gr = report_gr, time = ttime)
+	params_list <- list(choose = input$Choose, attributes = input$attributes, x = input$x, y = input$y, z = input$z, d = input$d, breake = input$breake, breakk = breakk, scannerid = input$scannerid, analyst = input$analyst, date = Sys.time(), iterations = input$iterations, subsample = subsample, pcalign = input$pcalign, kmeans = input$kmeans, procedure = input$Procedure, vara = input$vara, vara2 = input$vara2, report_pw = report_pw, report_gr = report_gr, time = ttime, comparisons = nrow(report_pw))
 
 	output$savedata <- downloadHandler(
 		filename = "report.pdf",
@@ -130,7 +130,7 @@ observeEvent(input$Process, {
 		DT::datatable(report_gr, options = list(dom = 't'), rownames = FALSE)
 	})
 	output$contents1 <- renderUI({
-	HTML(paste("<strong>Completed in: ", "<font color=\"#00688B\">", ttime, " minutes</font></strong><br><br>","<h3>Grand Results</h1>", sep=""))
+	HTML(paste("<strong>Comparisons: ","<font color=\"#00688B\">", nrow(report_pw),"</font>","<br>Completed in: ", "<font color=\"#00688B\">", ttime, " minutes</font></strong><br><br>","<h3>Grand Results</h1>", sep=""))
 	})
 	output$contents2 <- renderUI({
 		HTML("<h3>Pairwise Results</h1>")

inst/QA3D/server/changes.r

@@ -1,6 +1,6 @@
 output$changes <- renderUI({
 	HTML("<p><h3>Version Changes</h3>
-		This is the first production release.
+		This version includes a comparison count.
 		<br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br>
 		</p>
 	")

inst/extdata/report_pdf.Rmd

@@ -23,11 +23,14 @@ params:
   attributes: NULL
   choose: NULL
   time: NULL
+  comparisons: NULL
 ---
 QA3D Version: `r packageVersion("QA3D")`
 
 Date: `r params$date`
 
+Comparisons: `r params$comparisons`
+
 Completed in: `r params$time` minutes
 
 `r if(params$attributes != "") {paste("Attributes:", params$attributes, sep=" ")}`