diff --git a/.idea/encodings.xml b/.idea/encodings.xml
new file mode 100644
index 0000000..1320e13
--- /dev/null
+++ b/.idea/encodings.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index ee5e252..68b92dd 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,7 +8,8 @@
-
+
+
@@ -36,33 +37,33 @@
- {
- "keyToString": {
- "Python.CompareViews.executor": "Run",
- "Python.CompareWindow.executor": "Run",
- "Python.ContentView.executor": "Debug",
- "Python.DAGGraph (1).executor": "Run",
- "Python.DAGGraph.executor": "Run",
- "Python.DAGLayout (1).executor": "Run",
- "Python.DAGLayout.executor": "Run",
- "Python.DAGPresent.executor": "Run",
- "Python.MergeView.executor": "Run",
- "Python.MileStone.executor": "Run",
- "Python.NovelManage.executor": "Debug",
- "Python.ReferView.executor": "Run",
- "Python.StoryMap.executor": "Run",
- "Python.UDGLayout.executor": "Run",
- "Python.UDGPresent.executor": "Run",
- "Python.ast_load.executor": "Debug",
- "Python.entry.executor": "Run",
- "Python.test.executor": "Run",
- "RunOnceActivity.OpenProjectViewOnStart": "true",
- "RunOnceActivity.ShowReadmeOnStart": "true",
- "git-widget-placeholder": "master",
- "last_opened_file_path": "D:/Projects/Python/StoryTools",
- "settings.editor.selected.configurable": "debugger.dataViews"
+
+}]]>
@@ -181,19 +182,19 @@
-
-
-
+
+
+
+
-
diff --git a/frame/ContentView.py b/frame/ContentView.py
index 2811631..7117454 100644
--- a/frame/ContentView.py
+++ b/frame/ContentView.py
@@ -4,7 +4,7 @@ from typing import Dict, List
from PyQt5.QtCore import QPoint, Qt
from PyQt5.QtGui import QTransform
from PyQt5.QtWidgets import QApplication, QWidget, QGridLayout, QSlider, QDoubleSpinBox
-from PyQt5.QtWidgets import QMenu, QHBoxLayout
+from PyQt5.QtWidgets import QMenu, QHBoxLayout, QVBoxLayout
sys.path.append(os.path.dirname(os.path.dirname(__file__)))
from graph.DataType import Arrow, Point, Line
@@ -176,13 +176,14 @@ class ArticleRefsView(QWidget):
if __name__ == "__main__":
app = QApplication(sys.argv)
- #view = StorylinesView(None)
- view = ArticleRefsView(None)
- view.show()
+ view1 = StorylinesView(None)
+ view2 = ArticleRefsView(None)
+ view1.show()
+ view2.show()
tool = XAST_ParseTool(global_ast_path)
-# view.present_stories_graph(tool.get_story_graph())
- view.present_volumes_graph(tool.get_article_nodes())
+ view1.present_stories_graph(tool.get_story_graph())
+ view2.present_volumes_graph(tool.get_article_nodes())
# view.fragment_view.highlight_graph_link(["血脉的源头", "血脉的源头&待续"])
diff --git a/frame/__pycache__/CompareViews.cpython-312.pyc b/frame/__pycache__/CompareViews.cpython-312.pyc
index 4fcd5ba..3e16a48 100644
Binary files a/frame/__pycache__/CompareViews.cpython-312.pyc and b/frame/__pycache__/CompareViews.cpython-312.pyc differ
diff --git a/frame/__pycache__/ContentView.cpython-312.pyc b/frame/__pycache__/ContentView.cpython-312.pyc
new file mode 100644
index 0000000..7142f09
Binary files /dev/null and b/frame/__pycache__/ContentView.cpython-312.pyc differ
diff --git a/frame/__pycache__/MergeView.cpython-312.pyc b/frame/__pycache__/MergeView.cpython-312.pyc
index 97ef926..aa7f3d0 100644
Binary files a/frame/__pycache__/MergeView.cpython-312.pyc and b/frame/__pycache__/MergeView.cpython-312.pyc differ
diff --git a/frame/__pycache__/ReferView.cpython-312.pyc b/frame/__pycache__/ReferView.cpython-312.pyc
index 48187f7..400ce76 100644
Binary files a/frame/__pycache__/ReferView.cpython-312.pyc and b/frame/__pycache__/ReferView.cpython-312.pyc differ
diff --git a/frame/__pycache__/__init__.cpython-312.pyc b/frame/__pycache__/__init__.cpython-312.pyc
index 7a98443..5ff2fa4 100644
Binary files a/frame/__pycache__/__init__.cpython-312.pyc and b/frame/__pycache__/__init__.cpython-312.pyc differ
diff --git a/graph/__pycache__/DataType.cpython-312.pyc b/graph/__pycache__/DataType.cpython-312.pyc
index da53a9f..a44691b 100644
Binary files a/graph/__pycache__/DataType.cpython-312.pyc and b/graph/__pycache__/DataType.cpython-312.pyc differ
diff --git a/graph/__pycache__/__init__.cpython-312.pyc b/graph/__pycache__/__init__.cpython-312.pyc
index b6096b1..37ebf26 100644
Binary files a/graph/__pycache__/__init__.cpython-312.pyc and b/graph/__pycache__/__init__.cpython-312.pyc differ
diff --git a/graph/directed_acyclic_graph/__pycache__/DAGLayout.cpython-312.pyc b/graph/directed_acyclic_graph/__pycache__/DAGLayout.cpython-312.pyc
index 6566644..5051962 100644
Binary files a/graph/directed_acyclic_graph/__pycache__/DAGLayout.cpython-312.pyc and b/graph/directed_acyclic_graph/__pycache__/DAGLayout.cpython-312.pyc differ
diff --git a/graph/directed_acyclic_graph/__pycache__/DAGPresent.cpython-312.pyc b/graph/directed_acyclic_graph/__pycache__/DAGPresent.cpython-312.pyc
index 5f20c03..c6711c2 100644
Binary files a/graph/directed_acyclic_graph/__pycache__/DAGPresent.cpython-312.pyc and b/graph/directed_acyclic_graph/__pycache__/DAGPresent.cpython-312.pyc differ
diff --git a/graph/directed_acyclic_graph/__pycache__/__init__.cpython-312.pyc b/graph/directed_acyclic_graph/__pycache__/__init__.cpython-312.pyc
index 13683fd..ad685ac 100644
Binary files a/graph/directed_acyclic_graph/__pycache__/__init__.cpython-312.pyc and b/graph/directed_acyclic_graph/__pycache__/__init__.cpython-312.pyc differ
diff --git a/graph/undirected_graph/UDGPresent.py b/graph/undirected_graph/UDGPresent.py
index 55658bf..7c7a12a 100644
--- a/graph/undirected_graph/UDGPresent.py
+++ b/graph/undirected_graph/UDGPresent.py
@@ -249,7 +249,6 @@ class UDGPresent(QGraphicsView):
if item is not None and item.node_type() == PresentNodeType.PresentNode:
vnode: PresentNode = item
self.node_clicked.emit(vnode.node_name)
- print(vnode.node_name)
pass
pass
pass
diff --git a/graph/undirected_graph/__pycache__/UDGPresent.cpython-312.pyc b/graph/undirected_graph/__pycache__/UDGPresent.cpython-312.pyc
index 1feb635..b09d724 100644
Binary files a/graph/undirected_graph/__pycache__/UDGPresent.cpython-312.pyc and b/graph/undirected_graph/__pycache__/UDGPresent.cpython-312.pyc differ
diff --git a/graph/undirected_graph/__pycache__/__init__.cpython-312.pyc b/graph/undirected_graph/__pycache__/__init__.cpython-312.pyc
index df9b4c2..988a46e 100644
Binary files a/graph/undirected_graph/__pycache__/__init__.cpython-312.pyc and b/graph/undirected_graph/__pycache__/__init__.cpython-312.pyc differ
diff --git a/manage/NovelManage.py b/manage/NovelManage.py
index 3656688..bbc3529 100644
--- a/manage/NovelManage.py
+++ b/manage/NovelManage.py
@@ -9,6 +9,7 @@ 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
+from frame.ContentView import StorylinesView, ArticleRefsView
def git_save(target_dir: str):
@@ -61,4 +62,22 @@ if __name__ == "__main__":
all_changed = cmp_tool.graph_compare(map_new, map_old)
present_view = CompareWindow(map_new, all_changed, None)
present_view.show()
- app.exec()
\ No newline at end of file
+ pass
+
+ elif cmd_line == "wnss:-prsn":
+ git_save(os.getcwd())
+ nsc_compile(os.getcwd())
+ stool = XAST_ParseTool(current_store_path)
+ graph_curr = stool.get_story_graph()
+ story_lines_view = StorylinesView(None)
+ story_lines_view.show()
+ story_lines_view.present_stories_graph(graph_curr)
+
+ frags_curr = stool.get_article_nodes()
+ frags_refs_view = ArticleRefsView(None)
+ frags_refs_view.show()
+ frags_refs_view.present_volumes_graph(frags_curr)
+
+ pass
+
+ app.exec()
\ No newline at end of file
diff --git a/manage/__pycache__/MileStone.cpython-312.pyc b/manage/__pycache__/MileStone.cpython-312.pyc
index 98b4483..950b40f 100644
Binary files a/manage/__pycache__/MileStone.cpython-312.pyc and b/manage/__pycache__/MileStone.cpython-312.pyc differ
diff --git a/manage/__pycache__/__init__.cpython-312.pyc b/manage/__pycache__/__init__.cpython-312.pyc
index f36462b..560d2cf 100644
Binary files a/manage/__pycache__/__init__.cpython-312.pyc and b/manage/__pycache__/__init__.cpython-312.pyc differ
diff --git a/manage/wnss.bat b/manage/wnss.bat
index bdb1c23..b839fd1 100644
--- a/manage/wnss.bat
+++ b/manage/wnss.bat
@@ -1,7 +1,5 @@
@echo off
-for %%i in (%0) do (
- set "FolderPath=%%~dpi"
-)
+set FolderPath=%~dp0
set "ScriptName=NovelManage.py"
set ScriptPath=%FolderPath%%ScriptName%
@@ -10,6 +8,9 @@ set args_opt=wnss%1
if %args_opt% == wnss-cmp (
python %ScriptPath% wnss -cmp
+) else if %args_opt% == wnss-prsn (
+python %ScriptPath% wnss -prsn
) else (
echo ԱȻߣ wnss -cmp
-)
\ No newline at end of file
+echo ʾݣ wnss -prsn
+)
diff --git a/parse/__pycache__/StoryMap.cpython-312.pyc b/parse/__pycache__/StoryMap.cpython-312.pyc
index edc8c0b..79fbc5c 100644
Binary files a/parse/__pycache__/StoryMap.cpython-312.pyc and b/parse/__pycache__/StoryMap.cpython-312.pyc differ
diff --git a/parse/__pycache__/StorylineCmp.cpython-312.pyc b/parse/__pycache__/StorylineCmp.cpython-312.pyc
index ffeea86..d5656ed 100644
Binary files a/parse/__pycache__/StorylineCmp.cpython-312.pyc and b/parse/__pycache__/StorylineCmp.cpython-312.pyc differ
diff --git a/parse/__pycache__/__init__.cpython-312.pyc b/parse/__pycache__/__init__.cpython-312.pyc
index fd33a09..7f90ffa 100644
Binary files a/parse/__pycache__/__init__.cpython-312.pyc and b/parse/__pycache__/__init__.cpython-312.pyc differ
diff --git a/parse/__pycache__/ast_load.cpython-312.pyc b/parse/__pycache__/ast_load.cpython-312.pyc
index d3627ca..3a88653 100644
Binary files a/parse/__pycache__/ast_load.cpython-312.pyc and b/parse/__pycache__/ast_load.cpython-312.pyc differ