Revert "A lot of UI changes"

This reverts commit 65023fd.

Author: justo46

__init__.py

@@ -2,7 +2,7 @@
     "name": "Sequence Loader",
     "description": "Loader for meshio supported mesh files/ simulation sequences",
     "author": "Interactive Computer Graphics",
-    "version": (0, 1, 6),
+    "version": (0, 1, 5),
     "blender": (3, 4, 0),
     "warning": "",
     "support": "COMMUNITY",
@@ -21,7 +21,7 @@
     bpy.context.preferences.filepaths.use_relative_paths = False
 
 from bseq import *
-from bseq.operators import menu_func_import, add_keymap, delete_keymap
+from bseq.operators import menu_func_import
 
 classes = [
     BSEQ_obj_property,
@@ -33,13 +33,9 @@
     BSEQ_OT_resetins,
     BSEQ_OT_resetmesh,
     BSEQ_Import,
-    BSEQ_Import_Child1,
-    BSEQ_Import_Child2,
-    BSEQ_Globals_Panel,
     BSEQ_List_Panel,
     BSEQ_UL_Obj_List,
     BSEQ_Settings,
-    BSEQ_Advanced_Panel,
     BSEQ_Templates,
     BSEQ_UL_Att_List,
     BSEQ_OT_set_as_split_norm,
@@ -52,10 +48,10 @@
     BSEQ_OT_refresh_sequences,
     BSEQ_OT_set_start_end_frames,
     WM_OT_batchSequences,
-    WM_OT_batchSequences_Settings,
     WM_OT_MeshioObject
 ]
 
+
 def register():
     bpy.app.handlers.load_post.append(BSEQ_initialize)
     for cls in classes:
@@ -64,8 +60,8 @@ def register():
     bpy.types.Scene.BSEQ = bpy.props.PointerProperty(type=BSEQ_scene_property)
     bpy.types.Object.BSEQ = bpy.props.PointerProperty(type=BSEQ_obj_property)
     bpy.types.Mesh.BSEQ = bpy.props.PointerProperty(type=BSEQ_mesh_property)
+
     bpy.types.TOPBAR_MT_file_import.append(menu_func_import)
-    add_keymap()
 
     # manually call this function once
     # so when addon being installed, it can run correctly
@@ -80,9 +76,10 @@ def unregister():
     del bpy.types.Object.BSEQ
     bpy.app.handlers.load_post.remove(BSEQ_initialize)
     bpy.types.TOPBAR_MT_file_import.remove(menu_func_import)
-    delete_keymap()
     unsubscribe_to_selected()
 
+
 if __name__ == "__main__":
+
     # unregister()
     register()

bseq/__init__.py

@@ -1,7 +1,7 @@
 from bseq.utils import refresh_obj
-from .operators import BSEQ_OT_load, BSEQ_OT_edit, BSEQ_OT_resetpt, BSEQ_OT_resetmesh, BSEQ_OT_resetins, BSEQ_OT_set_as_split_norm, BSEQ_OT_remove_split_norm, BSEQ_OT_disable_selected, BSEQ_OT_enable_selected, BSEQ_OT_refresh_seq, BSEQ_OT_disable_all, BSEQ_OT_enable_all, BSEQ_OT_refresh_sequences, BSEQ_OT_set_start_end_frames, WM_OT_batchSequences, WM_OT_batchSequences_Settings, WM_OT_MeshioObject
+from .operators import BSEQ_OT_load, BSEQ_OT_edit, BSEQ_OT_resetpt, BSEQ_OT_resetmesh, BSEQ_OT_resetins, BSEQ_OT_set_as_split_norm, BSEQ_OT_remove_split_norm, BSEQ_OT_disable_selected, BSEQ_OT_enable_selected, BSEQ_OT_refresh_seq, BSEQ_OT_disable_all, BSEQ_OT_enable_all, BSEQ_OT_refresh_sequences, BSEQ_OT_set_start_end_frames, WM_OT_batchSequences, WM_OT_MeshioObject
 from .properties import BSEQ_scene_property, BSEQ_obj_property, BSEQ_mesh_property
-from .panels import BSEQ_UL_Obj_List, BSEQ_List_Panel, BSEQ_Settings, BSEQ_Import, BSEQ_Import_Child1, BSEQ_Import_Child2, BSEQ_Globals_Panel, BSEQ_Advanced_Panel, BSEQ_Templates, BSEQ_UL_Att_List, draw_template
+from .panels import BSEQ_UL_Obj_List, BSEQ_List_Panel, BSEQ_Settings, BSEQ_Import, BSEQ_Templates, BSEQ_UL_Att_List, draw_template
 from .messenger import subscribe_to_selected, unsubscribe_to_selected
 import bpy
 from bpy.app.handlers import persistent
@@ -12,8 +12,7 @@
 @persistent
 def BSEQ_initialize(scene):
     if update_obj not in bpy.app.handlers.frame_change_post:
-        bpy.app.handlers.frame_change_post.append(auto_refresh_active)
-        bpy.app.handlers.frame_change_post.append(auto_refresh_all)
+        bpy.app.handlers.frame_change_post.append(auto_refresh)
         bpy.app.handlers.frame_change_post.append(update_obj)
     subscribe_to_selected()
     if print_information not in bpy.app.handlers.render_init:
@@ -26,15 +25,11 @@ def BSEQ_initialize(scene):
     "BSEQ_obj_property",
     "BSEQ_initialize",
     "BSEQ_Import",
-    "BSEQ_Import_Child1",
-    "BSEQ_Import_Child2",
-    "BSEQ_Globals_Panel",
     "BSEQ_List_Panel",
     "BSEQ_UL_Obj_List",
     "BSEQ_scene_property",
     "BSEQ_Templates",
     "BSEQ_Settings",
-    "BSEQ_Advanced_Panel",
     "BSEQ_UL_Att_List",
     "subscribe_to_selected",
     "BSEQ_OT_resetpt",
@@ -53,6 +48,5 @@ def BSEQ_initialize(scene):
     "BSEQ_OT_refresh_sequences",
     "BSEQ_OT_set_start_end_frames",
     "WM_OT_batchSequences",
-    "WM_OT_batchSequences_Settings",
     "WM_OT_MeshioObject"
 ]

bseq/callback.py

@@ -25,7 +25,7 @@ def update_path(self, context):
         return [("None", "No sequence detected", "", 1)]
 
     file_sequences.clear()
-    if len(f) >= 100:
+    if len(f) >= 20:
         file_sequences.append(("None", "Too much sequence detected, could be false detection, please use pattern below", "", 1))
     else:
         count = 1

bseq/globals.py

@@ -24,24 +24,12 @@ def print_information(scene):
                 file.write("Object name: {}\n".format(obj.name))
                 file.write("Is it being animated: {}\n".format(bseq_prop.enabled))
                 file.write("Filepath: {}\n".format(bseq_prop.pattern))
-                file.write("Is it relative path: {}\n".format(bpy.path.is_subdir(obj.BSEQ.pattern, bpy.path.abspath("//"))))
+                file.write("Is it relative path: {}\n".format(bseq_prop.use_relative))
                 file.write("\n\n")
 
 
-def auto_refresh_all(scene, depsgraph=None):
-    if not bpy.context.scene.BSEQ.auto_refresh_all:
-        return
-    for obj in bpy.data.objects:
-        if obj.BSEQ.init == False:
-            continue
-        if obj.BSEQ.enabled == False:
-            continue
-        if obj.mode != "OBJECT":
-            continue
-        refresh_obj(obj, scene)
-
-def auto_refresh_active(scene, depsgraph=None):
-    if not bpy.context.scene.BSEQ.auto_refresh_active:
+def auto_refresh(scene, depsgraph=None):
+    if not bpy.context.scene.BSEQ.auto_refresh:
         return
     for obj in bpy.data.objects:
         if obj.BSEQ.init == False:

bseq/importer.py

@@ -205,7 +205,7 @@ def create_meshio_obj(filepath):
     bpy.context.view_layer.objects.active = object
 
 
-def create_obj(fileseq, root_path, transform_matrix=Matrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]])):
+def create_obj(fileseq, use_relative, root_path, transform_matrix=Matrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]])):
 
     current_frame = bpy.context.scene.frame_current
     filepath = fileseq[current_frame % len(fileseq)]
@@ -240,8 +240,8 @@ def create_obj(fileseq, root_path, transform_matrix=Matrix([[1, 0, 0, 0], [0, 1,
         object = bpy.data.objects.new(name, mesh)
 
     #  create the object
-    print("File path: " + filepath)
-    if bpy.path.is_subdir(filepath, bpy.path.abspath("//")):
+    object.BSEQ.use_relative = use_relative
+    if use_relative:
         if root_path != "":
             object.BSEQ.pattern = bpy.path.relpath(str(fileseq), start=root_path)
         else:
@@ -280,8 +280,7 @@ def update_obj(scene, depsgraph=None):
             current_frame = obj.BSEQ.frame
         meshio_mesh = None
         pattern = obj.BSEQ.pattern
-        # check if the path is relative
-        if bpy.path.is_subdir(pattern, bpy.path.abspath("//")):
+        if obj.BSEQ.use_relative:
             if scene.BSEQ.root_path != "":
                 pattern = bpy.path.abspath(pattern, start=scene.BSEQ.root_path)
             else: