Merge pull request #451 from fast-aircraft-design/issue-450_mass-plot…

…-limitation

Now allowing more than 5 datasets in mass breakdown bar plot

src/fastoad/gui/analysis_and_plots.py

@@ -2,7 +2,7 @@
 Defines the analysis and plotting functions for postprocessing
 """
 #  This file is part of FAST-OAD : A framework for rapid Overall Aircraft Design
-#  Copyright (C) 2021 ONERA & ISAE-SUPAERO
+#  Copyright (C) 2022 ONERA & ISAE-SUPAERO
 #  FAST is free software: you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
 #  the Free Software Foundation, either version 3 of the License, or
@@ -17,15 +17,15 @@
 from typing import Dict
 
 import numpy as np
-import plotly
+import plotly.express as px
 import plotly.graph_objects as go
 from openmdao.utils.units import convert_units
 from plotly.subplots import make_subplots
 
 from fastoad.io import VariableIO
 from fastoad.openmdao.variables import VariableList
 
-COLS = plotly.colors.DEFAULT_PLOTLY_COLORS
+COLS = px.colors.qualitative.Plotly
 
 
 # pylint: disable-msg=too-many-locals
@@ -303,7 +303,7 @@ def mass_breakdown_bar_plot(
         )
 
     # Same color for each aircraft configuration
-    i = len(fig.data)
+    i = int(len(fig.data) / 2) % 10
 
     weight_labels = ["MTOW", "OWE", "Fuel - Mission", "Payload"]
     weight_values = [mtow, owe, fuel_mission, payload]

src/fastoad/gui/tests/test_analysis_and_plots.py

@@ -2,7 +2,7 @@
 Tests for analysis and plots functions
 """
 #  This file is part of FAST-OAD : A framework for rapid Overall Aircraft Design
-#  Copyright (C) 2021 ONERA & ISAE-SUPAERO
+#  Copyright (C) 2022 ONERA & ISAE-SUPAERO
 #  FAST is free software: you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
 #  the Free Software Foundation, either version 3 of the License, or
@@ -44,10 +44,11 @@ def test_wing_geometry_plot():
     # The test will fail if an error is raised by the following line
     fig = wing_geometry_plot(filename, name="First plot")
 
-    # Adding a plot to the previous fig
+    # Adding plots to the previous fig
     # This is a rudimentary test as plot are difficult to verify
     # The test will fail if an error is raised by the following line
-    fig = wing_geometry_plot(filename, name="Second plot", fig=fig)
+    for i in range(20):
+        fig = wing_geometry_plot(filename, name=f"Plot {i}", fig=fig)
 
 
 def test_aircraft_geometry_plot():
@@ -67,10 +68,11 @@ def test_aircraft_geometry_plot():
     # The test will fail if an error is raised by the following line
     fig = aircraft_geometry_plot(filename, name="First plot")
 
-    # Adding a plot to the previous fig
+    # Adding plots to the previous fig
     # This is a rudimentary test as plot are difficult to verify
     # The test will fail if an error is raised by the following line
-    fig = aircraft_geometry_plot(filename, name="Second plot", fig=fig)
+    for i in range(20):
+        fig = aircraft_geometry_plot(filename, name=f"Plot {i}", fig=fig)
 
 
 def test_mass_breakdown_bar_plot():
@@ -90,10 +92,11 @@ def test_mass_breakdown_bar_plot():
     # The test will fail if an error is raised by the following line
     fig = mass_breakdown_bar_plot(filename, name="First plot")
 
-    # Adding a plot to the previous fig
+    # Adding plots to the previous fig
     # This is a rudimentary test as plot are difficult to verify
     # The test will fail if an error is raised by the following line
-    _ = mass_breakdown_bar_plot(filename, name="Second plot", fig=fig)
+    for i in range(20):
+        _ = mass_breakdown_bar_plot(filename, name=f"Plot {i}", fig=fig)
 
 
 def test_drag_polar_plot():