Skip to content

GitLab

Commit 54b4469c authored by Dan Lipsa's avatar Dan Lipsa Committed by Kitware Robot
Browse files
Options

Merge topic 'text-tight-bounding-box' 

31728f4e Baselines for text labels fixes.
9a3b037e BUG: lastPos = firstPos + size - 1.
87f9baa6 Shift quad position with one pixel to fix multiLineText test.
85812c7b Use NormalizedDisplay as for displaying the text.
06701a4d BUG: Use of double LineSpacing results in one pixel off errors.
64d9dd90 BUG: Ascent, descent are positions from the baseline.
350ff2a5 ENH: Add vtkTextProperty::UseTightBoundingBox to center a label to anchor.
9a0904d6 BUG: n lines of text include (n-1) interline spaces.
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Merge-request: !1925
parents b2a1373a 31728f4e
Pipeline #27329 failed with stage
    in 0 seconds
    Expand all Hide whitespace changes
    Inline Side-by-side
    Showing with 469 additions and 212 deletions
    Charts/Core/Testing/Data/Baseline/TestAreaPlot.png.md5
    View file @ 54b4469c
    177bd117be463e49c4c292accf0f3f6e
    8987f6d71f63e5f82c8456a3b939839c
    Charts/Core/Testing/Data/Baseline/TestBagPlot.png.md5
    View file @ 54b4469c
    f1f8236e4066f5ce14c5b866d1020317
    21815c7f01cf7c792d3eb167fe067373
    Charts/Core/Testing/Data/Baseline/TestBarGraph.png.md5
    View file @ 54b4469c
    a1dffc11a99c5de0d7894bd8212a16fd
    b9ebbbc55c68f6fa6a96711fae7fae03
    Charts/Core/Testing/Data/Baseline/TestBarGraphHorizontal.png.md5
    View file @ 54b4469c
    7b26c11b65f9cb38d5fc34dad4f7995e
    0f06628534760cd1932a6b8d5e42309d
    Charts/Core/Testing/Data/Baseline/TestBarGraphSelection.png.md5
    View file @ 54b4469c
    00044aaeeff1242ffae6a69705bf6380
    803c26f69ec6e0727ef1c0c3e79a46ef
    Charts/Core/Testing/Data/Baseline/TestBoxPlot.png.md5
    View file @ 54b4469c
    08dd93eb0237c2ffd089711e127bfff1
    bf84516a43f0b2f9e0752465cd1b13f2
    Charts/Core/Testing/Data/Baseline/TestChartDouble.png.md5
    View file @ 54b4469c
    b7b7055285612449c0c456658d63ad43
    9b0548cd55bcd6c4f2f5c499d57d3389
    Charts/Core/Testing/Data/Baseline/TestChartDoubleColors.png.md5
    View file @ 54b4469c
    38af8cbdffdf4d1a108400c324d0899e
    d23ed355133c128a749e28aa8828e3be
    Charts/Core/Testing/Data/Baseline/TestChartMatrix.png.md5
    View file @ 54b4469c
    9a850f9714cc60876d69edc0bb08d5b0
    f7523ebf31ce8baae7b58f455b008e5b
    Charts/Core/Testing/Data/Baseline/TestChartTileScaling.png.md5
    View file @ 54b4469c
    b1c73accbfc10292586f0f2963384b80
    81d5e3cfe55b96c735565bbf951e43f8
    Charts/Core/Testing/Data/Baseline/TestChartUnicode.png.md5
    View file @ 54b4469c
    98b59db57cdb8906ed50670d07a87a2b
    5188f8239d0967bd33c1fa73778d53d5
    Charts/Core/Testing/Data/Baseline/TestChartXYInvertedAxis.png.md5
    View file @ 54b4469c
    2ee5ef96d1759518b1847a4e48b35a5f
    7d7f5fe5f71b59db971f5ca42ab33433
    Charts/Core/Testing/Data/Baseline/TestChartsOn3D.png.md5
    View file @ 54b4469c
    214b8972d40722062fc38e67370277ac
    7e1bd0fd8be85c1c3acb56c096d16fa9
    Charts/Core/Testing/Data/Baseline/TestColorTransferFunction.png.md5
    View file @ 54b4469c
    c5994ee130fb6f9e11785268c7083b1f
    a95b69a905e3fa51071dfd86801c6ee3
    Charts/Core/Testing/Data/Baseline/TestContextArea.png.md5
    View file @ 54b4469c
    184553b310f2283682b8f014b41f0fc1
    18aea8567c8c48da409bd8df64b03568
    Charts/Core/Testing/Data/Baseline/TestContextAreaFixedAspect.png.md5
    View file @ 54b4469c
    91808c3a637b9fbf9183bf09a1c26706
    adef24be631e4044473e4014d5b9ad77
    Charts/Core/Testing/Data/Baseline/TestContextAreaFixedRect.png.md5
    View file @ 54b4469c
    7f3f6954db875c62242b414bfde0b7e8
    ce04192642fde42588172f4644681b32
    Charts/Core/Testing/Data/Baseline/TestFunctionalBagPlot.png.md5
    View file @ 54b4469c
    f674b816293f146d83d87c8dcb6e5383
    f1d2f258304220d0d1152b70fcda4c2e
    Charts/Core/Testing/Data/Baseline/TestHistogram2D.png.md5
    View file @ 54b4469c
    6dfef47ccee43e63802c1edcc673cab0
    2e62919bbe6ef3fecb6c613fbef79596
    Charts/Core/Testing/Data/Baseline/TestInteractiveChartXYZ.png.md5
    View file @ 54b4469c
    5487588b6d595d4561907648f85f916a
    093b335cc97c3218fb60beafb373cbae
    Charts/Core/Testing/Data/Baseline/TestLinePlot.png.md5
    View file @ 54b4469c
    9733be220d1d416ecda43b9a9c04f539
    292fc2108698adc96b4963f42a6fc889
    Charts/Core/Testing/Data/Baseline/TestLinePlot2.png.md5
    View file @ 54b4469c
    e72ca9e8086c3d32200c3f246e3a5be0
    e8b91a00bfe5d633911493d78d4142ae
    Charts/Core/Testing/Data/Baseline/TestLinePlotColors.png.md5
    View file @ 54b4469c
    4ebe59930fab8b44354ad3ddea39a687
    3b58dcbd917754ef963a1959074e6e10
    Charts/Core/Testing/Data/Baseline/TestLinePlotDouble.png.md5
    View file @ 54b4469c
    878dac98f8dfdd7be1985179d2593cdc
    3647bd6777c5c9e9cfb7098d19ec321b
    Charts/Core/Testing/Data/Baseline/TestLinePlotDouble2.png.md5
    View file @ 54b4469c
    66538857290b252e064f339a4d480ae4
    4c3120421364d4beedfa7a7570a858d7
    Charts/Core/Testing/Data/Baseline/TestLinePlotInteraction.png.md5
    View file @ 54b4469c
    183b0843b6c6d15717bea9f47a942d41
    6966f5696adf2a9a3ae891c6e93f4802
    Charts/Core/Testing/Data/Baseline/TestLinePlotSelection.png.md5
    View file @ 54b4469c
    68187b50e757da9e3801469652cb753f
    6b691e97233be3e56f9b7f29aebd1014
    Charts/Core/Testing/Data/Baseline/TestLinePlotSelection2.png.md5
    View file @ 54b4469c
    d82bf6adeed89c7905ea93f061731156
    0f06210adf91e59988a75ab1250ab41e
    Charts/Core/Testing/Data/Baseline/TestLinePlotSelection2_1.png.md5
    View file @ 54b4469c
    17020f1b46a2d6bdbed67abbef065b0c
    d695e5778661dae3a55388c046149c04
    Charts/Core/Testing/Data/Baseline/TestLinePlotSelection_1.png.md5
    View file @ 54b4469c
    32e33a782041be03ced33784e1cb2a98
    a3c7a265e72eec60c4a1f114c933ec6b
    Charts/Core/Testing/Data/Baseline/TestMultipleChartRenderers.png.md5
    View file @ 54b4469c
    188fd03bd16efdf766c0514167e039bc
    c6ff9134e056b361bd712b5841425b1f
    Charts/Core/Testing/Data/Baseline/TestMultipleRenderers.png.md5
    View file @ 54b4469c
    268f49560d77178a83bcc4eedda5c634
    3ff74b248e6b060b6dfd1a4a1eb29c4b
    Charts/Core/Testing/Data/Baseline/TestMultipleRenderers_1.png.md5
    View file @ 54b4469c
    e5678490f4330ee1ab8a2dd0afad1dd9
    c56573cf25ba5412cd36a2a90e19976f
    Charts/Core/Testing/Data/Baseline/TestMultipleScalarsToColors.png.md5
    View file @ 54b4469c
    9d2de86b4e58da13986fee8ad0ad8351
    1ef5bbd46f4b2f04419a876672e46845
    Charts/Core/Testing/Data/Baseline/TestPlotMatrix.png.md5
    View file @ 54b4469c
    d37f82f68118ba55b9ec0016abee3ce7
    5a266a45291a42c7a5a9505fa96a3587
    Charts/Core/Testing/Data/Baseline/TestPropItem.png.md5
    View file @ 54b4469c
    a8d3e1120eefc4785a7a2225ddfdea9f
    98d459397f09e5196b03e8fa23d32c77
    Charts/Core/Testing/Data/Baseline/TestScalarsToColors.png.md5
    View file @ 54b4469c
    272891f5537f5cf70a03d5fc827b902e
    76f10c55826553bf155c8d0a6b069a0c
    Charts/Core/Testing/Data/Baseline/TestScalarsToColors_1.png.md5
    View file @ 54b4469c
    2e4eadc6096c5dbcebe721b1d7f2033e
    2791cc911f2e99bfcd0fc69b4d7a6e14
    Charts/Core/Testing/Data/Baseline/TestScatterPlot.png.md5
    View file @ 54b4469c
    9eea8002e9169b898a30f52c5498e115
    eaa03b9227dcaa010b6a36acbebac3bf
    Charts/Core/Testing/Data/Baseline/TestScatterPlotColors.png.md5
    View file @ 54b4469c
    4d06dccbb5954dca5787e187289fd91d
    ef4480830a21e5c9b74e4caebe38cc3e
    Charts/Core/Testing/Data/Baseline/TestScatterPlotMatrixVehicles.png.md5
    View file @ 54b4469c
    7049505b949330ad4c6dd36c1af7b8df
    41bb2c083aac29439c89b26980135cc4
    Charts/Core/Testing/Data/Baseline/TestStackedBarGraph.png.md5
    View file @ 54b4469c
    db5b22ac4e57d859410a9aeca1ba706b
    f87805ea7113fe5c1d8dceb327742b06
    Charts/Core/Testing/Data/Baseline/TestStackedPlot.png.md5
    View file @ 54b4469c
    3f7e3acf6d2e78a4084218979b41068d
    d7780e616782105c9cd50238b9afcdb6
    Charts/Core/Testing/Data/Baseline/TestSurfacePlot.png.md5
    View file @ 54b4469c
    84248d244fdb99a6e6033c730ab01dd9
    62856cc5e6a5a25329f7d147b4e841a3
    Charts/Core/Testing/Data/Baseline/TestZoomAxis.png.md5
    View file @ 54b4469c
    78536392754a59b91c609386a0813efc
    40118c94b3b8d3a5cefb5d7c39f963e0
    Charts/Core/Testing/Data/Baseline/TestZoomAxis_1.png.md5
    View file @ 54b4469c
    e268742c63a67a605347204a388e73fa
    63732833f741c5fa2d7164a10c5d3c07
    Filters/Points/Testing/Data/Baseline/PlotSPHKernels.png.md5
    View file @ 54b4469c
    2b6cca57fc16b65edbaff6285b1baf12
    5618fa4422a63989c3e3c9118b6aa81b
    Filters/Points/Testing/Data/Baseline/PlotSPHKernels_1.png.md5
    View file @ 54b4469c
    f3da3527c909cc8a5b2a10d4bc779742
    f1ec63d0866c570c548c59ee8e18be24
    Geovis/Core/Testing/Data/Baseline/TestLabeledGeoView2D.png.md5
    View file @ 54b4469c
    0087f914e60fafcad8b2a720bda407d1
    2462f5b7ef1bfef2d2f4665f16504ef6
    Geovis/Core/Testing/Data/Baseline/TestLabeledGeoView2D_1.png.md5
    View file @ 54b4469c
    a237e17712a183b6e3f3e4d839774790
    afc643c12bbe41776ff27c0a3cafba08
    IO/Export/Testing/Data/Baseline/TestGL2PSExporterRaster-rasterRef.png.md5
    View file @ 54b4469c
    35a0d7162b58f1706ad19681aecc5099
    c06830f37a6a19df0695e572171342d0
    IO/Export/Testing/Data/Baseline/TestGL2PSExporterRaster-rasterRef_1.png.md5
    View file @ 54b4469c
    ec862b727e65bc9d89ea7b982cd8d21c
    22448b878dfc24eb8785411aa758a6b9
    IO/Export/Testing/Data/Baseline/TestGL2PSExporterRaster.png.md5
    View file @ 54b4469c
    74fc0165820f613d07221be87112fb54
    2e3b96c79aa9ba70a10792a1789e695e
    IO/Export/Testing/Data/Baseline/TestGL2PSExporterVolumeRaster.png.md5
    View file @ 54b4469c
    ded21dec53749c2bb5dcf23ffd8a7fe4
    2ddabd331b4ff2fcdfed7b0202495e35
    IO/Export/Testing/Data/Baseline/TestGL2PSScalarBar-rasterRef.png.md5
    View file @ 54b4469c
    99f8713d371bd6bdbcf52eb019fd792c
    44875ba5aa7a8f87a95d44ea28a8e93c
    IO/Export/Testing/Data/Baseline/TestGL2PSScalarBar-rasterRef_1.png.md5
    View file @ 54b4469c
    2a358f9fe51f05a7104b0f0089035a7b
    efe5aadb10754107d294a580f8d342c3
    IO/Export/Testing/Data/Baseline/TestGL2PSScalarBar.png.md5
    View file @ 54b4469c
    f386acf23fcbddb7032d4f6573798236
    c647e9e29b22908b01a4747d635b2ef3
    IO/Export/Testing/Data/Baseline/TestGL2PSTextActor-rasterRef.png.md5
    View file @ 54b4469c
    2c6afa48066111eea67dbe03cf5ebaf2
    b6863109224d0cf49713846746e32651
    IO/Export/Testing/Data/Baseline/TestGL2PSTextActor.png.md5
    View file @ 54b4469c
    3c1f1475164cc67fb8d5283639f41f16
    a8f72beed72517307830c90a8fe32e14
    IO/Export/Testing/Data/Baseline/TestGL2PSTextActor3D-rasterRef.png.md5
    View file @ 54b4469c
    ba78fc0526c3263f7674deb02fd51b9f
    ba73e5caf36009fa22fdfd36f14a27d0
    IO/Export/Testing/Data/Baseline/TestGL2PSTextMapper-rasterRef.png.md5
    View file @ 54b4469c
    653fa14d2d880476c306dccd9a7472b2
    2c5d6874473f06a82a292033fe5d6a52
    IO/Export/Testing/Data/Baseline/TestGL2PSTextMapper.png.md5
    View file @ 54b4469c
    732debf9bdfc5095510710bbc9d02c5c
    2d649b1caa966c219d95c82cb170a66b
    IO/Export/Testing/Data/Baseline/TestLinePlotGL2PS-rasterRef.png.md5
    View file @ 54b4469c
    da420f1c8ef140134e39b325d5b7567f
    8fd31aa0c21f93ba3f09e8985b8b8066
    IO/Export/Testing/Data/Baseline/TestLinePlotGL2PS.png.md5
    View file @ 54b4469c
    94c04e226b6f59046c9d71c5c251d8c5
    54efd3f6b4ad6dfc02314fef272ce641
    IO/Export/Testing/Data/Baseline/TestStackedPlotGL2PS-rasterRef.png.md5
    View file @ 54b4469c
    5e5e9fcb766b57bc8940892cf0a54c95
    27d0437b4c69de362ed1ac4daf9d144f
    IO/Export/Testing/Data/Baseline/TestStackedPlotGL2PS.png.md5
    View file @ 54b4469c
    edcf235af616e7087f11f2ce90f617d7
    9b4709cad3077910e6a1a8f3e68b516f
    IO/ExportOpenGL/Testing/Data/Baseline/TestGL2PSExporterVector.png.md5
    View file @ 54b4469c
    74fc0165820f613d07221be87112fb54
    5bceb8274497f9d305b9a0faaa3e4dcf
    Interaction/Widgets/Testing/Data/Baseline/TestParallelopipedWidget.png.md5
    View file @ 54b4469c
    eb54be77de7d45a06fd8e54b4179fe15
    563b0370297514cd8f5295304b1ce609
    Interaction/Widgets/Testing/Data/Baseline/TestSliderWidget2D_1.png.md5
    View file @ 54b4469c
    4f5580f0ba97b35308338f67317090b1
    d4e168b80933bc2a57d28ec250efd8c1
    Interaction/Widgets/Testing/Data/Baseline/TestSplineWidget.png.md5
    View file @ 54b4469c
    3b929d447a109e4832b7ef89c9a7b84b
    4e08befe60f210cb39b2af4dd4e5b2d2
    Rendering/Annotation/Testing/Data/Baseline/TestBarChartActor.png.md5
    View file @ 54b4469c
    c3eb6bd658da220fe45ab75ed022b543
    0d23c1cfdf788825851d78b3e354988f
    Rendering/Annotation/Testing/Data/Baseline/TestBarChartActor_1.png.md5
    View file @ 54b4469c
    5a4f59aefa73419fc065da8c4027be77
    c82b7477664bb26f28f24204d4fa67cd
    Rendering/Core/vtkTextMapper.cxx
    View file @ 54b4469c
    This diff is collapsed.
    Rendering/Core/vtkTextProperty.cxx
    View file @ 54b4469c
    This diff is collapsed.
    Rendering/Core/vtkTextProperty.h
    View file @ 54b4469c
    This diff is collapsed.
    Rendering/FreeType/vtkFreeTypeTools.cxx
    View file @ 54b4469c
    This diff is collapsed.
    Rendering/FreeType/vtkFreeTypeTools.h
    View file @ 54b4469c
    This diff is collapsed.
    Markdown is supported
    0% or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment