diff --git a/rsconcept/frontend/src/pages/RSFormPage/DlgGraphOptions.tsx b/rsconcept/frontend/src/pages/RSFormPage/DlgGraphOptions.tsx index ddb20b23..e946e815 100644 --- a/rsconcept/frontend/src/pages/RSFormPage/DlgGraphOptions.tsx +++ b/rsconcept/frontend/src/pages/RSFormPage/DlgGraphOptions.tsx @@ -16,6 +16,7 @@ function DlgGraphOptions({ hideWindow, initial, onConfirm }:DlgGraphOptionsProps const [ noHermits, setNoHermits ] = useState(true); const [ noTransitive, setNoTransitive ] = useState(false); const [ noTemplates, setNoTemplates ] = useState(true); + const [ noTerms, setNoTerms ] = useState(true); const [ allowBase, setAllowBase ] = useState(true); const [ allowStruct, setAllowStruct ] = useState(true); @@ -31,6 +32,7 @@ function DlgGraphOptions({ hideWindow, initial, onConfirm }:DlgGraphOptionsProps noHermits: noHermits, noTransitive: noTransitive, noTemplates: noTemplates, + noTerms: noTerms, allowBase: allowBase, allowStruct: allowStruct, @@ -52,6 +54,7 @@ function DlgGraphOptions({ hideWindow, initial, onConfirm }:DlgGraphOptionsProps setNoHermits(initial.noHermits); setNoTransitive(initial.noTransitive); setNoTemplates(initial.noTemplates); + setNoTerms(initial.noTerms); setAllowBase(initial.allowBase); setAllowStruct(initial.allowStruct); @@ -74,6 +77,12 @@ function DlgGraphOptions({ hideWindow, initial, onConfirm }:DlgGraphOptionsProps

Преобразования

+ setNoTerms(event.target.checked) } + /> { @@ -205,7 +207,8 @@ function EditorTermGraph({ onOpenEdit }: EditorTermGraphProps) { nodes, edges, type: 'multi', // 'single' | 'multi' | 'multiModifier' - pathSelectionType: 'all', + pathSelectionType: 'out', + pathHoverType: 'all', focusOnSelect: false }); @@ -241,6 +244,7 @@ function EditorTermGraph({ onOpenEdit }: EditorTermGraphProps) { noHermits: noHermits, noTemplates: noTemplates, noTransitive: noTransitive, + noTerms: noTerms, allowBase: allowBase, allowStruct: allowStruct, @@ -258,6 +262,7 @@ function EditorTermGraph({ onOpenEdit }: EditorTermGraphProps) { setNoHermits(params.noHermits); setNoTransitive(params.noTransitive); setNoTemplates(params.noTemplates); + setNoTerms(params.noTerms); setAllowBase(params.allowBase); setAllowStruct(params.allowStruct); @@ -269,7 +274,7 @@ function EditorTermGraph({ onOpenEdit }: EditorTermGraphProps) { setAllowTheorem(params.allowTheorem); }, [setNoHermits, setNoTransitive, setNoTemplates, setAllowBase, setAllowStruct, setAllowTerm, setAllowAxiom, setAllowFunction, - setAllowPredicate, setAllowConstant, setAllowTheorem]); + setAllowPredicate, setAllowConstant, setAllowTheorem, setNoTerms]); const canvasWidth = useMemo( () => { @@ -331,16 +336,21 @@ function EditorTermGraph({ onOpenEdit }: EditorTermGraphProps) { onChange={data => { setLayout(data.length > 0 ? data[0].value : GraphLayoutSelector[0].value); }} /> setOrbit(event.target.checked) } + label='Скрыть текст' + value={noTerms} + onChange={ event => setNoTerms(event.target.checked) } /> setNoTransitive(event.target.checked) } /> + setOrbit(event.target.checked) } + /> @@ -354,7 +364,7 @@ function EditorTermGraph({ onOpenEdit }: EditorTermGraphProps) {
toggleDismissed(cstID)} onDoubleClick={() => onOpenEdit(cstID)}