fixed measurements

Textualize · Oct 3, 2020 · 92f62f4 · 92f62f4
1 parent 57b2dcd
commit 92f62f4
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -20,6 +20,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Optimized combining styles involving a null style
 - Change error messages in Style.parse to read better
 
+### Fixed
+
+- Fixed Table.\_\_rich_measure\_\_
+- Fixed incorrect calculation of fixed width columns
+
 ## [7.1.0] - 2020-09-26
 
 ### Added

diff --git a/rich/columns.py b/rich/columns.py
@@ -121,7 +121,7 @@ def iter_renderables(
         table.title = self.title
 
         if self.width is not None:
-            column_count = max_width // self.width
+            column_count = (max_width) // (self.width + width_padding)
             for _ in range(column_count):
                 table.add_column(width=self.width)
         else:

diff --git a/rich/constrain.py b/rich/constrain.py
@@ -29,8 +29,7 @@ def __rich_console__(
             yield from console.render(self.renderable, child_options)
 
     def __rich_measure__(self, console: "Console", max_width: int) -> "Measurement":
-        if self.width is None:
-            return Measurement.get(console, self.renderable, max_width)
-        else:
-            width = min(self.width, max_width)
-            return Measurement(width, width)
+        if self.width is not None:
+            max_width = min(self.width, max_width)
+        measurement = Measurement.get(console, self.renderable, max_width)
+        return measurement
diff --git a/tests/test_columns.py b/tests/test_columns.py
@@ -54,14 +54,15 @@ def render():
     console.print(columns)
     console.rule("fixed width")
     columns.width = 16
+    columns.expand = False
     console.print(columns)
     console.print()
     render_result = console.file.getvalue()
     return render_result
 
 
 def test_render():
-    expected = "────────────────────────────────────────────── empty ───────────────────────────────────────────────\n───────────────────────────────────────────── optimal ──────────────────────────────────────────────\nUrsus americanus           American buffalo       Bison bison            American crow          \nCorvus brachyrhynchos      American marten        Martes americana       American racer         \nColuber constrictor        American woodcock      Scolopax minor         Anaconda (unidentified)\nEunectes sp.               Andean goose           Chloephaga melanoptera Ant                    \nAnteater, australian spiny Tachyglossus aculeatus Anteater, giant        Myrmecophaga tridactyla\n───────────────────────────────────────── optimal, expand ──────────────────────────────────────────\nUrsus americanus             American buffalo        Bison bison             American crow          \nCorvus brachyrhynchos        American marten         Martes americana        American racer         \nColuber constrictor          American woodcock       Scolopax minor          Anaconda (unidentified)\nEunectes sp.                 Andean goose            Chloephaga melanoptera  Ant                    \nAnteater, australian spiny   Tachyglossus aculeatus  Anteater, giant         Myrmecophaga tridactyla\n────────────────────────────────────── columm first, optimal ───────────────────────────────────────\nUrsus americanus      American marten     Scolopax minor          Ant                       \nAmerican buffalo      Martes americana    Anaconda (unidentified) Anteater, australian spiny\nBison bison           American racer      Eunectes sp.            Tachyglossus aculeatus    \nAmerican crow         Coluber constrictor Andean goose            Anteater, giant           \nCorvus brachyrhynchos American woodcock   Chloephaga melanoptera  Myrmecophaga tridactyla   \n─────────────────────────────────── column first, right to left ────────────────────────────────────\nAnt                        Scolopax minor          American marten     Ursus americanus     \nAnteater, australian spiny Anaconda (unidentified) Martes americana    American buffalo     \nTachyglossus aculeatus     Eunectes sp.            American racer      Bison bison          \nAnteater, giant            Andean goose            Coluber constrictor American crow        \nMyrmecophaga tridactyla    Chloephaga melanoptera  American woodcock   Corvus brachyrhynchos\n────────────────────────────────────── equal columns, expand ───────────────────────────────────────\nChloephaga melanoptera            American racer                    Ursus americanus                \nAnt                               Coluber constrictor               American buffalo                \nAnteater, australian spiny        American woodcock                 Bison bison                     \nTachyglossus aculeatus            Scolopax minor                    American crow                   \nAnteater, giant                   Anaconda (unidentified)           Corvus brachyrhynchos           \nMyrmecophaga tridactyla           Eunectes sp.                      American marten                 \n                                  Andean goose                      Martes americana                \n─────────────────────────────────────────── fixed width ────────────────────────────────────────────\nTachyglossus      Chloephaga       Anaconda         Coluber          Corvus           Ursus american\naculeatus         melanoptera      (unidentified)   constrictor      brachyrhynchos                 \nAnteater, giant   Ant              Eunectes sp.     American         American marten  American buffa\n                                                    woodcock                                        \nMyrmecophaga      Anteater,        Andean goose     Scolopax minor   Martes americana Bison bison   \ntridactyla        australian spiny                                                                  \n                                                                     American racer   American crow \n\n"
+    expected = "────────────────────────────────────────────── empty ───────────────────────────────────────────────\n───────────────────────────────────────────── optimal ──────────────────────────────────────────────\nUrsus americanus           American buffalo       Bison bison            American crow          \nCorvus brachyrhynchos      American marten        Martes americana       American racer         \nColuber constrictor        American woodcock      Scolopax minor         Anaconda (unidentified)\nEunectes sp.               Andean goose           Chloephaga melanoptera Ant                    \nAnteater, australian spiny Tachyglossus aculeatus Anteater, giant        Myrmecophaga tridactyla\n───────────────────────────────────────── optimal, expand ──────────────────────────────────────────\nUrsus americanus             American buffalo        Bison bison             American crow          \nCorvus brachyrhynchos        American marten         Martes americana        American racer         \nColuber constrictor          American woodcock       Scolopax minor          Anaconda (unidentified)\nEunectes sp.                 Andean goose            Chloephaga melanoptera  Ant                    \nAnteater, australian spiny   Tachyglossus aculeatus  Anteater, giant         Myrmecophaga tridactyla\n────────────────────────────────────── columm first, optimal ───────────────────────────────────────\nUrsus americanus      American marten     Scolopax minor          Ant                       \nAmerican buffalo      Martes americana    Anaconda (unidentified) Anteater, australian spiny\nBison bison           American racer      Eunectes sp.            Tachyglossus aculeatus    \nAmerican crow         Coluber constrictor Andean goose            Anteater, giant           \nCorvus brachyrhynchos American woodcock   Chloephaga melanoptera  Myrmecophaga tridactyla   \n─────────────────────────────────── column first, right to left ────────────────────────────────────\nAnt                        Scolopax minor          American marten     Ursus americanus     \nAnteater, australian spiny Anaconda (unidentified) Martes americana    American buffalo     \nTachyglossus aculeatus     Eunectes sp.            American racer      Bison bison          \nAnteater, giant            Andean goose            Coluber constrictor American crow        \nMyrmecophaga tridactyla    Chloephaga melanoptera  American woodcock   Corvus brachyrhynchos\n────────────────────────────────────── equal columns, expand ───────────────────────────────────────\nChloephaga melanoptera                American racer                    Ursus americanus            \nAnt                                   Coluber constrictor               American buffalo            \nAnteater, australian spiny            American woodcock                 Bison bison                 \nTachyglossus aculeatus                Scolopax minor                    American crow               \nAnteater, giant                       Anaconda (unidentified)           Corvus brachyrhynchos       \nMyrmecophaga tridactyla               Eunectes sp.                      American marten             \n                                      Andean goose                      Martes americana            \n─────────────────────────────────────────── fixed width ────────────────────────────────────────────\nAnteater,         Eunectes sp.     Coluber          Corvus           Ursus americanus \naustralian spiny                   constrictor      brachyrhynchos                    \nTachyglossus      Andean goose     American         American marten  American buffalo \naculeatus                          woodcock                                           \nAnteater, giant   Chloephaga       Scolopax minor   Martes americana Bison bison      \n                  melanoptera                                                         \nMyrmecophaga      Ant              Anaconda         American racer   American crow    \ntridactyla                         (unidentified)                                     \n\n"
     assert render() == expected