RCAIDE-GUI 1.0.3__tar.gz → 1.0.5__tar.gz

{rcaide_gui-1.0.3 → rcaide_gui-1.0.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: RCAIDE-GUI
-Version: 1.0.3
+Version: 1.0.5
 Summary: RCAIDE Graphical User Interface: interactive desktop application for aircraft design and analysis
 License: MIT License
 Classifier: Development Status :: 4 - Beta

{rcaide_gui-1.0.3 → rcaide_gui-1.0.5}/RCAIDE_GUI.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: RCAIDE-GUI
-Version: 1.0.3
+Version: 1.0.5
 Summary: RCAIDE Graphical User Interface: interactive desktop application for aircraft design and analysis
 License: MIT License
 Classifier: Development Status :: 4 - Beta

{rcaide_gui-1.0.3 → rcaide_gui-1.0.5}/RCAIDE_GUI.egg-info/SOURCES.txt

@@ -67,6 +67,8 @@ utilities.py
 ./tabs/geometry/frames/powertrain/propulsors/propulsor_frame.py
 ./tabs/geometry/frames/powertrain/sources/__init__.py
 ./tabs/geometry/frames/powertrain/sources/energy_source_frame.py
+./tabs/geometry/frames/powertrain/systems/__init__.py
+./tabs/geometry/frames/powertrain/systems/system_frame.py
 ./tabs/geometry/frames/wings/__init__.py
 ./tabs/geometry/frames/wings/wings_frame.py
 ./tabs/geometry/widgets/__init__.py
@@ -96,6 +98,8 @@ utilities.py
 ./tabs/geometry/widgets/powertrain/sources/__init__.py
 ./tabs/geometry/widgets/powertrain/sources/fuel_tank_widget.py
 ./tabs/geometry/widgets/powertrain/sources/source_selector_widget.py
+./tabs/geometry/widgets/powertrain/systems/__init__.py
+./tabs/geometry/widgets/powertrain/systems/system_widget.py
 ./tabs/geometry/widgets/wings/__init__.py
 ./tabs/geometry/widgets/wings/wing_cs_widget.py
 ./tabs/geometry/widgets/wings/wing_section_widget.py
@@ -108,6 +112,12 @@ utilities.py
 ./tabs/mission/widgets/mission_analysis_widget.py
 ./tabs/mission/widgets/mission_segment_helper.py
 ./tabs/mission/widgets/mission_segment_widget.py
+./tabs/performance/__init__.py
+./tabs/performance/analysis_registry.py
+./tabs/performance/performance.py
+./tabs/performance/results_tracker.py
+./tabs/results_viewer/__init__.py
+./tabs/results_viewer/results_viewer.py
 ./tabs/solve/__init__.py
 ./tabs/solve/solve.py
 ./tabs/solve/plots/__init__.py
@@ -160,7 +170,6 @@ utilities.py
 ./tabs/solve/plots/weights/plot_load_diagram.py
 ./tabs/solve/plots/weights/plot_weight_breakdown.py
 ./tabs/visualize_geometry/__init__.py
-./tabs/visualize_geometry/core_3d_viewer.py
 ./tabs/visualize_geometry/geometry_helper_functions.py
 ./tabs/visualize_geometry/visualize_geometry.py
 ./tabs/visualize_geometry/features/__init__.py
@@ -235,6 +244,8 @@ tabs/geometry/frames/powertrain/propulsors/__init__.py
 tabs/geometry/frames/powertrain/propulsors/propulsor_frame.py
 tabs/geometry/frames/powertrain/sources/__init__.py
 tabs/geometry/frames/powertrain/sources/energy_source_frame.py
+tabs/geometry/frames/powertrain/systems/__init__.py
+tabs/geometry/frames/powertrain/systems/system_frame.py
 tabs/geometry/frames/wings/__init__.py
 tabs/geometry/frames/wings/wings_frame.py
 tabs/geometry/widgets/__init__.py
@@ -264,6 +275,8 @@ tabs/geometry/widgets/powertrain/propulsors/turbofan_widget.py
 tabs/geometry/widgets/powertrain/sources/__init__.py
 tabs/geometry/widgets/powertrain/sources/fuel_tank_widget.py
 tabs/geometry/widgets/powertrain/sources/source_selector_widget.py
+tabs/geometry/widgets/powertrain/systems/__init__.py
+tabs/geometry/widgets/powertrain/systems/system_widget.py
 tabs/geometry/widgets/wings/__init__.py
 tabs/geometry/widgets/wings/wing_cs_widget.py
 tabs/geometry/widgets/wings/wing_section_widget.py
@@ -276,6 +289,12 @@ tabs/mission/widgets/flight_controls_widget.py
 tabs/mission/widgets/mission_analysis_widget.py
 tabs/mission/widgets/mission_segment_helper.py
 tabs/mission/widgets/mission_segment_widget.py
+tabs/performance/__init__.py
+tabs/performance/analysis_registry.py
+tabs/performance/performance.py
+tabs/performance/results_tracker.py
+tabs/results_viewer/__init__.py
+tabs/results_viewer/results_viewer.py
 tabs/solve/__init__.py
 tabs/solve/solve.py
 tabs/solve/plots/__init__.py
@@ -328,7 +347,6 @@ tabs/solve/plots/weights/__init__.py
 tabs/solve/plots/weights/plot_load_diagram.py
 tabs/solve/plots/weights/plot_weight_breakdown.py
 tabs/visualize_geometry/__init__.py
-tabs/visualize_geometry/core_3d_viewer.py
 tabs/visualize_geometry/geometry_helper_functions.py
 tabs/visualize_geometry/visualize_geometry.py
 tabs/visualize_geometry/features/__init__.py

rcaide_gui-1.0.5/VERSION

@@ -0,0 +1 @@
+1.0.5

{rcaide_gui-1.0.3 → rcaide_gui-1.0.5}/common_widgets/data_entry_widget.py

@@ -1,10 +1,10 @@
 # RCAIDE_GUI/tabs/visualize_geometry/features/axes_gizmo.py
 
-# Created: M Clarke, LEADS, 2024
-# Python imports
-import ast
-
-from PyQt6.QtCore import Qt, pyqtSignal
+# Created: M Clarke, LEADS, 2024
+# Python imports
+import ast
+
+from PyQt6.QtCore import Qt, pyqtSignal
 from PyQt6.QtGui import QDoubleValidator
 from PyQt6.QtWidgets import QLineEdit, QLabel, QGridLayout, QWidget, QSizePolicy, QSpacerItem, QCheckBox, QHBoxLayout, \
     QVBoxLayout
@@ -94,12 +94,12 @@ class DataEntryWidget(QWidget):
                 grid_layout.addLayout(layout, row, 0, 1, 4)
                 col = num_cols - 1
                 self.data_fields[label[0]] = ()
-            else:
-                line_edit = QLineEdit(self)
-                # Inertia tensors are entered as list/matrix text, not scalar floats.
-                if label[1] != Units.Intertia:
-                    line_edit.setValidator(QDoubleValidator())
-                line_edit.setMinimumWidth(150)
+            else:
+                line_edit = QLineEdit(self)
+                # Inertia tensors are entered as list/matrix text, not scalar floats.
+                if label[1] != Units.Intertia:
+                    line_edit.setValidator(QDoubleValidator())
+                line_edit.setMinimumWidth(150)
 
                 unit_picker = UnitPickerWidget(label[1])
                 unit_picker.on_change_callback = self._make_unit_change_handler(
@@ -143,17 +143,17 @@ class DataEntryWidget(QWidget):
             return si_value
         return (si_value - zero) / scale
 
-    @staticmethod
-    def _format_converted_value(value):
-        return f"{value:.15g}"
-
-    @staticmethod
-    def _parse_list_value(text):
-        # Use literal_eval so list-like fields become Python lists without eval.
-        value = ast.literal_eval(text)
-        if not isinstance(value, list):
-            raise ValueError(f"Expected a list value, got {type(value).__name__}")
-        return value
+    @staticmethod
+    def _format_converted_value(value):
+        return f"{value:.15g}"
+
+    @staticmethod
+    def _parse_list_value(text):
+        # Use literal_eval so list-like fields become Python lists without eval.
+        value = ast.literal_eval(text)
+        if not isinstance(value, list):
+            raise ValueError(f"Expected a list value, got {type(value).__name__}")
+        return value
 
     def _make_unit_change_handler(self, unit_picker, *line_edits):
         def convert_display_values(previous_index, new_index):
@@ -216,30 +216,30 @@ class DataEntryWidget(QWidget):
                                z_value]], unit_picker.current_index
             elif self.data_units_labels[i][1] == Units.Heading:
                 continue
-            elif self.data_units_labels[i][1] == Units.Count:
-                data_field = self.data_fields[label]
-                line_edit, unit_picker = data_field
-                text = line_edit.text()
-                # Count fields should remain integers for RCAIDE.
-                value = int(text) if text else 0
-                data[label] = value, unit_picker.current_index
-            elif self.data_units_labels[i][1] == Units.Intertia:
-                data_field = self.data_fields[label]
-                line_edit, unit_picker = data_field
-                text = line_edit.text()
-                # Inertia is stored as a tensor/list, not a single scalar.
-                value = self._parse_list_value(text) if text else None
-                data[label] = value, unit_picker.current_index
-            else:
-                data_field = self.data_fields[label]
-                line_edit, unit_picker = data_field
-                text = line_edit.text()
-                # Most fields are numeric, but some Unitless fields are text labels.
-                try:
-                    value = float(text) if text else None
-                except ValueError:
-                    value = text
-                data[label] = value, unit_picker.current_index
+            elif self.data_units_labels[i][1] == Units.Count:
+                data_field = self.data_fields[label]
+                line_edit, unit_picker = data_field
+                text = line_edit.text()
+                # Count fields should remain integers for RCAIDE.
+                value = int(text) if text else 0
+                data[label] = value, unit_picker.current_index
+            elif self.data_units_labels[i][1] == Units.Intertia:
+                data_field = self.data_fields[label]
+                line_edit, unit_picker = data_field
+                text = line_edit.text()
+                # Inertia is stored as a tensor/list, not a single scalar.
+                value = self._parse_list_value(text) if text else None
+                data[label] = value, unit_picker.current_index
+            else:
+                data_field = self.data_fields[label]
+                line_edit, unit_picker = data_field
+                text = line_edit.text()
+                # Most fields are numeric, but some Unitless fields are text labels.
+                try:
+                    value = float(text) if text else None
+                except ValueError:
+                    value = text
+                data[label] = value, unit_picker.current_index
         return data
 
     def get_values_si(self):
@@ -266,68 +266,70 @@ class DataEntryWidget(QWidget):
                                z_value]], unit_picker.current_index
             elif self.data_units_labels[i][1] == Units.Heading:
                 continue
-            elif self.data_units_labels[i][1] == Units.Count:
-                data_field = self.data_fields[label]
-                line_edit, unit_picker = data_field
-                text = line_edit.text()
-                # Count fields should remain integers for RCAIDE.
-                value = int(text) if text else 0
-                data[label] = value, unit_picker.current_index
-            elif self.data_units_labels[i][1] == Units.Intertia:
-                data_field = self.data_fields[label]
-                line_edit, unit_picker = data_field
-                text = line_edit.text()
-                # Inertia is stored as a tensor/list, not a single scalar.
-                value = self._parse_list_value(text) if text else None
-                data[label] = value, unit_picker.current_index
-            else:
-                data_field = self.data_fields[label]
-                line_edit, unit_picker = data_field
-                text = line_edit.text()
-                # Numeric fields are converted to SI; text fields are preserved.
-                try:
-                    value = unit_picker.apply_unit(float(text)) if text else None
-                except ValueError:
-                    value = text
-                data[label] = value, unit_picker.current_index
+            elif self.data_units_labels[i][1] == Units.Count:
+                data_field = self.data_fields[label]
+                line_edit, unit_picker = data_field
+                text = line_edit.text()
+                # Count fields should remain integers for RCAIDE.
+                value = int(text) if text else 0
+                data[label] = value, unit_picker.current_index
+            elif self.data_units_labels[i][1] == Units.Intertia:
+                data_field = self.data_fields[label]
+                line_edit, unit_picker = data_field
+                text = line_edit.text()
+                # Inertia is stored as a tensor/list, not a single scalar.
+                value = self._parse_list_value(text) if text else None
+                data[label] = value, unit_picker.current_index
+            else:
+                data_field = self.data_fields[label]
+                line_edit, unit_picker = data_field
+                text = line_edit.text()
+                # Numeric fields are converted to SI; text fields are preserved.
+                try:
+                    value = unit_picker.apply_unit(float(text)) if text else None
+                except ValueError:
+                    value = text
+                data[label] = value, unit_picker.current_index
         return data
 
-    def load_data(self, data):
-        # Loading saved data should not trigger auto-save.
-        old_block_state = self.blockSignals(True)
-        try:
-            # Load each field based on its input type.
-            for i, label in enumerate(self.data_fields.keys()):
-                if self.data_units_labels[i][1] == Units.Boolean:
-                    # Checkbox field.
-                    self.data_fields[label].setChecked(data[label][0])
-                elif self.data_units_labels[i][1] == Units.Position:
-                    # Three coordinate boxes and one unit picker.
-                    x_line_edit, y_line_edit, z_line_edit, unit_picker = self.data_fields[label]
-                    value, index = data[label]
-                    # Unwrap [[x, y, z]] if needed.
-                    if isinstance(value, list) and value and isinstance(value[0], list):
-                        value = value[0]
-                    # Use origin if the saved value is invalid.
-                    elif not isinstance(value, list):
-                        value = [0, 0, 0]
-                    x_line_edit.setText(str(value[0]))
-                    y_line_edit.setText(str(value[1]))
-                    z_line_edit.setText(str(value[2]))
-                    unit_picker.set_index(index)
-                elif self.data_units_labels[i][1] == Units.Heading:
-                    # Heading label only.
-                    pass
-                else:
-                    # Normal value field and unit picker.
-                    line_edit, unit_picker = self.data_fields[label]
-                    value, index = data[label]
-                    # Show None as an empty field.
-                    line_edit.setText("" if value is None else str(value))
-                    unit_picker.set_index(index)
-        finally:
-            # Restore signal behavior.
-            self.blockSignals(old_block_state)
+    def load_data(self, data):
+        # Loading saved data should not trigger auto-save.
+        old_block_state = self.blockSignals(True)
+        try:
+            # Load each field based on its input type.
+            for i, label in enumerate(self.data_fields.keys()):
+                if label not in data:
+                    continue
+                if self.data_units_labels[i][1] == Units.Boolean:
+                    # Checkbox field.
+                    self.data_fields[label].setChecked(data[label][0])
+                elif self.data_units_labels[i][1] == Units.Position:
+                    # Three coordinate boxes and one unit picker.
+                    x_line_edit, y_line_edit, z_line_edit, unit_picker = self.data_fields[label]
+                    value, index = data[label]
+                    # Unwrap [[x, y, z]] if needed.
+                    if isinstance(value, list) and value and isinstance(value[0], list):
+                        value = value[0]
+                    # Use origin if the saved value is invalid.
+                    elif not isinstance(value, list):
+                        value = [0, 0, 0]
+                    x_line_edit.setText(str(value[0]))
+                    y_line_edit.setText(str(value[1]))
+                    z_line_edit.setText(str(value[2]))
+                    unit_picker.set_index(index)
+                elif self.data_units_labels[i][1] == Units.Heading:
+                    # Heading label only.
+                    pass
+                else:
+                    # Normal value field and unit picker.
+                    line_edit, unit_picker = self.data_fields[label]
+                    value, index = data[label]
+                    # Show None as an empty field.
+                    line_edit.setText("" if value is None else str(value))
+                    unit_picker.set_index(index)
+        finally:
+            # Restore signal behavior.
+            self.blockSignals(old_block_state)
     
     # TODO implement mark_save and changed_since_save
     def mark_save(self):

{rcaide_gui-1.0.3 → rcaide_gui-1.0.5}/main.py

@@ -57,18 +57,25 @@ class App(QMainWindow):
         self.widgets = []
         self.widgets.append((home.get_widget(), "Home"))
         self.widgets.append((geometry.get_widget(), "Vehicle Setup"))
-        self.widgets.append((visualize_geometry.get_widget(), "Geometry Visualization"))
-        self.widgets.append((aircraft_configs.get_widget(), "Configurations Setup"))
+        self.widgets.append((visualize_geometry.get_widget(), "Geometry"))
+        self.widgets.append((aircraft_configs.get_widget(), "Configurations"))
         self.widgets.append((analysis.get_widget(), "Analyses Setup"))
         self.widgets.append((mission.get_widget(), "Mission Setup"))
-        self.widgets.append((solve.get_widget(), "Mission Simulation"))
-        # self.widgets.append((shared_analysis_widget, "Multidisciplinary Analyses"))
+        self.widgets.append((performance.get_widget(), "Performance"))
+        self.widgets.append((solve.get_widget(), "Run Mission"))
+        self.widgets.append((results_viewer.get_widget(), "Results Viewer"))
 
         for widget, name in self.widgets:
             self.tabs.addTab(widget, name)
 
         self.setCentralWidget(self.tabs)
-        self.resize(1280, 720)
+        screen = QApplication.primaryScreen()
+        if screen:
+            ag = screen.availableGeometry()
+            self.resize(min(1280, ag.width()), min(ag.height() - 30, 836))
+        else:
+            self.resize(1280, 836)
+        self.setMinimumSize(700, 480)
 
     def on_tab_change(self, index: int):
         current_frame = self.tabs.currentWidget()
@@ -134,7 +141,7 @@ class App(QMainWindow):
 
     def _go_to_geometry_visualization_tab(self):
         for index in range(self.tabs.count()):
-            if self.tabs.tabText(index).strip().lower() == "geometry visualization":
+            if self.tabs.tabText(index).strip().lower() == "geometry":
                 self.tabs.setCurrentIndex(index)
                 current_widget = self.tabs.widget(index)
                 if isinstance(current_widget, TabWidget):

{rcaide_gui-1.0.3 → rcaide_gui-1.0.5}/rcaide_io.py

@@ -99,7 +99,7 @@ def repair_local_file_paths(value, source_dir=None):
 
 
 def repair_airfoil_path(path, source_dir=None):
-    if not path or os.path.exists(path):
+    if not path:
         return path
     basename = os.path.basename(path)
     if source_dir:
@@ -110,7 +110,7 @@ def repair_airfoil_path(path, source_dir=None):
         candidate = os.path.join(search_dir, basename)
         if os.path.exists(candidate):
             return candidate
-    return path
+    return basename if basename else path
 
 
 # ----------------------------------------------------------------------------------------------------------------------
@@ -344,7 +344,7 @@ def _build_dict_r_with_types(v):
     if module and qualname and not qualname.startswith('<'):
         ret['__type__'] = f"{module}.{qualname}"
 
-    _skip = ('_component_root_map', '_energy_network_root_map', '_base', '_diff')
+    _skip = ('_component_root_map', '_energy_network_root_map', '_base', '_diff', 'vehicle')
     for k in keys:
         if k in _skip:
             continue
@@ -354,7 +354,7 @@ def _build_dict_r_with_types(v):
 
 def _build_dict_base_with_types(base):
     """Top-level serialisation: like RCAIDE.Input_Output.save.build_dict_base but includes __type__."""
-    _skip = ('_component_root_map', '_energy_network_root_map', '_base', '_diff')
+    _skip = ('_component_root_map', '_energy_network_root_map', '_base', '_diff', 'vehicle')
     base_dict = {}
     for k in base.keys():
         if k in _skip:
@@ -412,6 +412,13 @@ rcaide_analyses = RCAIDE.Framework.Analyses.Analysis.Container()         # type:
 
 mission_data    = []
 rcaide_mission  = RCAIDE.Framework.Mission.Sequential_Segments()
+# Last in-memory mission output. Set by the Solve tab after mission.evaluate()
+# and browsed by the Results Viewer so users can inspect values without rerunning.
+rcaide_results  = None
+# Last raw result from the Performance tab. Set after each analysis run so the
+# Results Viewer can browse it (stability derivatives, polar arrays, etc.).
+last_performance_result = None
+last_performance_label  = ""
 
 
 # ----------------------------------------------------------------------------------------------------------------------
@@ -438,6 +445,138 @@ def vehicle_to_ui_format(vehicle_obj):
     return ui_dict
 
 
+_NETWORK_TYPE_LABEL = {
+    'Fuel':      'Fuel',
+    'Electric':  'Electric',
+    'Hybrid':    'Hybrid',
+    'Hydrogen':  'Hydrogen',
+    'Fuel_Cell': 'Fuel Cell',
+}
+
+
+def _network_type_for_ui(network_dict):
+    type_str = network_dict.get('__type__', '')
+    class_name = type_str.rsplit('.', 1)[-1] if type_str else ''
+    return _NETWORK_TYPE_LABEL.get(class_name, 'Fuel')
+
+
+def _propulsor_dict_to_ui(p):
+    """Convert a RCAIDE Turbofan JSON dict (unit-argument format) to TurbofanWidget GUI format."""
+    def g(d, *keys):
+        for k in keys[:-1]:
+            d = d.get(k, {}) if isinstance(d, dict) else {}
+        return d.get(keys[-1], [0, 0]) if isinstance(d, dict) else [0, 0]
+
+    return {
+        'Propulsor Tag':                      p.get('tag', ''),
+        'Origin':                             g(p, 'origin'),
+        'Engine Length':                      g(p, 'length'),
+        'Diameter':                           g(p, 'diameter'),
+        'Bypass Ratio':                       g(p, 'bypass_ratio'),
+        'Design Altitude':                    g(p, 'design_altitude'),
+        'Design Mach Number':                 g(p, 'design_mach_number'),
+        'Design Thrust':                      g(p, 'design_thrust'),
+        'Fan Polytropic Efficiency':          g(p, 'fan', 'polytropic_efficiency'),
+        'Fan Pressure Ratio':                 g(p, 'fan', 'pressure_ratio'),
+        'Inlet Nozzle Polytropic Efficiency': g(p, 'inlet_nozzle', 'polytropic_efficiency'),
+        'Inlet Nozzle Pressure Ratio':        g(p, 'inlet_nozzle', 'pressure_ratio'),
+        'LPC Polytropic Efficiency':          g(p, 'low_pressure_compressor', 'polytropic_efficiency'),
+        'LPC Pressure Ratio':                 g(p, 'low_pressure_compressor', 'pressure_ratio'),
+        'HPC Polytropic Efficiency':          g(p, 'high_pressure_compressor', 'polytropic_efficiency'),
+        'HPC Pressure Ratio':                 g(p, 'high_pressure_compressor', 'pressure_ratio'),
+        'LPT Mechanical Efficiency':          g(p, 'low_pressure_turbine', 'mechanical_efficiency'),
+        'LPT Polytropic Efficiency':          g(p, 'low_pressure_turbine', 'polytropic_efficiency'),
+        'HPT Mechanical Efficiency':          g(p, 'high_pressure_turbine', 'mechanical_efficiency'),
+        'HPT Polytropic Efficiency':          g(p, 'high_pressure_turbine', 'polytropic_efficiency'),
+        'Combustor Efficiency':               g(p, 'combustor', 'efficiency'),
+        'Combustor Pressure Loss Coeff':      g(p, 'combustor', 'alphac'),
+        'Combustor Turbine Inlet Temp':       g(p, 'combustor', 'turbine_inlet_temperature'),
+        'Combustor Pressure Ratio':           g(p, 'combustor', 'pressure_ratio'),
+        'Core Nozzle Polytropic Efficiency':  g(p, 'core_nozzle', 'polytropic_efficiency'),
+        'Core Nozzle Pressure Ratio':         g(p, 'core_nozzle', 'pressure_ratio'),
+        'Fan Nozzle Polytropic Efficiency':   g(p, 'fan_nozzle', 'polytropic_efficiency'),
+        'Fan Nozzle Pressure Ratio':          g(p, 'fan_nozzle', 'pressure_ratio'),
+    }
+
+
+def _distributor_dict_to_ui(fl):
+    """Convert a RCAIDE Fuel_Line/Bus/Coolant_Line JSON dict to distributor GUI format."""
+    assigned_raw = fl.get('assigned_propulsors', [])
+    if is_unit_argument_pair(assigned_raw):
+        assigned_raw = assigned_raw[0]
+    if assigned_raw and isinstance(assigned_raw[0], list):
+        assigned_propulsors = list(assigned_raw[0])
+    else:
+        assigned_propulsors = [x for x in assigned_raw if isinstance(x, str)]
+
+    tanks = fl.get('fuel_tanks', {})
+    assigned_sources = (
+        [k for k in tanks.keys() if k != '__type__']
+        if isinstance(tanks, dict) else []
+    )
+    return {
+        'distributor name':    fl.get('tag', ''),
+        'assigned_propulsors': assigned_propulsors,
+        'assigned_sources':    assigned_sources,
+    }
+
+
+def _fuel_tank_dict_to_ui(tank):
+    """Convert a RCAIDE Fuel_Tank JSON dict to FuelTankWidget GUI format."""
+    def g(d, key):
+        return d.get(key, [0, 0]) if isinstance(d, dict) else [0, 0]
+    return {
+        'Source Name':       tank.get('tag', ''),
+        'Fuel Tank Origin':  g(tank, 'origin'),
+        'Fuel Origin':       g(tank, 'fuel_origin'),
+        'Center of Gravity': g(tank, 'center_of_gravity'),
+        'Mass':              g(tank, 'mass_of_fuel'),
+        'Internal Volume':   g(tank, 'volume'),
+    }
+
+
+def _network_dict_to_ui(net_dict):
+    """Convert one RCAIDE network JSON dict to the PowertrainFrame GUI data format."""
+    net_type = _network_type_for_ui(net_dict)
+
+    propulsor_data = []
+    propulsors = net_dict.get('propulsors', {})
+    if isinstance(propulsors, dict):
+        for k, v in propulsors.items():
+            if k == '__type__' or not isinstance(v, dict):
+                continue
+            propulsor_data.append(_propulsor_dict_to_ui(v))
+
+    distributor_data = []
+    source_by_tag = {}
+    for container_key in ('fuel_lines', 'busses', 'coolant_lines'):
+        container = net_dict.get(container_key, {})
+        if not isinstance(container, dict):
+            continue
+        for k, fl in container.items():
+            if k == '__type__' or not isinstance(fl, dict):
+                continue
+            distributor_data.append(_distributor_dict_to_ui(fl))
+            tanks = fl.get('fuel_tanks', {})
+            if isinstance(tanks, dict):
+                for t_key, t_val in tanks.items():
+                    if t_key != '__type__' and isinstance(t_val, dict) and t_key not in source_by_tag:
+                        source_by_tag[t_key] = t_val
+
+    source_data = [_fuel_tank_dict_to_ui(v) for v in source_by_tag.values()]
+
+    return {
+        'energy network selected': net_type,
+        'powertrain': {
+            'distributor data': distributor_data,
+            'source data':      source_data,
+            'propulsor data':   propulsor_data,
+            'system data':      [],
+            'converter data':   [],
+        }
+    }
+
+
 def vehicle_dict_to_ui_list_structure(vehicle_dict):
     """Convert a stripped rcaide_vehicle dict to the 7-slot UI structure."""
     from tabs.geometry.frames.booms.boom_frame import BoomFrame
@@ -660,34 +799,10 @@ def vehicle_dict_to_ui_list_structure(vehicle_dict):
     if "powertrains" in vehicle_dict and vehicle_dict["powertrains"]:
         ui_structure[5] = [to_ui_format(p, PowertrainFrame) for p in vehicle_dict["powertrains"].values() if is_mapping(p)]
     elif "networks" in vehicle_dict and vehicle_dict["networks"]:
-        for network in vehicle_dict["networks"].values():
-            if not is_mapping(network):
+        for k, network in vehicle_dict["networks"].items():
+            if k == "__type__" or not is_mapping(network):
                 continue
-            network_tag = network.get("tag", "Fuel").title()
-            propulsors  = network.get("propulsors", {})
-            if propulsors:
-                for propulsor in propulsors.values():
-                    if not is_mapping(propulsor):
-                        continue
-                    ui_structure[5].append({
-                        "name": propulsor.get("tag", network_tag),
-                        "energy network selected": network_tag,
-                        "powertrain": {
-                            "distributor data": [], "source data": [],
-                            "propulsor data":   [], "converter data": [],
-                            "connections":      [],
-                        }
-                    })
-            else:
-                ui_structure[5].append({
-                    "name": network_tag,
-                    "energy network selected": network_tag,
-                    "powertrain": {
-                        "distributor data": [], "source data": [],
-                        "propulsor data":   [], "converter data": [],
-                        "connections":      [],
-                    }
-                })
+            ui_structure[5].append(_network_dict_to_ui(network))
 
     if "wings" in vehicle_dict and vehicle_dict["wings"]:
         ui_structure[6] = [to_ui_format(w, WingsFrame) for w in vehicle_dict["wings"].values() if is_mapping(w)]
@@ -702,6 +817,17 @@ def vehicle_dict_to_ui_list_structure(vehicle_dict):
 _DIFF_SKIP = frozenset({'_component_root_map', '_energy_network_root_map', '_base', '_diff'})
 
 
+def _coerce_leaf(new_val, obj, key):
+    """Coerce a JSON list back to numpy array when the target attribute is already an ndarray."""
+    if isinstance(new_val, list):
+        try:
+            if isinstance(obj[key], np.ndarray):
+                return np.array(new_val)
+        except Exception:
+            pass
+    return new_val
+
+
 def _apply_diff_to_obj(obj, diff_dict):
     """Walk a stripped diff dict and apply every leaf value to obj via key navigation."""
     for key, value in diff_dict.items():
@@ -715,7 +841,7 @@ def _apply_diff_to_obj(obj, diff_dict):
                 pass
         else:
             try:
-                obj[key] = value
+                obj[key] = _coerce_leaf(value, obj, key)
             except (KeyError, TypeError, AttributeError):
                 pass
 
@@ -768,7 +894,7 @@ def write_to_json():
 
 
 def read_from_json(data_str, source_dir=None):
-    global rcaide_vehicle, vehicle, rcaide_configs, config_data, analysis_data, mission_data, propulsor_names, rcaide_analyses
+    global rcaide_vehicle, vehicle, rcaide_configs, config_data, analysis_data, mission_data, propulsor_names, rcaide_analyses, rcaide_results
     from RCAIDE.Library.Components.Configs.Config import Config
     from RCAIDE.Input_Output.import_data import analyses_setup as _analyses_setup
 
@@ -806,6 +932,9 @@ def read_from_json(data_str, source_dir=None):
     config_data   = []
     analysis_data = data.get("analysis_data", [])
     mission_data  = data.get("mission_data",  [])
+    # Loaded aircraft files do not include runtime mission results; clear any
+    # previous run so the Results Viewer cannot show stale data for a new file.
+    rcaide_results = None
 
     rcaide_analyses = _analyses_setup(analysis_data, rcaide_configs)