[chronojump] If no curves found, signal graph is shown (with minHeight message)



commit d6f510209e9a9e25a76aee393b245b3170aacd52
Author: Xavier de Blas <xaviblas gmail com>
Date:   Mon Sep 5 13:28:17 2016 +0200

    If no curves found, signal graph is shown (with minHeight message)

 encoder/graph.R |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/encoder/graph.R b/encoder/graph.R
index 697d1a2..3abecb5 100644
--- a/encoder/graph.R
+++ b/encoder/graph.R
@@ -2128,8 +2128,8 @@ createPchVector <- function(ecconVector) {
 
 #-------------- end of EncoderConfiguration conversions -------------------------
 
-quitIfNoData <- function(curvesPlot, n, curves, outputData1) {
-        
+quitIfNoData <- function(curvesPlot, n, curves, outputData1, minHeight) 
+{
         debugParameters(listN(n, curves, outputData1), "quitIfNoData")
         
        #if not found curves with this data, plot a "sorry" message and exit
@@ -2140,7 +2140,8 @@ quitIfNoData <- function(curvesPlot, n, curves, outputData1) {
                if(! curvesPlot)
                        plot(0,0,type="n",axes=F,xlab="",ylab="")
 
-               text(x=0,y=0,translateToPrint("Sorry, no curves matched your criteria."),cex=1.5)
+               text(x=0, y=0, adj=0, cex=1.2, col="red",
+                    paste(translateToPrint("Sorry, no curves matched your criteria."),"\nMin height is = 
",minHeight/10,"cm"))
                dev.off()
                write("", outputData1)
                quit()
@@ -2416,7 +2417,7 @@ doProcess <- function(options)
                file.create(paste(op$FeedbackFileBase,"4.txt",sep=""))
 
                n=length(curves[,1])
-               quitIfNoData(curvesPlot, n, curves, op$OutputData1)
+               quitIfNoData(curvesPlot, n, curves, op$OutputData1, op$MinHeight)
                
                #print(curves, stderr())
        
@@ -2484,7 +2485,7 @@ doProcess <- function(options)
                        curvesPlot = TRUE
 
                n=length(curves[,1])
-               quitIfNoData(curvesPlot, n, curves, op$OutputData1)
+               quitIfNoData(curvesPlot, n, curves, op$OutputData1, op$MinHeight)
                
                print("curves before reduceCurveBySpeed")
                print(curves)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]