fixing imports

SteveDoyle2 · Nov 17, 2024 · b058269 · b058269
1 parent 2df767e
commit b058269
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 6 deletions.
diff --git a/pyNastran/dev/bdf_vectorized/cards/loads/darea.py b/pyNastran/dev/bdf_vectorized/cards/loads/darea.py
@@ -21,7 +21,7 @@
     #def parse(self, card_obj, icard=0, comment=''):
         #card = (1, 2., icard)
         #return card, comment
-    #def add_card(self, card, comment=''):
+    #def add_card(self, card: BDFCard, comment: str=''):
         #return
 
 class DAREA(VectorizedCard):

diff --git a/pyNastran/dev/bdf_vectorized/cards/loads/tload1.py b/pyNastran/dev/bdf_vectorized/cards/loads/tload1.py
@@ -115,7 +115,7 @@ def get_load_ids(self):
     #def __rmul__(self, value):
         #return self.__mul__(value)
 
-    def add_card(self, card, comment=''):
+    def add_card(self, card: BDFCard, comment: str=''):
         i = self.i
 
         sid = integer(card, 1, 'sid')

diff --git a/pyNastran/dev/bdf_vectorized2/bdf_vectorized.py b/pyNastran/dev/bdf_vectorized2/bdf_vectorized.py
@@ -1554,7 +1554,7 @@ def pop_parse_errors(self) -> None:
 
     def pop_xref_errors(self) -> None:
         """raises an error if there are cross-reference errors"""
-        xref_obj.pop_xref_errors()
+        self.xref_obj.pop_xref_errors()
 
     def get_bdf_cards(self, bulk_data_lines: list[str],
                       bulk_data_ilines: Optional[Any]=None) -> tuple[Any, Any, Any]:

diff --git a/pyNastran/dev/bdf_vectorized2/cards/elements/dampers.py b/pyNastran/dev/bdf_vectorized2/cards/elements/dampers.py
@@ -172,7 +172,7 @@ def add(self, eid, pid, nids, dofs, comment=''):
         if comment:
             self.comment[eid] = _format_comment(comment)
 
-    def add_card(self, card, comment=''):
+    def add_card(self, card: BDFCard, comment: str=''):
         """
         Adds a CDAMP1 card from ``BDF.add_card(...)``
 

diff --git a/pyNastran/dev/bdf_vectorized2/cards/loads/pressure_loads.py b/pyNastran/dev/bdf_vectorized2/cards/loads/pressure_loads.py
@@ -6,8 +6,10 @@
  - PLOAD4v
 
 """
+from __future__ import annotations
 from collections import defaultdict
 from itertools import count
+from typing import TYPE_CHECKING
 import numpy as np
 
 from pyNastran.bdf.bdf_interface.assign_type import (
@@ -21,7 +23,8 @@
 from pyNastran.bdf.cards.base_card import _format_comment
 from pyNastran.bdf.cards.base_card import expand_thru
 from pyNastran.dev.bdf_vectorized2.cards.loads.loads import BaseLoad
-
+if TYPE_CHECKING:
+    from pyNastran.bdf.bdf_interface.bdf_card import BDFCard
 
 class PLOADv(BaseLoad):
     """

diff --git a/pyNastran/dev/bdf_vectorized2/cards/loads/thermal_loads.py b/pyNastran/dev/bdf_vectorized2/cards/loads/thermal_loads.py
@@ -4,14 +4,18 @@
  - TEMPDv
 
 """
+from __future__ import annotations
 from collections import defaultdict
 from itertools import count
+from typing import TYPE_CHECKING
 import numpy as np
 
 from pyNastran.bdf.bdf_interface.assign_type import integer, double
 from pyNastran.bdf.field_writer_8 import print_card_8
 from pyNastran.bdf.cards.base_card import _format_comment
 from pyNastran.dev.bdf_vectorized2.cards.loads.loads import BaseLoad
+if TYPE_CHECKING:
+    from pyNastran.bdf.bdf_interface.bdf_card import BDFCard
 
 
 class TEMPv(BaseLoad):

diff --git a/pyNastran/f06/flutter_response.py b/pyNastran/f06/flutter_response.py
@@ -906,7 +906,7 @@ def plot_vg_vf(self, fig=None, damp_axes=None, freq_axes=None, modes=None,
             #damp_axes.plot(vel[iplot], damping[iplot], symbols[i], label='Mode %i' % mode)
             #freq_axes.plot(vel[iplot], freq[iplot], symbols[i])
             #print(color, symbol, linestyle)
-            label = f'Mode {mode:d}; freq={freq[0]:.3g}'
+            label = f'Mode {mode:d}; freq={freq[0]:.2g}'
             damp_axes.plot(vel, damping, color=color, marker=symbol, linestyle=linestyle, label=label)
             freq_axes.plot(vel, freq, color=color, marker=symbol, linestyle=linestyle)