Bug fix in plot.linnet

Author: baddstats

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: spatstat.linnet
-Version: 3.4-0.009
-Date: 2025-12-20
+Version: 3.4-0.010
+Date: 2025-12-21
 Title: Linear Networks Functionality of the 'spatstat' Family
 Authors@R: c(person("Adrian", "Baddeley", 
                     role = c("aut", "cre", "cph"),

NEWS

@@ -1,12 +1,14 @@
 
-        CHANGES IN spatstat.linnet VERSION 3.4-0.009
+        CHANGES IN spatstat.linnet VERSION 3.4-0.010
 
 OVERVIEW
 
     o Improved algorithm for integrating a function on a network.
 
     o Improvement to perspective plot on a network.
 
+    o Minor improvements and bug fixes.
+
 SIGNIFICANT USER-VISIBLE CHANGES
 
     o integral.linfun
@@ -25,12 +27,16 @@ SIGNIFICANT USER-VISIBLE CHANGES
     to be plotted on the horizontal plane at height zero.
 
     o persp.linim
-    New argument 'zadjust' to control vertical scale.
+    New argument 'zadjust' to adjust the vertical scale.
 
 BUG FIXES
 
     o lurking.lppm
     Crashed if envelope=TRUE.
+    Fixed.
+
+    o plot.linnet
+    Disobeyed 'do.plot=FALSE'.
     Fixed.
 
         CHANGES IN spatstat.linnet VERSION 3.4-0

R/linnet.R

@@ -3,7 +3,7 @@
 #    
 #    Linear networks
 #
-#    $Revision: 1.97 $    $Date: 2025/11/23 06:47:21 $
+#    $Revision: 1.98 $    $Date: 2025/12/21 02:34:52 $
 #
 # An object of class 'linnet' defines a linear network.
 # It includes the following components
@@ -222,6 +222,7 @@ plot.linnet <- function(x, ..., main=NULL, add=FALSE,
   argh <- list(...)
   lines <- as.psp(x)
   if(show.vertices) vert <- vertices(x)
+  #' ..........................................................
   #' plan layout and save symbolmaps
   RS <- do.call(plot,
                resolve.defaults(list(x=quote(lines),
@@ -245,34 +246,38 @@ plot.linnet <- function(x, ..., main=NULL, add=FALSE,
   } else {
     RV <- NULL
   }
-  ## initialise plot
-  if(!add) {
-    args.main <- argh[names(argh) %in% c("cex.main", "adj.main", "col")]
-    do.call(plot, append(list(x=quote(B), type="n", main=main),
-                         args.main))
-  }
-  ## plot segments and (optionally) vertices
-  do.call(plot,
-          resolve.defaults(list(x=quote(lines),
-                                add=TRUE,
-                                show.window=show.window,
-                                show.all=TRUE, 
-                                main="",
-                                multiplot=FALSE),
-                           args.segments,
-                           list(...),
-                           list(use.marks=FALSE, legend=FALSE)))
-  if(show.vertices) {
+  #' ---------------- actual plotting ------------------------
+  if(do.plot) {
+    ## initialise plot
+    if(!add) {
+      args.main <- argh[names(argh) %in% c("cex.main", "adj.main", "col")]
+      do.call(plot, append(list(x=quote(B), type="n", main=main),
+                           args.main))
+    }
+    ## plot segments and (optionally) vertices
     do.call(plot,
-            resolve.defaults(list(x=quote(vert),
+            resolve.defaults(list(x=quote(lines),
                                   add=TRUE,
-                                  show.window=FALSE,
-                                  show.all=TRUE,
-                                  main=""),
-                             args.vertices,
+                                  show.window=show.window,
+                                  show.all=TRUE, 
+                                  main="",
+                                  multiplot=FALSE),
+                             args.segments,
                              list(...),
                              list(use.marks=FALSE, legend=FALSE)))
+    if(show.vertices) {
+      do.call(plot,
+              resolve.defaults(list(x=quote(vert),
+                                    add=TRUE,
+                                    show.window=FALSE,
+                                    show.all=TRUE,
+                                    main=""),
+                               args.vertices,
+                               list(...),
+                               list(use.marks=FALSE, legend=FALSE)))
+    }
   }
+  #' --------- return colour maps and layout ----------------------
   result <- list(segments=RS, vertices=RV)
   attr(result, "bbox") <- B
   return(invisible(result))

inst/doc/packagesizes.txt

@@ -42,4 +42,4 @@ date version nhelpfiles nobjects ndatasets Rlines srclines
 "2025-07-24" "3.3-1" 150 328 0 13326 3270
 "2025-09-24" "3.3-2" 150 328 0 13356 3270
 "2025-11-29" "3.4-0" 160 370 0 14990 3270
-"2025-12-20" "3.4-0.009" 160 372 0 15416 3270
+"2025-12-21" "3.4-0.010" 160 372 0 15421 3270

inst/info/packagesizes.txt

@@ -42,4 +42,4 @@ date version nhelpfiles nobjects ndatasets Rlines srclines
 "2025-07-24" "3.3-1" 150 328 0 13326 3270
 "2025-09-24" "3.3-2" 150 328 0 13356 3270
 "2025-11-29" "3.4-0" 160 370 0 14990 3270
-"2025-12-20" "3.4-0.009" 160 372 0 15416 3270
+"2025-12-21" "3.4-0.010" 160 372 0 15421 3270