update
This commit is contained in:
parent
cec7faf053
commit
9342eea225
|
@ -5,12 +5,9 @@
|
|||
</component>
|
||||
<component name="ChangeListManager">
|
||||
<list default="true" id="f609c0f2-cd0d-4eea-87f1-8caf02d3f04f" name="Changes" comment="">
|
||||
<change afterPath="$PROJECT_DIR$/frame/CompareViews.py" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/frame/CompareWindow.py" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/frame/MergeView.py" beforeDir="false" afterPath="$PROJECT_DIR$/frame/MergeView.py" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/frame/CompareViews.py" beforeDir="false" afterPath="$PROJECT_DIR$/frame/CompareViews.py" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/parse/StoryMap.py" beforeDir="false" afterPath="$PROJECT_DIR$/parse/StoryMap.py" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/parse/StorylineCmp.py" beforeDir="false" afterPath="$PROJECT_DIR$/parse/StorylineCmp.py" afterDir="false" />
|
||||
</list>
|
||||
<option name="SHOW_DIALOG" value="false" />
|
||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||
|
@ -201,20 +198,4 @@
|
|||
</task>
|
||||
<servers />
|
||||
</component>
|
||||
<component name="XDebuggerManager">
|
||||
<breakpoint-manager>
|
||||
<breakpoints>
|
||||
<line-breakpoint enabled="true" suspend="THREAD" type="python-line">
|
||||
<url>file://$PROJECT_DIR$/frame/CompareViews.py</url>
|
||||
<line>167</line>
|
||||
<option name="timeStamp" value="1" />
|
||||
</line-breakpoint>
|
||||
<line-breakpoint enabled="true" suspend="THREAD" type="python-line">
|
||||
<url>file://$PROJECT_DIR$/frame/CompareViews.py</url>
|
||||
<line>164</line>
|
||||
<option name="timeStamp" value="2" />
|
||||
</line-breakpoint>
|
||||
</breakpoints>
|
||||
</breakpoint-manager>
|
||||
</component>
|
||||
</project>
|
|
@ -1,12 +1,12 @@
|
|||
from PyQt5.QtWidgets import QWidget, QVBoxLayout, QTableView, QSplitter, QApplication, QMainWindow
|
||||
from PyQt5.QtGui import QStandardItemModel, QStandardItem
|
||||
from typing import List, Dict, Tuple
|
||||
from manage.MileStone import base_store_path, current_store_path
|
||||
from parse.StorylineCmp import ModifyReason, CmpTool
|
||||
from parse.StoryMap import FragmentSlice, StoryMap, XAST_ParseTool, storyline_list2map
|
||||
import sys
|
||||
from PyQt5.QtCore import pyqtSignal, pyqtSlot, QModelIndex
|
||||
from frame.MergeView import LinesMergeView,MergeDestination
|
||||
from typing import List, Dict, Tuple
|
||||
from PyQt5.QtCore import QModelIndex
|
||||
from PyQt5.QtGui import QStandardItemModel, QStandardItem
|
||||
from PyQt5.QtWidgets import QWidget, QVBoxLayout, QTableView, QSplitter, QApplication, QMainWindow
|
||||
from frame.MergeView import LinesMergeView, MergeDestination
|
||||
from manage.MileStone import base_store_path, current_store_path
|
||||
from parse.StoryMap import FragmentSlice, StoryMap, XAST_ParseTool, storyline_list2map
|
||||
from parse.StorylineCmp import ModifyReason, CmpTool
|
||||
|
||||
|
||||
class ResultList(QTableView):
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
import xml.dom.minidom as mdom
|
||||
from typing import List, Tuple, Dict
|
||||
from enum import Enum
|
||||
from frame.ReferView import EmptyNode, MemoryNode
|
||||
from frame.ReferView import EmptyNode
|
||||
|
||||
|
||||
class FragmentSlice(EmptyNode):
|
||||
|
|
Loading…
Reference in New Issue