Skip to content
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

Jump to bottom

Variadic line width #802

Merged
merged 5 commits into from
Jun 29, 2023
Merged

Variadic line width #802

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
db5ad59
- variadic width path
IKupriyanov-HORIS Jun 16, 2023
a303ba9
Fix tooltips for variadic paths
IKupriyanov-HORIS Jun 28, 2023
9e39a0a
Correct color markers in tooltip, update future_changes.md
IKupriyanov-HORIS Jun 28, 2023
c063574
Merge remote-tracking branch 'origin/master' into variadic-linewidth
IKupriyanov-HORIS Jun 28, 2023
c73ffb7
Fix after merge
IKupriyanov-HORIS Jun 28, 2023
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
Merge remote-tracking branch 'origin/master' into variadic-linewidth 
# Conflicts:
#	plot-base-portable/src/commonMain/kotlin/jetbrains/datalore/plot/base/geom/PieGeom.kt
#	plot-base-portable/src/commonMain/kotlin/jetbrains/datalore/plot/base/geom/SmoothGeom.kt
#	plot-base-portable/src/commonMain/kotlin/jetbrains/datalore/plot/base/geom/util/LinesHelper.kt
  • Loading branch information
@IKupriyanov-HORIS
IKupriyanov-HORIS committed Jun 28, 2023
commit c063574150c244df45b9afae4f77c555794ffc36
10 changes: 5 additions & 5 deletions plot-base-portable/src/commonMain/kotlin/jetbrains/datalore/plot/base/geom/PieGeom.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ import jetbrains.datalore.plot.base.render.LegendKeyElementFactory
import jetbrains.datalore.plot.base.render.SvgRoot
import jetbrains.datalore.plot.base.render.svg.LinePath
import jetbrains.datalore.plot.common.data.SeriesUtil
import jetbrains.datalore.vis.TextStyle
import jetbrains.datalore.vis.svg.SvgCircleElement
import jetbrains.datalore.vis.svg.SvgGElement
import jetbrains.datalore.vis.svg.SvgLineElement
import jetbrains.datalore.vis.svg.SvgPathDataBuilder
import org.jetbrains.letsPlot.datamodel.svg.style.TextStyle
import org.jetbrains.letsPlot.datamodel.svg.dom.SvgCircleElement
import org.jetbrains.letsPlot.datamodel.svg.dom.SvgGElement
import org.jetbrains.letsPlot.datamodel.svg.dom.SvgLineElement
import org.jetbrains.letsPlot.datamodel.svg.dom.SvgPathDataBuilder
import kotlin.math.*

class PieGeom : GeomBase(), WithWidth, WithHeight {
Expand Down
4 changes: 1 addition & 3 deletions plot-base-portable/src/commonMain/kotlin/jetbrains/datalore/plot/base/geom/SmoothGeom.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,16 +32,14 @@ class SmoothGeom : GeomBase() {
val helper = LinesHelper(pos, coord, ctx)

helper.setAlphaEnabled(false)
val regressionLines = helper.createLines(dataPoints, GeomUtil.TO_LOCATION_X_Y)
root.appendNodes(regressionLines)

// Confidence interval
val bands = helper.createBands(dataPoints, GeomUtil.TO_LOCATION_X_YMAX, GeomUtil.TO_LOCATION_X_YMIN)
root.appendNodes(bands)

// Regression line
val regressionLines = helper.createLines(dataPoints, GeomUtil.TO_LOCATION_X_Y)
appendNodes(regressionLines, root)
root.appendNodes(regressionLines)

buildHints(dataPoints, pos, coord, ctx)
}
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.