(
'mine_fsg',
- { path, minSup: repeat, min, max }
+ { path, minSup: repeat, min, max, name: currentGraph.name }
)
const fsgs = dedup(sortedFsgs(res))
setFsgData(fsgs)
diff --git a/plugins/mindstudio-insight-plugins/ModelVis/app/src/ModelStructure/Properties/index.tsx b/plugins/mindstudio-insight-plugins/ModelVis/app/src/ModelStructure/Properties/index.tsx
index 357decbc19..d322f8132a 100644
--- a/plugins/mindstudio-insight-plugins/ModelVis/app/src/ModelStructure/Properties/index.tsx
+++ b/plugins/mindstudio-insight-plugins/ModelVis/app/src/ModelStructure/Properties/index.tsx
@@ -31,7 +31,7 @@ const Properties = () => {
const t = useI18n()
- if (!current) return null
+ if (!current || !model) return null
const isNode = typeof current === "string"
const { nodes, parameters } = model
diff --git a/plugins/mindstudio-insight-plugins/ModelVis/app/src/ModelStructure/index.tsx b/plugins/mindstudio-insight-plugins/ModelVis/app/src/ModelStructure/index.tsx
index dc4e51a6eb..8fec5c4df6 100644
--- a/plugins/mindstudio-insight-plugins/ModelVis/app/src/ModelStructure/index.tsx
+++ b/plugins/mindstudio-insight-plugins/ModelVis/app/src/ModelStructure/index.tsx
@@ -15,7 +15,7 @@
import { Grid, Responsive, SearchModal, type WindowSize } from "features"
import { useAtom, useAtomValue } from "jotai"
-import { clsx, debounce } from "libs"
+import { clsx, debounce, getSubgraph, joinCls } from "libs"
import {
type MouseEvent,
type WheelEvent,
@@ -24,7 +24,15 @@ import {
useRef,
useState
} from "react"
-import { nodesEdgesAtom, fsgVisibleAtom, themeAtom, translateAtom, useZoom } from "stores"
+import {
+ nodesEdgesAtom,
+ fsgVisibleAtom,
+ themeAtom,
+ translateAtom,
+ useZoom,
+ currentGraphAtom,
+ allGraphAtom
+} from "stores"
import {
workerHitTest,
workerInit,
@@ -163,12 +171,45 @@ const ModelStructureComp = ({ width, height }: WindowSize) => {
}
+const GraphPath = () => {
+ const [currentGraph, setCurrentGraph] = useAtom(currentGraphAtom)
+ const [translate, setTranslate] = useAtom(translateAtom)
+ const allGraphs = useAtomValue(allGraphAtom)
+ if (!currentGraph || !allGraphs || currentGraph.paths.length < 1) return null
+
+ const onClickPath = (graphName: string) => {
+ const targetGraph = getSubgraph(allGraphs, graphName)
+ if (targetGraph) {
+ setCurrentGraph(targetGraph)
+ if (translate.x !== 0 || translate.y !== 0) {
+ setTranslate({ x: 0, y: 0 })
+ }
+ }
+ }
+
+ return
+ {currentGraph.paths.map(((item, index) =>
+ index === currentGraph.paths.length - 1 ?
+ {item} :
+ <>
+ onClickPath(item)}>{item}
+ /
+ ))}
+
+}
+
const ModelStructure = () =>
{props => (
<>
+
diff --git a/plugins/mindstudio-insight-plugins/ModelVis/app/src/hooks/useCleanup.ts b/plugins/mindstudio-insight-plugins/ModelVis/app/src/hooks/useCleanup.ts
index af8b9b804f..fc2eb3f4ea 100644
--- a/plugins/mindstudio-insight-plugins/ModelVis/app/src/hooks/useCleanup.ts
+++ b/plugins/mindstudio-insight-plugins/ModelVis/app/src/hooks/useCleanup.ts
@@ -26,11 +26,11 @@ import { workerCleanUp } from "worker-apis"
export const useCleanup = (): VoidFunction => {
const history = useSelectionHistory()
const setModelPath = useSetAtom(modelPathAtom)
- const setModelData = useSetAtom(modelDataAtom as any)
- const setNodesEdges = useSetAtom(nodesEdgesAtom as any)
- const setDynamicNodes = useSetAtom(dynamicNodesAtom as any)
+ const setModelData = useSetAtom(modelDataAtom)
+ const setNodesEdges = useSetAtom(nodesEdgesAtom)
+ const setDynamicNodes = useSetAtom(dynamicNodesAtom)
const setDynamicVisible = useSetAtom(dynamicVisibleAtom)
- const setFsgs = useSetAtom(fsgAtom as any)
+ const setFsgs = useSetAtom(fsgAtom)
const setFsgsVisible = useSetAtom(fsgVisibleAtom)
return () => {
@@ -42,7 +42,7 @@ export const useCleanup = (): VoidFunction => {
setModelPath(null)
setDynamicNodes(null)
setDynamicVisible(false)
- setFsgs(null)
+ setFsgs([])
setFsgsVisible(false)
}
}
diff --git a/plugins/mindstudio-insight-plugins/ModelVis/app/src/hooks/useNewPathForLayout.ts b/plugins/mindstudio-insight-plugins/ModelVis/app/src/hooks/useNewPathForLayout.ts
index 95a95f2a85..6f92ee6e4a 100644
--- a/plugins/mindstudio-insight-plugins/ModelVis/app/src/hooks/useNewPathForLayout.ts
+++ b/plugins/mindstudio-insight-plugins/ModelVis/app/src/hooks/useNewPathForLayout.ts
@@ -19,12 +19,10 @@ import { toast } from "sonner"
import {
dynamicVisibleAtom,
loadingAtom,
- modelDataAtom,
modelPathAtom,
- nodesEdgesAtom,
recentProjCache,
fsgVisibleAtom,
- translateAtom, useSelectionHistory, useZoom
+ translateAtom, useSelectionHistory, useZoom, currentGraphAtom, allGraphAtom
} from "stores"
type LayoutNewPath = (path: string | null) => Promise
@@ -32,8 +30,8 @@ type LayoutNewPath = (path: string | null) => Promise
export const useNewPathForLayout = (): LayoutNewPath => {
const [modelPath, setModelPath] = useAtom(modelPathAtom)
const history = useSelectionHistory()
- const setModelData = useSetAtom(modelDataAtom)
- const setLayoutRet = useSetAtom(nodesEdgesAtom)
+ const setCurrentGraphAtom = useSetAtom(currentGraphAtom)
+ const setAllGraphAtom = useSetAtom(allGraphAtom)
const setDynamicVisible = useSetAtom(dynamicVisibleAtom)
const setFsgsVisible = useSetAtom(fsgVisibleAtom)
const [translate, setTranslate] = useAtom(translateAtom)
@@ -47,11 +45,7 @@ export const useNewPathForLayout = (): LayoutNewPath => {
const start = performance.now()
setLoading(true)
- const {
- model,
- nodes,
- edges
- } = await invoke("layout_bin", {path})
+ const res = await invoke("layout_bin", {path})
setLoading(false)
toast.success(`parse + transfer cost ${Math.round(performance.now() - start)}ms`, {
@@ -59,10 +53,10 @@ export const useNewPathForLayout = (): LayoutNewPath => {
closeButton: true
})
- if (model) {
+ if (res) {
history.clear()
- setModelData(model)
- setLayoutRet({nodes, edges})
+ setCurrentGraphAtom(res)
+ setAllGraphAtom(res)
setDynamicVisible(false)
setFsgsVisible(false)
if (translate.x !== 0 || translate.y !== 0) setTranslate({
diff --git a/plugins/mindstudio-insight-plugins/ModelVis/app/src/libs/get-subgraph.ts b/plugins/mindstudio-insight-plugins/ModelVis/app/src/libs/get-subgraph.ts
new file mode 100644
index 0000000000..bbc7a7988d
--- /dev/null
+++ b/plugins/mindstudio-insight-plugins/ModelVis/app/src/libs/get-subgraph.ts
@@ -0,0 +1,27 @@
+// Copyright (c) 2025, Huawei Technologies Co., Ltd.
+// All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+export const getSubgraph = (graph: LayoutRet, name: string): LayoutRet | null => {
+ if (graph.name === name) {
+ return graph
+ }
+ for (const subgraph of graph.children) {
+ const res = getSubgraph(subgraph, name)
+ if (res) {
+ return res
+ }
+ }
+ return null
+}
\ No newline at end of file
diff --git a/plugins/mindstudio-insight-plugins/ModelVis/app/src/libs/index.ts b/plugins/mindstudio-insight-plugins/ModelVis/app/src/libs/index.ts
index 9a5d64d64d..04ddab67b6 100644
--- a/plugins/mindstudio-insight-plugins/ModelVis/app/src/libs/index.ts
+++ b/plugins/mindstudio-insight-plugins/ModelVis/app/src/libs/index.ts
@@ -20,3 +20,4 @@ export * from "./throttle"
export * from "./ring"
export * from "./file-dialog"
export * from "./join-cls"
+export * from './get-subgraph'
diff --git a/plugins/mindstudio-insight-plugins/ModelVis/app/src/src-worker/render.ts b/plugins/mindstudio-insight-plugins/ModelVis/app/src/src-worker/render.ts
index 3ce24e1bf4..884ca9ded9 100644
--- a/plugins/mindstudio-insight-plugins/ModelVis/app/src/src-worker/render.ts
+++ b/plugins/mindstudio-insight-plugins/ModelVis/app/src/src-worker/render.ts
@@ -153,22 +153,23 @@ const renderNodes = (
const visibleNodes = []
for (const node of nodes) {
- const { opType, x, y, width, height, dynamic } = node
+ const { id, opType, x, y, width, height, dynamic } = node
if (!intersects(node, sx, sy, ex, ey)) continue
-
+ visibleNodes.push(node)
if (opType === "subgraph") {
Ctx.save()
+ Ctx.fillText(id.length <= 20 ? id : `${id.substring(0, 16)}...`, x + width / 2, y + height / 2)
Ctx.strokeStyle = "#00E5FF"
Ctx.strokeRect(x, y, width, height)
+ Ctx.fillStyle = node.completed ? 'rgba(0, 255, 0, 0.5)' : 'rgba(255, 0, 0, 0.5)'
+ Ctx.fillRect(x, y, width, height)
Ctx.restore()
continue
}
- visibleNodes.push(node)
-
Ctx.save()
- Ctx.strokeStyle = getColor(node.opType)
+ Ctx.strokeStyle = getColor(opType)
if (MarkDynOp && (dynamic || opType === "Concat")) renderNodeWithDynMark(node)
else Ctx.fillText(opType, x + width / 2, y + height / 2)
diff --git a/plugins/mindstudio-insight-plugins/ModelVis/app/src/stores/app-context.ts b/plugins/mindstudio-insight-plugins/ModelVis/app/src/stores/app-context.ts
index 48115a43e1..6398cf4e1e 100644
--- a/plugins/mindstudio-insight-plugins/ModelVis/app/src/stores/app-context.ts
+++ b/plugins/mindstudio-insight-plugins/ModelVis/app/src/stores/app-context.ts
@@ -3,9 +3,13 @@ import { atom } from "jotai"
export const gridVisibleAtom = atom(true)
export const fsgVisibleAtom = atom(false)
export const fsgPanelVisibleAtom = atom(false)
-export const fsgAtom = atom(null!)
+export const fsgAtom = atom([])
export const dynamicVisibleAtom = atom(false)
export const dynamicNodesAtom = atom(null)
export const modelPathAtom = atom(null)
-export const modelDataAtom = atom(null!)
-export const nodesEdgesAtom = atom(null!)
+export const modelDataAtom = atom(null)
+export const nodesEdgesAtom = atom(null)
+export const allGraphAtom = atom(null!)
+export const currentGraphAtom = atom({children: [], name: '', paths: []})
+export const subgraphesAtom = atom({})
+export const updateSubgraphAtom = atom(null, (get, set, newValue: Subgraphs) => set(subgraphesAtom, newValue))
diff --git a/plugins/mindstudio-insight-plugins/ModelVis/app/src/styles/index.css b/plugins/mindstudio-insight-plugins/ModelVis/app/src/styles/index.css
index 75062ab84f..dd9d86b374 100644
--- a/plugins/mindstudio-insight-plugins/ModelVis/app/src/styles/index.css
+++ b/plugins/mindstudio-insight-plugins/ModelVis/app/src/styles/index.css
@@ -81,3 +81,14 @@ image {
.dark .glass-effect {
background: rgba(30, 41, 59, 0.7);
}
+
+.path-name {
+ cursor: pointer;
+ &:hover {
+ color: #4096FF;
+ }
+}
+
+.current-path-name {
+ color: #1677FF;
+}
diff --git a/plugins/mindstudio-insight-plugins/ModelVis/app/src/types/model.d.ts b/plugins/mindstudio-insight-plugins/ModelVis/app/src/types/model.d.ts
index 4ab092b53b..0f4f27d3de 100644
--- a/plugins/mindstudio-insight-plugins/ModelVis/app/src/types/model.d.ts
+++ b/plugins/mindstudio-insight-plugins/ModelVis/app/src/types/model.d.ts
@@ -72,6 +72,7 @@ type RenderNode = BoundingRect & {
id: string
opType: string
dynamic: boolean
+ completed?: boolean
}
type RenderEdge = BoundingRect & {
@@ -82,11 +83,21 @@ type RenderEdge = BoundingRect & {
}
type LayoutRet = {
- model: ModelData,
+ children: LayoutRet[]
+ name: string
+ paths: string[]
+}
+
+type GraphData = {
+ model: ModelData
nodes: RenderNode[]
edges: RenderEdge[]
}
+type Subgraphs = {
+ [name: string]: GraphData
+}
+
type NodesEdges = {
nodes: RenderNode[]
edges: RenderEdge[]
diff --git a/plugins/mindstudio-insight-plugins/ModelVis/app/src/useWorkerMessage.ts b/plugins/mindstudio-insight-plugins/ModelVis/app/src/useWorkerMessage.ts
index db647bb602..e050f658d7 100644
--- a/plugins/mindstudio-insight-plugins/ModelVis/app/src/useWorkerMessage.ts
+++ b/plugins/mindstudio-insight-plugins/ModelVis/app/src/useWorkerMessage.ts
@@ -13,16 +13,26 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-import { useSetAtom } from "jotai"
+import { useAtomValue, useSetAtom } from "jotai"
import {
+ allGraphAtom, currentGraphAtom,
dynamicNodesAtom,
- searchResultAtom, useSelectionHistory,
+ searchResultAtom, subgraphesAtom, translateAtom, useSelectionHistory,
} from "./stores"
import WebWorker from "./worker"
+import { getSubgraph } from "./libs";
+import { useAtom } from "jotai/index";
+import { listen } from "@tauri-apps/api/event";
+
+const PARSE_GRAPH_EVENT = "parse_graph_success"
const useWorkerMessage = () => {
const setSearchResult = useSetAtom(searchResultAtom)
const setDynamicNodes = useSetAtom(dynamicNodesAtom)
+ const allGraphs = useAtomValue(allGraphAtom)
+ const setCurrentGraph = useSetAtom(currentGraphAtom)
+ const [translate, setTranslate] = useAtom(translateAtom)
+ const [subgraphs, setSubGraphs] = useAtom(subgraphesAtom)
const { update, clear } = useSelectionHistory()
WebWorker.onmessage = ({ data: payload }) => {
@@ -33,7 +43,17 @@ const useWorkerMessage = () => {
case "hit-test/ret": {
const ret = payload?.data
- if (ret?.id) update(ret.id)
+ if (ret?.id) {
+ const currentGraph = getSubgraph(allGraphs, ret.id)
+ if (currentGraph) {
+ setCurrentGraph(currentGraph)
+ if (translate.x !== 0 || translate.y !== 0) {
+ setTranslate({ x: 0, y: 0 })
+ }
+ } else {
+ update(ret.id)
+ }
+ }
else if (ret?.source) update({
source: ret?.source, target: ret?.target
})
@@ -46,6 +66,14 @@ const useWorkerMessage = () => {
break
}
}
+
+ listen(PARSE_GRAPH_EVENT, (event: any) => {
+ const { model } = event.payload
+ if (model?.name) {
+ subgraphs[model.name] = event.payload
+ setSubGraphs({ ...subgraphs })
+ }
+ })
}
export default useWorkerMessage
--
Gitee