Skip to content

Waterfall Plot #253

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Aug 8, 2024
Merged

Waterfall Plot #253

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
566d605
Waterfall: Prepare first basic version of the new function.
ASmirnov-HORIS Aug 6, 2024
cec4c25
Waterfall: Small fixes in API (parameter names).
ASmirnov-HORIS Aug 6, 2024
3ff811f
Waterfall: Add test notebook.
ASmirnov-HORIS Aug 6, 2024
85c65bd
Waterfall: Add cookbook.
ASmirnov-HORIS Aug 6, 2024
fd048bc
Waterfall: Add KDoc.
ASmirnov-HORIS Aug 6, 2024
b6fd605
Waterfall: Update the future_changes.md file.
ASmirnov-HORIS Aug 6, 2024
b00e063
Waterfall: Replace Double to Number in API.
ASmirnov-HORIS Aug 8, 2024
9be0d42
Waterfall: Rerun notebooks.
ASmirnov-HORIS Aug 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Waterfall: Small fixes in API (parameter names).
  • Loading branch information
@ASmirnov-HORIS
ASmirnov-HORIS committed Aug 6, 2024
commit cec4c25c8618455e9c8fb35faf318b1496c48c2e
6 changes: 3 additions & 3 deletions demo/jvm-batik/src/main/kotlin/frontendContextDemo/scripts/Waterfall.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ object Waterfall {
fill = "lightgrey",
size = 3.0,
alpha = 0.75,
lineType = "dotted",
linetype = "dotted",
width = 0.4,
showLegend = true,
relativeTooltips = layerTooltips()
Expand All @@ -50,8 +50,8 @@ object Waterfall {
totalTitle = "result",
sortedValue = true,
maxValues = 3,
hLine = elementLine(color = "magenta", size = 5),
hLineOnTop = false,
hline = elementLine(color = "magenta", size = 5),
hlineOntop = false,
connector = elementLine(color = "cyan", size = 1.5),
label = elementText(color = "flow_type", family = "Times", face = "bold", size = 5, angle = 45),
labelFormat = "d"
Expand Down
12 changes: 6 additions & 6 deletions plot-api/src/commonMain/kotlin/org/jetbrains/letsPlot/bistro/waterfall/WaterfallPlot.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ fun waterfallPlot(
fill: String? = null,
size: Double? = null,
alpha: Double? = null,
lineType: Any? = null,
linetype: Any? = null,
width: Double? = null,
showLegend: Boolean? = null,
relativeTooltips: Any? = null,
Expand All @@ -20,8 +20,8 @@ fun waterfallPlot(
sortedValue: Boolean? = null,
threshold: Double? = null,
maxValues: Int? = null,
hLine: Any? = null,
hLineOnTop: Boolean? = null,
hline: Any? = null,
hlineOntop: Boolean? = null,
connector: Any? = null,
label: Any? = null,
labelFormat: String? = null
Expand All @@ -35,7 +35,7 @@ fun waterfallPlot(
fill = fill,
size = size,
alpha = alpha,
lineType = lineType,
linetype = linetype,
width = width,
showLegend = showLegend,
relativeTooltips = relativeTooltips,
Expand All @@ -45,8 +45,8 @@ fun waterfallPlot(
sortedValue = sortedValue,
threshold = threshold,
maxValues = maxValues,
hLine = hLine,
hLineOnTop = hLineOnTop,
hline = hline,
hlineOntop = hlineOntop,
connector = connector,
label = label,
labelFormat = labelFormat
Expand Down
12 changes: 6 additions & 6 deletions ...api/src/commonMain/kotlin/org/jetbrains/letsPlot/bistro/waterfall/WaterfallPlotBuilder.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ internal class WaterfallPlotBuilder(
private val fill: String?,
private val size: Double?,
private val alpha: Double?,
private val lineType: Any?,
private val linetype: Any?,
private val width: Double?,
private val showLegend: Boolean?,
private val relativeTooltips: Any?,
Expand All @@ -26,8 +26,8 @@ internal class WaterfallPlotBuilder(
private val sortedValue: Boolean?,
private val threshold: Double?,
private val maxValues: Int?,
private val hLine: Any?,
private val hLineOnTop: Boolean?,
private val hline: Any?,
private val hlineOntop: Boolean?,
private val connector: Any?,
private val label: Any?,
private val labelFormat: String?
Expand All @@ -45,7 +45,7 @@ internal class WaterfallPlotBuilder(
Waterfall.FILL to fill,
Waterfall.SIZE to size,
Waterfall.ALPHA to alpha,
Waterfall.LINE_TYPE to lineType,
Waterfall.LINE_TYPE to linetype,
Waterfall.WIDTH to width,
Waterfall.SHOW_LEGEND to showLegend,
Waterfall.RELATIVE_TOOLTIPS to when (relativeTooltips) {
Expand All @@ -61,8 +61,8 @@ internal class WaterfallPlotBuilder(
Waterfall.SORTED_VALUE to sortedValue,
Waterfall.THRESHOLD to threshold,
Waterfall.MAX_VALUES to maxValues,
Waterfall.H_LINE to hLine,
Waterfall.H_LINE_ON_TOP to hLineOnTop,
Waterfall.H_LINE to hline,
Waterfall.H_LINE_ON_TOP to hlineOntop,
Waterfall.CONNECTOR to connector,
Waterfall.LABEL to label,
Waterfall.LABEL_FORMAT to labelFormat
Expand Down