fix open included launch files defined with 'dirname' and loaded in d…

…aemon
fkie · Aug 14, 2023 · 2e7ee5e · 2e7ee5e
1 parent ee9901e
commit 2e7ee5e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/fkie_node_manager/src/fkie_node_manager/editor/graph_view.py b/fkie_node_manager/src/fkie_node_manager/editor/graph_view.py
@@ -228,15 +228,16 @@ def get_included_files(self, from_file, inc_string=''):
             item = self.graphTreeView.model().itemFromIndex(index)
             for row_idx in range(item.rowCount()):
                 inc_item = item.child(row_idx)
-                append = not inc_string
-                if not append:
-                    raw_data = inc_item.data(self.DATA_RAW)
-                    if raw_data:
-                        append = raw_data in inc_string
-                    else:
-                        rospy.logwarn(f"no RAW data found in {inc_item}")
-                if append:
-                    result.append((inc_item.data(self.DATA_INC_FILE), inc_item.data(self.DATA_RAW), inc_item.data(self.DATA_LINE), inc_item.data(self.DATA_FILE_EXISTS)))
+                if inc_item.data(self.ITEM_TYPE) == self.ITEM_TYPE_INC_FILE:
+                    append = not inc_string
+                    if not append:
+                        raw_data = inc_item.data(self.DATA_RAW)
+                        if raw_data:
+                            append = raw_data in inc_string
+                        else:
+                            rospy.logwarn(f"no RAW data found in {inc_item}, {inc_item.data(self.ITEM_TYPE)}")
+                    if append:
+                        result.append((inc_item.data(self.DATA_INC_FILE), inc_item.data(self.DATA_RAW), inc_item.data(self.DATA_LINE), inc_item.data(self.DATA_FILE_EXISTS)))
         return result
 
     def _refill_tree(self, tree, create_tree=True):

diff --git a/fkie_node_manager/src/fkie_node_manager/editor/text_edit.py b/fkie_node_manager/src/fkie_node_manager/editor/text_edit.py
@@ -39,7 +39,7 @@
 import traceback
 
 from fkie_node_manager_daemon import exceptions, file_item
-from fkie_node_manager_daemon.common import find_included_files, get_arg_names, get_internal_args, replace_arg, utf8
+from fkie_node_manager_daemon.common import get_arg_names, get_internal_args, replace_arg, utf8
 from fkie_node_manager.common import package_name
 from fkie_node_manager.detailed_msg_box import MessageBox
 from fkie_node_manager.parameter_dialog import ParameterDialog