changed filename pattern for image generation to restore generation of more than 1 image

mlilback · mlilback · commit 8f2da90d541a · 2017-11-27T12:09:35.000-05:00
diff --git a/R/rc2/R/rc2.R b/R/rc2/R/rc2.R
@@ -36,7 +36,7 @@ rc2.pngdev <- function()
 {
 	imgNum <- as.integer(get("imgNum", envir=rc2:::rc2cache))
 	assign("imgNum", imgNum + 1, envir=rc2:::rc2cache)
-	fname <- sprintf("rc2img%03d.png", imgNum, envir=rc2:::rc2cache)
+	fname <- sprintf("rc2img%03d-%%d.png", imgNum, envir=rc2:::rc2cache)
 	png(fname)
 	rc2.errlog("rc2.imgstart=%s\n", fname)
 }
diff --git a/src/FileManager.cpp b/src/FileManager.cpp
@@ -72,7 +72,7 @@ class RC2::FileManager::Impl : public ZeroInitializedClass {
         bool                        logInotify_;
 
 		Impl()
-			: imgRegex_("rc2img(\\d+).png"), dbConnection_(new PGDBConnection())
+			: imgRegex_("rc2img(\\d+)-(\\d+).png"), dbConnection_(new PGDBConnection())
 		{
             logInotify_ = getenv("RC2_LOG_INOTIFY") != NULL;
         }

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ rc2.pngdev <- function()`
`36`	`36`	`{`
`37`	`37`	`imgNum <- as.integer(get("imgNum", envir=rc2:::rc2cache))`
`38`	`38`	`assign("imgNum", imgNum + 1, envir=rc2:::rc2cache)`
`39`		`- fname <- sprintf("rc2img%03d.png", imgNum, envir=rc2:::rc2cache)`
	`39`	`+ fname <- sprintf("rc2img%03d-%%d.png", imgNum, envir=rc2:::rc2cache)`
`40`	`40`	`png(fname)`
`41`	`41`	`rc2.errlog("rc2.imgstart=%s\n", fname)`
`42`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ class RC2::FileManager::Impl : public ZeroInitializedClass {`
`72`	`72`	`bool logInotify_;`
`73`	`73`
`74`	`74`	`Impl()`
`75`		`- : imgRegex_("rc2img(\\d+).png"), dbConnection_(new PGDBConnection())`
	`75`	`+ : imgRegex_("rc2img(\\d+)-(\\d+).png"), dbConnection_(new PGDBConnection())`
`76`	`76`	`{`
`77`	`77`	`logInotify_ = getenv("RC2_LOG_INOTIFY") != NULL;`
`78`	`78`	`}`