Skip to content

Commit 93ff456

Browse files
committed
Revert break freezing functionality
1 parent f9618ac commit 93ff456

File tree

1 file changed

+1
-22
lines changed

1 file changed

+1
-22
lines changed

R/scale-.R

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -657,9 +657,6 @@ ScaleContinuous <- ggproto("ScaleContinuous", Scale,
657657
minor_breaks = waiver(),
658658
n.breaks = NULL,
659659
trans = transform_identity(),
660-
freeze_breaks = FALSE,
661-
frozen_breaks = NULL,
662-
frozen_minor_breaks = NULL,
663660

664661
is_discrete = function() FALSE,
665662

@@ -752,14 +749,10 @@ ScaleContinuous <- ggproto("ScaleContinuous", Scale,
752749
)
753750
}
754751

755-
breaks_are_frozen <- !is.null(self$frozen_breaks)
756-
757752
# Compute `zero_range()` in transformed space in case `limits` in data space
758753
# don't support conversion to numeric (#5304)
759754
if (zero_range(as.numeric(transformation$transform(limits)))) {
760755
breaks <- limits[1]
761-
} else if (self$freeze_breaks && breaks_are_frozen) {
762-
breaks <- self$frozen_breaks
763756
} else if (is.waive(self$breaks)) {
764757
if (!is.null(self$n.breaks) && trans_support_nbreaks(transformation)) {
765758
breaks <- transformation$breaks(limits, self$n.breaks)
@@ -778,10 +771,6 @@ ScaleContinuous <- ggproto("ScaleContinuous", Scale,
778771
breaks <- self$breaks
779772
}
780773

781-
if (self$freeze_breaks && !breaks_are_frozen) {
782-
self$frozen_breaks <- breaks
783-
}
784-
785774
# Breaks in data space need to be converted back to transformed space
786775
transformation$transform(breaks)
787776
},
@@ -805,12 +794,8 @@ ScaleContinuous <- ggproto("ScaleContinuous", Scale,
805794
# some transforms assume finite major breaks
806795
b <- b[is.finite(b)]
807796

808-
breaks_are_frozen <- !is.null(self$frozen_minor_breaks)
809-
810797
transformation <- self$get_transformation()
811-
if (self$freeze_breaks && breaks_are_frozen) {
812-
breaks <- self$frozen_minor_breaks
813-
} else if (is.waive(self$minor_breaks)) {
798+
if (is.waive(self$minor_breaks)) {
814799
if (is.null(b)) {
815800
breaks <- NULL
816801
} else {
@@ -834,10 +819,6 @@ ScaleContinuous <- ggproto("ScaleContinuous", Scale,
834819
breaks <- transformation$transform(self$minor_breaks)
835820
}
836821

837-
if (self$freeze_breaks && !breaks_are_frozen) {
838-
self$frozen_minor_breaks <- breaks
839-
}
840-
841822
# Any minor breaks outside the dimensions need to be thrown away
842823
discard(breaks, limits)
843824
},
@@ -894,8 +875,6 @@ ScaleContinuous <- ggproto("ScaleContinuous", Scale,
894875
clone = function(self) {
895876
new <- ggproto(NULL, self)
896877
new$range <- ContinuousRange$new()
897-
new$frozen_breaks <- NULL
898-
new$frozen_minor_breaks <- NULL
899878
new
900879
},
901880

0 commit comments

Comments
 (0)