Merge pull request #131 from RobertGawron/feature/travis_build

travis build for r and latex part

documentation/diagrams/creatediagrams.sh

@@ -13,15 +13,10 @@ do
     # convert .tex to .png 
 
     pdflatex $filename.tex
+    touch $filename-tmp.pdf
     pdfcrop $filename.pdf $filename-tmp.pdf
     pdftoppm -png -r 800 $filename-tmp.pdf $filename
 
-    # remove junk files
-
-    rm $filename.aux
-    rm $filename.log
-    rm $filename-tmp.pdf
-    rm $filename.pdf
-    rm texput.log
 done
 
+rm *.aux *.log *.pdf

software/DataAcquisitionFromDevice/packages/CSV2Diagrams/.Rbuildignore

@@ -0,0 +1,2 @@
+^.*\.Rproj$
+^\.Rproj\.user$

software/DataAcquisitionFromDevice/packages/CSV2Diagrams/DESCRIPTION

@@ -0,0 +1,11 @@
+Package: CSV2Diagrams
+Type: Package
+Title: Convert CSV file to a diagram with time over value and histogram plots 
+Version: 0.1.0
+Author: Robert Gawron
+Maintainer: Robert Gawron <robert_gawron@yahoo.fr>
+Description: Used for https://github.com/RobertGawron/IonizationChamber 
+License: What license is it under?
+Encoding: UTF-8
+LazyData: true
+Imports: latticeExtra, gridExtra

software/DataAcquisitionFromDevice/packages/CSV2Diagrams/NAMESPACE

@@ -0,0 +1,3 @@
+exportPattern("^[[:alpha:]]+")
+import(latticeExtra)
+import(gridExtra)

software/DataAcquisitionFromDevice/packages/CSV2Diagrams/abc.Rproj

@@ -0,0 +1,20 @@
+Version: 1.0
+
+RestoreWorkspace: Default
+SaveWorkspace: Default
+AlwaysSaveHistory: Default
+
+EnableCodeIndexing: Yes
+UseSpacesForTab: Yes
+NumSpacesForTab: 2
+Encoding: UTF-8
+
+RnwWeave: Sweave
+LaTeX: pdfLaTeX
+
+AutoAppendNewline: Yes
+StripTrailingWhitespace: Yes
+
+BuildType: Package
+PackageUseDevtools: Yes
+PackageInstallArgs: --no-multiarch --with-keep.source

software/DataAcquisitionFromDevice/script.R

@@ -1,44 +1,12 @@
-library(latticeExtra)
+install.packages('.\\software\\DataAcquisitionFromDevice\\packages\\CSV2Diagrams', repos = NULL, type="source")
+
+require(CSV2Diagrams)
+
 require(gridExtra)
-require(grid)
+#ls("gridExtra")
 
-# set error messages test to english
-Sys.setenv(LANG = "en")
+print(search())
 
-#load samples
-samples <- read.delim("data.log", , sep=",")
+print(ls("package:CSV2Diagrams"))
 
-# date column should be type of date, not string, so parse it
-png(filename = paste0("results-", format(Sys.time(), "%d_%b_%Y_%H_%M"), ".png"), width = 800, height = 900, bg = "white")
-
-# create graphs
-
-samples$Time = as.POSIXct(samples$Time, format="%Y-%m-%d %H:%M:%S.%OS")
-
-# create graphs
-plotValueVsTime <- xyplot(Counter ~ Time, 
-                data = samples, 
-                type = "l", 
-                grid = TRUE, 
-                col.line = "black",
-                ylab = "counts per minute",
-		ylim=c(min(samples$Counter), max(samples$Counter)),
-
-                xlim=c(min(samples$Time), max(samples$Time)),
-                main = "Change over time")
-
-plotHistogram <- histogram(samples$Counter, 
-                           color = "white", 
-                           col = "grey", 
-                           xlab = "counts", 
-                           ylab = "percentage", 
-                           main = "Histogram")
-
-# show graphs
-grid.arrange(plotValueVsTime, plotHistogram, nrow = 2)
-
-# add timestamp
-trellis.focus("toplevel")
-pictureCreationTimestamp <- as.POSIXlt(Sys.time())
-panel.text(0.85, 0.03, pictureCreationTimestamp, cex = 1.2, font = 2)
-trellis.unfocus()
+CSV2Diagrams::createDiagram("data.log")