update

.idea/workspace.xml

@@ -7,6 +7,8 @@
     <list default="true" id="f609c0f2-cd0d-4eea-87f1-8caf02d3f04f" name="Changes" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/manage/NovelManage.py" beforeDir="false" afterPath="$PROJECT_DIR$/manage/NovelManage.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/manage/wnss.bat" beforeDir="false" afterPath="$PROJECT_DIR$/manage/wnss.bat" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/parse/StoryMap.py" beforeDir="false" afterPath="$PROJECT_DIR$/parse/StoryMap.py" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -197,4 +199,7 @@
     </task>
     <servers />
   </component>
+  <component name="UnknownFeatures">
+    <option featureType="com.intellij.fileTypeFactory" implementationName="*.bat" />
+  </component>
 </project>

manage/NovelManage.py

@@ -3,10 +3,12 @@ import subprocess as xsub
 import sys
 import time
 from typing import List
+from PyQt5.QtWidgets import QApplication
 sys.path.append(os.path.dirname(os.path.dirname(os.path.realpath(__file__))))
 from parse.StoryMap import XAST_ParseTool, storyline_list2map
 from parse.StorylineCmp import CmpTool
 from manage.MileStone import base_store_path, current_store_path
+from frame.CompareViews import CompareWindow
 
 
 def git_save(target_dir: str):
@@ -41,7 +43,7 @@ def nsc_compile(target_dir: str):
 
 
 if __name__ == "__main__":
-    print(sys.argv)
+    app = QApplication(sys.argv)
     cmd_line = ":".join(sys.argv[1:])
 
     #wnss:-cmp
@@ -51,8 +53,12 @@ if __name__ == "__main__":
         ast_old = XAST_ParseTool(base_store_path)
         ast_new = XAST_ParseTool(current_store_path)
         map_old = storyline_list2map(ast_old.story_list)
+        ast_old.storylines_plait(map_old)
         map_new = storyline_list2map(ast_new.story_list)
+        ast_new.storylines_plait(map_new)
 
         cmp_tool = CmpTool()
         all_changed = cmp_tool.graph_compare(map_new, map_old)
-        print(all_changed)
+        present_view = CompareWindow(map_new, all_changed, None)
+        present_view.show()
+        app.exec()

manage/wnss.bat

@@ -6,5 +6,10 @@ for %%i in (%0) do (
 set "ScriptName=NovelManage.py"
 set ScriptPath=%FolderPath%%ScriptName%
 
-@echo on
+set args_opt=wnss%1
-python %ScriptPath% wnss -cmp
+
+if %args_opt% == wnss-cmp (
+python %ScriptPath% wnss -cmp
+) else (
+echo 对比基线： wnss -cmp
+)

parse/StoryMap.py

@@ -32,6 +32,7 @@ class StoryMap:
         self.story_name = name
         self.sort_index = 0
         self.empty_head = FragmentSlice()
+        self.empty_head.set_to_memory("<空节点>")
         self.slice_list: List[FragmentSlice] = [self.empty_head]
         pass