Update digestR.R

DDesmonts · web-flow · commit 5d1c1baebbe6 · 2024-09-24T13:51:56.000-06:00
if (inherits(colTest, 'try-error'))
diff --git a/R/digestR.R b/R/digestR.R
@@ -4065,7 +4065,8 @@ setGraphics <- function (file.name = currentSpectrum, all.files = FALSE,
       colErr <- FALSE
       for (i in roi.bcolor){
         colTest <- try(col2rgb(i), silent=TRUE)
-        if (class(colTest) == 'try-error')
+        #if (class(colTest) == 'try-error')
+        if (inherits(colTest, 'try-error'))
           colErr <- TRUE
       }
     }
@@ -4081,7 +4082,8 @@ setGraphics <- function (file.name = currentSpectrum, all.files = FALSE,
       colErr <- FALSE
       for (i in roi.tcolor){
         colTest <- try(col2rgb(i), silent=TRUE)
-        if (class(colTest) == 'try-error')
+        #if (class(colTest) == 'try-error')
+         if (inherits(colTest, 'try-error'))
           colErr <- TRUE
       }
     }

Original file line number	Diff line number	Diff line change
`@@ -4065,7 +4065,8 @@ setGraphics <- function (file.name = currentSpectrum, all.files = FALSE,`
`4065`	`4065`	`colErr <- FALSE`
`4066`	`4066`	`for (i in roi.bcolor){`
`4067`	`4067`	`colTest <- try(col2rgb(i), silent=TRUE)`
`4068`		`- if (class(colTest) == 'try-error')`
	`4068`	`+ #if (class(colTest) == 'try-error')`
	`4069`	`+ if (inherits(colTest, 'try-error'))`
`4069`	`4070`	`colErr <- TRUE`
`4070`	`4071`	`}`
`4071`	`4072`	`}`
`@@ -4081,7 +4082,8 @@ setGraphics <- function (file.name = currentSpectrum, all.files = FALSE,`
`4081`	`4082`	`colErr <- FALSE`
`4082`	`4083`	`for (i in roi.tcolor){`
`4083`	`4084`	`colTest <- try(col2rgb(i), silent=TRUE)`
`4084`		`- if (class(colTest) == 'try-error')`
	`4085`	`+ #if (class(colTest) == 'try-error')`
	`4086`	`+ if (inherits(colTest, 'try-error'))`
`4085`	`4087`	`colErr <- TRUE`
`4086`	`4088`	`}`
`4087`	`4089`	`}`