modify home view point

This commit is contained in:
jiegeaiai 2025-01-06 02:18:16 +08:00
parent a04b8ac769
commit 0861f66413
9 changed files with 196 additions and 135 deletions

View File

@ -6,22 +6,22 @@
<message> <message>
<location filename="../ui/Layout/AddParamSetting.cpp" line="64"/> <location filename="../ui/Layout/AddParamSetting.cpp" line="64"/>
<source>ParamSetting</source> <source>ParamSetting</source>
<translation></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/Layout/AddParamSetting.cpp" line="104"/> <location filename="../ui/Layout/AddParamSetting.cpp" line="104"/>
<source>input param name</source> <source>input param name</source>
<translation></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/Layout/AddParamSetting.cpp" line="111"/> <location filename="../ui/Layout/AddParamSetting.cpp" line="111"/>
<source>input param descript</source> <source>input param descript</source>
<translation></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/Layout/AddParamSetting.cpp" line="167"/> <location filename="../ui/Layout/AddParamSetting.cpp" line="167"/>
<source>input value</source> <source>input value</source>
<translation></translation> <translation type="unfinished"></translation>
</message> </message>
</context> </context>
<context> <context>
@ -29,7 +29,7 @@
<message> <message>
<location filename="../ui/Layout/AddParamSetting.ui" line="14"/> <location filename="../ui/Layout/AddParamSetting.ui" line="14"/>
<source>AddParamSetting</source> <source>AddParamSetting</source>
<translation></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/Layout/AddParamSetting.ui" line="21"/> <location filename="../ui/Layout/AddParamSetting.ui" line="21"/>
@ -92,32 +92,20 @@
<message> <message>
<location filename="../ui/Menu/ChartPlotMenu.ui" line="14"/> <location filename="../ui/Menu/ChartPlotMenu.ui" line="14"/>
<source>ChartPlotMenu</source> <source>ChartPlotMenu</source>
<translation></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/Menu/ChartPlotMenu.ui" line="28"/> <location filename="../ui/Menu/ChartPlotMenu.ui" line="28"/>
<source>Run Simu</source> <source>Run Simu</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>2D Curver</source>
<translation type="vanished">2D</translation>
</message>
<message>
<source>2D(lg) Curver</source>
<translation type="vanished">2D(lg)</translation>
</message>
<message>
<source>3D Curver</source>
<translation type="vanished">3D</translation>
</message>
</context> </context>
<context> <context>
<name>CodeEdtUI</name> <name>CodeEdtUI</name>
<message> <message>
<location filename="../ui/Layout/CodeEdtUI.cpp" line="36"/> <location filename="../ui/Layout/CodeEdtUI.cpp" line="36"/>
<source>&amp;file</source> <source>&amp;file</source>
<translation>(&amp;f)</translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/Layout/CodeEdtUI.cpp" line="37"/> <location filename="../ui/Layout/CodeEdtUI.cpp" line="37"/>
@ -221,7 +209,7 @@
<location filename="../ui/chartPlot/DYTChart.ui" line="261"/> <location filename="../ui/chartPlot/DYTChart.ui" line="261"/>
<location filename="../ui/chartPlot/DYTChart.ui" line="296"/> <location filename="../ui/chartPlot/DYTChart.ui" line="296"/>
<source>...</source> <source>...</source>
<translation type="unfinished">...</translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/chartPlot/DYTChart.ui" line="200"/> <location filename="../ui/chartPlot/DYTChart.ui" line="200"/>
@ -378,22 +366,22 @@
<message> <message>
<location filename="../ui/Menu/FileManagerMenu.ui" line="14"/> <location filename="../ui/Menu/FileManagerMenu.ui" line="14"/>
<source>FileManagerMenu</source> <source>FileManagerMenu</source>
<translation></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/Menu/FileManagerMenu.ui" line="20"/> <location filename="../ui/Menu/FileManagerMenu.ui" line="20"/>
<source>new workspace</source> <source>new workspace</source>
<translation></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/Menu/FileManagerMenu.ui" line="30"/> <location filename="../ui/Menu/FileManagerMenu.ui" line="30"/>
<source>open workspace</source> <source>open workspace</source>
<translation></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/Menu/FileManagerMenu.ui" line="40"/> <location filename="../ui/Menu/FileManagerMenu.ui" line="40"/>
<source>save workspace</source> <source>save workspace</source>
<translation></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/Menu/FileManagerMenu.cpp" line="44"/> <location filename="../ui/Menu/FileManagerMenu.cpp" line="44"/>
@ -404,7 +392,7 @@
<message> <message>
<location filename="../ui/Menu/FileManagerMenu.cpp" line="47"/> <location filename="../ui/Menu/FileManagerMenu.cpp" line="47"/>
<source>open dyt file</source> <source>open dyt file</source>
<translation></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/Menu/FileManagerMenu.cpp" line="48"/> <location filename="../ui/Menu/FileManagerMenu.cpp" line="48"/>
@ -415,7 +403,7 @@
<message> <message>
<location filename="../ui/Menu/FileManagerMenu.cpp" line="63"/> <location filename="../ui/Menu/FileManagerMenu.cpp" line="63"/>
<source>save dyt file</source> <source>save dyt file</source>
<translation></translation> <translation type="unfinished"></translation>
</message> </message>
</context> </context>
<context> <context>
@ -423,7 +411,7 @@
<message> <message>
<location filename="../ui/chartPlot/FitCurveChartView.ui" line="16"/> <location filename="../ui/chartPlot/FitCurveChartView.ui" line="16"/>
<source>FitCurveChartView</source> <source>FitCurveChartView</source>
<translation></translation> <translation type="unfinished"></translation>
</message> </message>
</context> </context>
<context> <context>
@ -480,40 +468,28 @@
<message> <message>
<location filename="../ui/MainFrame.cpp" line="40"/> <location filename="../ui/MainFrame.cpp" line="40"/>
<source>Dyt</source> <source>Dyt</source>
<translation></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/MainFrame.cpp" line="99"/> <location filename="../ui/MainFrame.cpp" line="99"/>
<source>file manager</source> <source>file manager</source>
<translation></translation> <translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/MainFrame.cpp" line="106"/>
<source>system manager</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/MainFrame.cpp" line="109"/>
<source>play manager</source>
<translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/MainFrame.cpp" line="112"/> <location filename="../ui/MainFrame.cpp" line="112"/>
<source>simu manager</source> <source>simu manager</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>view manager</source>
<translation type="vanished"></translation>
</message>
<message>
<source>plan manager</source>
<translation type="vanished"></translation>
</message>
<message>
<source>dynamic display</source>
<translation type="vanished"></translation>
</message>
<message>
<location filename="../ui/MainFrame.cpp" line="106"/>
<source>system manager</source>
<translation></translation>
</message>
<message>
<location filename="../ui/MainFrame.cpp" line="109"/>
<source>play manager</source>
<translation></translation>
</message>
</context> </context>
<context> <context>
<name>MainWindow</name> <name>MainWindow</name>
@ -525,7 +501,7 @@
<message> <message>
<location filename="../ui/MainWindow.cpp" line="71"/> <location filename="../ui/MainWindow.cpp" line="71"/>
<source>model elements</source> <source>model elements</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/MainWindow.cpp" line="77"/> <location filename="../ui/MainWindow.cpp" line="77"/>
@ -661,7 +637,7 @@
<message> <message>
<location filename="../ui/MainWindow.cpp" line="194"/> <location filename="../ui/MainWindow.cpp" line="194"/>
<source>ParamSetting</source> <source>ParamSetting</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
</context> </context>
<context> <context>
@ -669,7 +645,7 @@
<message> <message>
<location filename="../ui/ModelBrowser.cpp" line="31"/> <location filename="../ui/ModelBrowser.cpp" line="31"/>
<source>model elements</source> <source>model elements</source>
<translation></translation> <translation type="unfinished"></translation>
</message> </message>
</context> </context>
<context> <context>
@ -695,7 +671,7 @@
<message> <message>
<location filename="../ui/ModelBrowser/ModelTreeWidget.cpp" line="98"/> <location filename="../ui/ModelBrowser/ModelTreeWidget.cpp" line="98"/>
<source>Release Track</source> <source>Release Track</source>
<translation></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/ModelBrowser/ModelTreeWidget.cpp" line="115"/> <location filename="../ui/ModelBrowser/ModelTreeWidget.cpp" line="115"/>
@ -730,7 +706,7 @@
<message> <message>
<location filename="../ui/ModelBrowser/ModelTreeWidget.cpp" line="252"/> <location filename="../ui/ModelBrowser/ModelTreeWidget.cpp" line="252"/>
<source>Track</source> <source>Track</source>
<translation></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/ModelBrowser/ModelTreeWidget.cpp" line="260"/> <location filename="../ui/ModelBrowser/ModelTreeWidget.cpp" line="260"/>
@ -745,7 +721,7 @@
<message> <message>
<location filename="../ui/ModelBrowser/ModelTreeWidget.cpp" line="271"/> <location filename="../ui/ModelBrowser/ModelTreeWidget.cpp" line="271"/>
<source>Delete</source> <source>Delete</source>
<translation></translation> <translation type="unfinished"></translation>
</message> </message>
</context> </context>
<context> <context>
@ -761,7 +737,7 @@
<message> <message>
<location filename="../ui/Menu/PlayManagerMenu.ui" line="14"/> <location filename="../ui/Menu/PlayManagerMenu.ui" line="14"/>
<source>PlayManagerMenu</source> <source>PlayManagerMenu</source>
<translation></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/Menu/PlayManagerMenu.ui" line="20"/> <location filename="../ui/Menu/PlayManagerMenu.ui" line="20"/>
@ -769,12 +745,12 @@
<location filename="../ui/Menu/PlayManagerMenu.cpp" line="150"/> <location filename="../ui/Menu/PlayManagerMenu.cpp" line="150"/>
<location filename="../ui/Menu/PlayManagerMenu.cpp" line="157"/> <location filename="../ui/Menu/PlayManagerMenu.cpp" line="157"/>
<source>play</source> <source>play</source>
<translation></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/Menu/PlayManagerMenu.ui" line="27"/> <location filename="../ui/Menu/PlayManagerMenu.ui" line="27"/>
<source>stop</source> <source>stop</source>
<translation></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/Menu/PlayManagerMenu.ui" line="55"/> <location filename="../ui/Menu/PlayManagerMenu.ui" line="55"/>
@ -794,12 +770,12 @@
<message> <message>
<location filename="../ui/Menu/PlayManagerMenu.ui" line="105"/> <location filename="../ui/Menu/PlayManagerMenu.ui" line="105"/>
<source>up</source> <source>up</source>
<translation></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/Menu/PlayManagerMenu.ui" line="112"/> <location filename="../ui/Menu/PlayManagerMenu.ui" line="112"/>
<source>down</source> <source>down</source>
<translation></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/Menu/PlayManagerMenu.cpp" line="34"/> <location filename="../ui/Menu/PlayManagerMenu.cpp" line="34"/>
@ -811,7 +787,7 @@
<location filename="../ui/Menu/PlayManagerMenu.cpp" line="99"/> <location filename="../ui/Menu/PlayManagerMenu.cpp" line="99"/>
<location filename="../ui/Menu/PlayManagerMenu.cpp" line="106"/> <location filename="../ui/Menu/PlayManagerMenu.cpp" line="106"/>
<source>question</source> <source>question</source>
<translation></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/Menu/PlayManagerMenu.cpp" line="34"/> <location filename="../ui/Menu/PlayManagerMenu.cpp" line="34"/>
@ -823,14 +799,14 @@
<location filename="../ui/Menu/PlayManagerMenu.cpp" line="99"/> <location filename="../ui/Menu/PlayManagerMenu.cpp" line="99"/>
<location filename="../ui/Menu/PlayManagerMenu.cpp" line="106"/> <location filename="../ui/Menu/PlayManagerMenu.cpp" line="106"/>
<source>has not workspace</source> <source>has not workspace</source>
<translation></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/Menu/PlayManagerMenu.cpp" line="48"/> <location filename="../ui/Menu/PlayManagerMenu.cpp" line="48"/>
<location filename="../ui/Menu/PlayManagerMenu.cpp" line="52"/> <location filename="../ui/Menu/PlayManagerMenu.cpp" line="52"/>
<location filename="../ui/Menu/PlayManagerMenu.cpp" line="147"/> <location filename="../ui/Menu/PlayManagerMenu.cpp" line="147"/>
<source>pause</source> <source>pause</source>
<translation></translation> <translation type="unfinished"></translation>
</message> </message>
</context> </context>
<context> <context>
@ -969,7 +945,7 @@
<message> <message>
<location filename="../ui/PropertyBrowser/qteditorfactory.cpp" line="2441"/> <location filename="../ui/PropertyBrowser/qteditorfactory.cpp" line="2441"/>
<source>...</source> <source>...</source>
<translation type="unfinished">...</translation> <translation type="unfinished"></translation>
</message> </message>
</context> </context>
<context> <context>
@ -1171,7 +1147,7 @@
<message> <message>
<location filename="../ui/PropertyBrowser/qteditorfactory.cpp" line="3052"/> <location filename="../ui/PropertyBrowser/qteditorfactory.cpp" line="3052"/>
<source>...</source> <source>...</source>
<translation type="unfinished">...</translation> <translation type="unfinished"></translation>
</message> </message>
</context> </context>
<context> <context>
@ -1179,7 +1155,7 @@
<message> <message>
<location filename="../ui/PropertyBrowser/qtpropertymanager.cpp" line="8212"/> <location filename="../ui/PropertyBrowser/qtpropertymanager.cpp" line="8212"/>
<source>Name</source> <source>Name</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/PropertyBrowser/qtpropertymanager.cpp" line="8219"/> <location filename="../ui/PropertyBrowser/qtpropertymanager.cpp" line="8219"/>
@ -1192,7 +1168,7 @@
<message> <message>
<location filename="../ui/PropertyBrowser/qteditorfactory.cpp" line="2644"/> <location filename="../ui/PropertyBrowser/qteditorfactory.cpp" line="2644"/>
<source>...</source> <source>...</source>
<translation type="unfinished">...</translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/PropertyBrowser/qteditorfactory.cpp" line="2664"/> <location filename="../ui/PropertyBrowser/qteditorfactory.cpp" line="2664"/>
@ -1280,7 +1256,7 @@
<message> <message>
<location filename="../ui/PropertyBrowser/qtpropertymanager.cpp" line="7792"/> <location filename="../ui/PropertyBrowser/qtpropertymanager.cpp" line="7792"/>
<source>Name</source> <source>Name</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/PropertyBrowser/qtpropertymanager.cpp" line="7799"/> <location filename="../ui/PropertyBrowser/qtpropertymanager.cpp" line="7799"/>
@ -1301,12 +1277,12 @@
<context> <context>
<name>QtOsgViewWidget</name> <name>QtOsgViewWidget</name>
<message> <message>
<location filename="../viewer/QtOsgViewWidget.cpp" line="110"/> <location filename="../viewer/QtOsgViewWidget.cpp" line="128"/>
<source>notify</source> <source>notify</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../viewer/QtOsgViewWidget.cpp" line="110"/> <location filename="../viewer/QtOsgViewWidget.cpp" line="128"/>
<source>open dyt file failed</source> <source>open dyt file failed</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -1322,7 +1298,7 @@
<message> <message>
<location filename="../ui/PropertyBrowser/qtpropertymanager.cpp" line="8567"/> <location filename="../ui/PropertyBrowser/qtpropertymanager.cpp" line="8567"/>
<source>Path</source> <source>Path</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
</context> </context>
<context> <context>
@ -1515,7 +1491,7 @@
<message> <message>
<location filename="../ui/PropertyBrowser/qteditorfactory.cpp" line="2862"/> <location filename="../ui/PropertyBrowser/qteditorfactory.cpp" line="2862"/>
<source>...</source> <source>...</source>
<translation type="unfinished">...</translation> <translation type="unfinished"></translation>
</message> </message>
</context> </context>
<context> <context>
@ -1572,7 +1548,7 @@
<message> <message>
<location filename="../ui/PropertyBrowser/qtpropertymanager.cpp" line="8012"/> <location filename="../ui/PropertyBrowser/qtpropertymanager.cpp" line="8012"/>
<source>Name</source> <source>Name</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/PropertyBrowser/qtpropertymanager.cpp" line="8019"/> <location filename="../ui/PropertyBrowser/qtpropertymanager.cpp" line="8019"/>
@ -1634,22 +1610,22 @@
<message> <message>
<location filename="../ui/Menu/SystemManagerMenu.ui" line="20"/> <location filename="../ui/Menu/SystemManagerMenu.ui" line="20"/>
<source>exit</source> <source>exit</source>
<translation>退</translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/Menu/SystemManagerMenu.ui" line="40"/> <location filename="../ui/Menu/SystemManagerMenu.ui" line="40"/>
<source>ui setting</source> <source>ui setting</source>
<translation>ui设置</translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/Menu/SystemManagerMenu.cpp" line="28"/> <location filename="../ui/Menu/SystemManagerMenu.cpp" line="28"/>
<source>question</source> <source>question</source>
<translation></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/Menu/SystemManagerMenu.cpp" line="28"/> <location filename="../ui/Menu/SystemManagerMenu.cpp" line="28"/>
<source>are you sure to exit</source> <source>are you sure to exit</source>
<translation>退</translation> <translation type="unfinished"></translation>
</message> </message>
</context> </context>
<context> <context>
@ -1708,52 +1684,52 @@
<message> <message>
<location filename="../ui/WorkSpace/WorkSpaceDlg.ui" line="14"/> <location filename="../ui/WorkSpace/WorkSpaceDlg.ui" line="14"/>
<source>New WorkSpace</source> <source>New WorkSpace</source>
<translation></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/WorkSpace/WorkSpaceDlg.ui" line="22"/> <location filename="../ui/WorkSpace/WorkSpaceDlg.ui" line="22"/>
<source>Name</source> <source>Name</source>
<translation></translation> <translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/WorkSpace/WorkSpaceDlg.ui" line="43"/>
<source>Path</source>
<translation></translation>
</message> </message>
<message> <message>
<location filename="../ui/WorkSpace/WorkSpaceDlg.ui" line="32"/> <location filename="../ui/WorkSpace/WorkSpaceDlg.ui" line="32"/>
<source>input workspace name</source> <source>input workspace name</source>
<translation></translation> <translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/WorkSpace/WorkSpaceDlg.ui" line="43"/>
<source>Path</source>
<translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/WorkSpace/WorkSpaceDlg.ui" line="56"/> <location filename="../ui/WorkSpace/WorkSpaceDlg.ui" line="56"/>
<source>select workspace save path</source> <source>select workspace save path</source>
<translation></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/WorkSpace/WorkSpaceDlg.ui" line="63"/> <location filename="../ui/WorkSpace/WorkSpaceDlg.ui" line="63"/>
<source>...</source> <source>...</source>
<translation>...</translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/WorkSpace/WorkSpaceDlg.ui" line="74"/> <location filename="../ui/WorkSpace/WorkSpaceDlg.ui" line="74"/>
<source>describe</source> <source>describe</source>
<translation></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/WorkSpace/WorkSpaceDlg.ui" line="101"/> <location filename="../ui/WorkSpace/WorkSpaceDlg.ui" line="101"/>
<source>Sure</source> <source>Sure</source>
<translation></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/WorkSpace/WorkSpaceDlg.ui" line="108"/> <location filename="../ui/WorkSpace/WorkSpaceDlg.ui" line="108"/>
<source>Cancel</source> <source>Cancel</source>
<translation></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/WorkSpace/WorkSpaceDlg.cpp" line="26"/> <location filename="../ui/WorkSpace/WorkSpaceDlg.cpp" line="26"/>
<source>new workspace</source> <source>new workspace</source>
<translation></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/WorkSpace/WorkSpaceDlg.cpp" line="49"/> <location filename="../ui/WorkSpace/WorkSpaceDlg.cpp" line="49"/>
@ -1764,47 +1740,47 @@
<location filename="../ui/WorkSpace/WorkSpaceDlg.cpp" line="88"/> <location filename="../ui/WorkSpace/WorkSpaceDlg.cpp" line="88"/>
<location filename="../ui/WorkSpace/WorkSpaceDlg.cpp" line="98"/> <location filename="../ui/WorkSpace/WorkSpaceDlg.cpp" line="98"/>
<source>warning</source> <source>warning</source>
<translation></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/WorkSpace/WorkSpaceDlg.cpp" line="49"/> <location filename="../ui/WorkSpace/WorkSpaceDlg.cpp" line="49"/>
<source>name or save path is empty, please check it</source> <source>name or save path is empty, please check it</source>
<translation></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/WorkSpace/WorkSpaceDlg.cpp" line="55"/> <location filename="../ui/WorkSpace/WorkSpaceDlg.cpp" line="55"/>
<source>save current workspace?</source> <source>save current workspace?</source>
<translation></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/WorkSpace/WorkSpaceDlg.cpp" line="66"/> <location filename="../ui/WorkSpace/WorkSpaceDlg.cpp" line="66"/>
<source>current path is contains current folder, do you want to overwrite it?</source> <source>current path is contains current folder, do you want to overwrite it?</source>
<translation></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/WorkSpace/WorkSpaceDlg.cpp" line="73"/> <location filename="../ui/WorkSpace/WorkSpaceDlg.cpp" line="73"/>
<source>removeRecursively failed</source> <source>removeRecursively failed</source>
<translation></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/WorkSpace/WorkSpaceDlg.cpp" line="82"/> <location filename="../ui/WorkSpace/WorkSpaceDlg.cpp" line="82"/>
<source>mkpath failed</source> <source>mkpath failed</source>
<translation></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/WorkSpace/WorkSpaceDlg.cpp" line="88"/> <location filename="../ui/WorkSpace/WorkSpaceDlg.cpp" line="88"/>
<source>name is exits</source> <source>name is exits</source>
<translation></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/WorkSpace/WorkSpaceDlg.cpp" line="98"/> <location filename="../ui/WorkSpace/WorkSpaceDlg.cpp" line="98"/>
<source>create workSpace failed</source> <source>create workSpace failed</source>
<translation></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/WorkSpace/WorkSpaceDlg.cpp" line="108"/> <location filename="../ui/WorkSpace/WorkSpaceDlg.cpp" line="107"/>
<source>save spaceWork directory</source> <source>save spaceWork directory</source>
<translation></translation> <translation type="unfinished"></translation>
</message> </message>
</context> </context>
<context> <context>

View File

@ -99,7 +99,6 @@ void WorkSpaceDlg::OnSure() {
return; return;
} }
emit WorkSpaceManager::Get().WorkSpaceChanged(workSpace);
WorkSpaceManager::Get().SetCurrent(workSpace); WorkSpaceManager::Get().SetCurrent(workSpace);
accept(); accept();
} }

View File

@ -3,6 +3,7 @@
#include <sstream> #include <sstream>
#include <string> #include <string>
#include <iomanip> #include <iomanip>
#include <vector>
#include "common/SpdLogger.h" #include "common/SpdLogger.h"
@ -32,3 +33,54 @@ std::string StringUtils::Vec4ToString(const osg::Vec4& value) {
<< value.x() << "," << value.y() << "," << value.z() << "," << value.w(); << value.x() << "," << value.y() << "," << value.z() << "," << value.w();
return oss.str(); return oss.str();
} }
osgEarth::Viewpoint StringUtils::StringToViewpoint(const std::string& name, const std::string& value) {
std::stringstream ss(value);
std::vector<double> values;
double v;
while (ss >> v) {
values.push_back(v);
if (ss.peek() == ',') {
ss.ignore();
}
}
if (values.size() != 6) {
return osgEarth::Viewpoint(name.c_str(), 120.000000, 25.000000, 100.000000, -2.500000, -90.000000, 8200000.000000);
}
double longitude = values[0];
double latitude = values[1];
double altitude = values[2];
double heading = values[3];
double pitch = values[4];
double range = values[5];
osgEarth::Viewpoint viewpoint(name.c_str(), longitude, latitude, altitude, heading, pitch, range);
return viewpoint;
}
std::string StringUtils::ViewpointToString(const osgEarth::Viewpoint& value) {
const auto& location = value.focalPoint();
double longitude = location->x();
double latitude = location->y();
double altitude = location->z();
double heading = value.heading().get();
double pitch = value.pitch().get();
double range = value.range().get();
std::stringstream ss;
ss << std::fixed << std::setprecision(6);
ss << longitude << ", "
<< latitude << ", "
<< altitude << ", "
<< heading << ", "
<< pitch << ", "
<< range;
return ss.str();
}

View File

@ -4,6 +4,7 @@
#include <osg/Vec3> #include <osg/Vec3>
#include <osg/Vec4> #include <osg/Vec4>
#include <osgEarth/Viewpoint>
class StringUtils { class StringUtils {
public: public:
@ -11,4 +12,6 @@ public:
static std::string Vec3ToString(const osg::Vec3& value); static std::string Vec3ToString(const osg::Vec3& value);
static osg::Vec4 StringToVec4(const char* value); static osg::Vec4 StringToVec4(const char* value);
static std::string Vec4ToString(const osg::Vec4& value); static std::string Vec4ToString(const osg::Vec4& value);
static osgEarth::Viewpoint StringToViewpoint(const std::string& name, const std::string& value);
static std::string ViewpointToString(const osgEarth::Viewpoint& value);
}; };

View File

@ -78,8 +78,26 @@ void QtOsgViewWidget::Initialize(void) {
osgEarth::Util::EarthManipulator* manipulator = new osgEarth::Util::EarthManipulator; osgEarth::Util::EarthManipulator* manipulator = new osgEarth::Util::EarthManipulator;
osgEarth::Viewpoint vp("home", 107.85, 32.35, 100.0, -2.50, -90.0, 1.5e7); connect(&WorkSpaceManager::Get(), &WorkSpaceManager::WorkSpaceChanged, [](WorkSpace* workspace) {
manipulator->setHomeViewpoint(vp, 3.0); LOG_INFO("WorkSpaceChanged");
if (nullptr == workspace) {
return;
}
OsgCameraManipulator* manipulator = OsgViewer::Get().GetView()->GetCameraManipulator();
if (nullptr == manipulator) {
LOG_WARN("manipulator is nullptr");
return;
}
osgGA::CameraManipulator* gaManipulator = manipulator->GetManipulator();
osgEarth::Util::EarthManipulator* ccm = dynamic_cast<osgEarth::Util::EarthManipulator*>(gaManipulator);
if (nullptr == ccm) {
LOG_WARN("ccm is nullptr");
return;
}
ccm->setViewpoint(workspace->GetHomeViewpoint(), 3.0);
}
);
OsgCameraManipulator* cameraManipulator = new OsgCameraManipulator(manipulator, this); OsgCameraManipulator* cameraManipulator = new OsgCameraManipulator(manipulator, this);

View File

@ -23,12 +23,14 @@ Q_DECLARE_METATYPE(WorkSpace*)
WorkSpace::WorkSpace(QObject* parent) noexcept WorkSpace::WorkSpace(QObject* parent) noexcept
: QObject(parent) { : QObject(parent) {
uuid_ = QUuid::createUuid().toString(); uuid_ = QUuid::createUuid().toString();
homeViewpoint_ = osgEarth::Viewpoint("home", 120.000000, 25.000000, 100.000000, -2.500000, -90.000000, 8200000.000000);
} }
WorkSpace::WorkSpace(const QString& path, QObject* parent) WorkSpace::WorkSpace(const QString& path, QObject* parent)
: QObject(parent) : QObject(parent)
, path_(path){ , path_(path){
uuid_ = QUuid::createUuid().toString(); uuid_ = QUuid::createUuid().toString();
homeViewpoint_ = osgEarth::Viewpoint("home", 120.000000, 25.000000, 100.000000, -2.500000, -90.000000, 8200000.000000);
} }
const QString WorkSpace::GetDir() const { const QString WorkSpace::GetDir() const {

View File

@ -3,6 +3,8 @@
#include <map> #include <map>
#include <QObject> #include <QObject>
#include <osgEarth/Viewpoint>
#include "scene/OsgScene.h" #include "scene/OsgScene.h"
#include "scene/OEScene.h" #include "scene/OEScene.h"
#include "config.h" #include "config.h"
@ -44,6 +46,13 @@ public:
inline const QString& GetDescribe() const { inline const QString& GetDescribe() const {
return describe_; return describe_;
} }
inline void SetHomeViewpoint(const osgEarth::Viewpoint& viewpoint) {
homeViewpoint_ = viewpoint;
}
inline const osgEarth::Viewpoint& GetHomeViewpoint() const {
return homeViewpoint_;
}
const std::vector<class Entity*>& GetEntities() const { const std::vector<class Entity*>& GetEntities() const {
return entities_; return entities_;
} }
@ -98,6 +107,7 @@ private:
QString uuid_; QString uuid_;
QString describe_; QString describe_;
QString path_; QString path_;
osgEarth::Viewpoint homeViewpoint_;
bool leaded_{ false }; bool leaded_{ false };
std::vector<class Entity*> entities_; std::vector<class Entity*> entities_;

View File

@ -4,7 +4,8 @@
#include "entities/EntitiesManager.h" #include "entities/EntitiesManager.h"
#include "common/SpdLogger.h" #include "common/SpdLogger.h"
#include "WorkSpaceManager.h" #include "workspace/WorkSpaceManager.h"
#include "utils/StringUtils.h"
WorkSpaceXMLParse::WorkSpaceXMLParse(WorkSpace* workspace, QObject* parent) noexcept WorkSpaceXMLParse::WorkSpaceXMLParse(WorkSpace* workspace, QObject* parent) noexcept
: QObject(parent) : QObject(parent)
@ -22,25 +23,35 @@ bool WorkSpaceXMLParse::ParseScene(const tinyxml2::XMLElement* element) {
return false; return false;
} }
const char* eleName = element->Name(); const tinyxml2::XMLAttribute* current = element->FirstAttribute();
if (0 == strcmp(eleName, "scene")) { bool flag = false;
const char* name = element->Attribute("name"); while (nullptr != current) {
const char* eleName = current->Name();
if (0 == strcmp(eleName, "name")) {
const char* name = current->Value();
workSpace_->SetName(name); workSpace_->SetName(name);
return true; flag = true;
} else if (0 == strcmp(eleName, "describe")) {
const char* value = element->Attribute("describe");
workSpace_->SetDescribe(value); } else if (0 == strcmp(eleName, "describe")) {
return true; const char* value = current->Value();
} else if (0 == strcmp(eleName, "uuid")) {
const char* value = element->Attribute("uuid");
workSpace_->SetUUid(value); workSpace_->SetDescribe(value);
return true; flag = true;
} else if (0 == strcmp(eleName, "uuid")) {
const char* value = current->Value();
workSpace_->SetUUid(value);
flag = true;
} else if (0 == strcmp(eleName, "viewpoint")) {
const char* value = current->Value();
workSpace_->SetHomeViewpoint(StringUtils::StringToViewpoint("home", value));
flag = true;
}
current = current->Next();
} }
LOG_WARN("element not has name");
return false; return flag;
} }
bool WorkSpaceXMLParse::ParseTimestep(const tinyxml2::XMLElement* element) { bool WorkSpaceXMLParse::ParseTimestep(const tinyxml2::XMLElement* element) {
@ -216,18 +227,6 @@ bool WorkSpaceXMLParse::Load(const QString& dyt) {
else if (0 == strcmp(name, "ReportInfo")) { else if (0 == strcmp(name, "ReportInfo")) {
ParseReport(xmlElement); ParseReport(xmlElement);
} }
else {
/* Control* control = CreateControl(name);
if (nullptr == control) {
continue;
}
if (!control_) {
Attach(control);
}
control->Serialize(xmlElement);*/
}
xmlElement = xmlElement->NextSiblingElement(); xmlElement = xmlElement->NextSiblingElement();
} }

View File

@ -7,8 +7,9 @@
#include "workspace/LampStatus.h" #include "workspace/LampStatus.h"
#include "common/SpdLogger.h" #include "common/SpdLogger.h"
#include "utils/StringUtils.h"
#include "WorkSpaceManager.h" #include "workspace/WorkSpaceManager.h"
WorkSpaceXMLWrite::WorkSpaceXMLWrite(WorkSpace* workspace, QObject* parent) noexcept WorkSpaceXMLWrite::WorkSpaceXMLWrite(WorkSpace* workspace, QObject* parent) noexcept
: QObject(parent) : QObject(parent)
@ -53,6 +54,7 @@ bool WorkSpaceXMLWrite::SaveScene(tinyxml2::XMLElement* scene) {
scene->SetAttribute("name", name.toStdString().c_str()); scene->SetAttribute("name", name.toStdString().c_str());
scene->SetAttribute("describe", workSpace_->GetDescribe().toStdString().c_str()); scene->SetAttribute("describe", workSpace_->GetDescribe().toStdString().c_str());
scene->SetAttribute("uuid", workSpace_->GetUUid().toStdString().c_str()); scene->SetAttribute("uuid", workSpace_->GetUUid().toStdString().c_str());
scene->SetAttribute("viewpoint", StringUtils::ViewpointToString(workSpace_->GetHomeViewpoint()).c_str());
return true; return true;
} }