PM/DYTSrouce
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

modify translations and conewavecomponet bug and ui

Browse Source
This commit is contained in:
jiegeaiai 2025-01-08 02:37:28 +08:00
parent 4e0dd5639e
commit 479e4ea28b
18 changed files with 159 additions and 1748 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/CMakeLists.txt
View File

@ -103,7 +103,7 @@ INCLUDE_DIRECTORIES(
if(MSVC) if(MSVC)
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Zi /Od") set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Zi") #/Od
set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /DEBUG /OPT:REF /OPT:ICF") set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /DEBUG /OPT:REF /OPT:ICF")
foreach(var foreach(var
@ -183,7 +183,7 @@ endif()
SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${ProjectDIR}/bin) SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${ProjectDIR}/bin)
TARGET_LINK_LIBRARIES(${PROJECT_NAME}) TARGET_LINK_LIBRARIES(${PROJECT_NAME})
SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SUBSYSTEM:CONSOLE") #SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SUBSYSTEM:CONSOLE")
add_custom_command(TARGET ${PROJECT_NAME} add_custom_command(TARGET ${PROJECT_NAME}
POST_BUILD POST_BUILD

4
src/entities/ConeWaveComponent.cpp
View File

@ -43,9 +43,9 @@ bool ConeWaveComponent::SetAttribute(const char* name, const char* value) {
} else if (0 == strcmp("event", name)) { } else if (0 == strcmp("event", name)) {
SetTimeAction(value); SetTimeAction(value);
} else if (0 == strcmp("levelCount", name)) { } else if (0 == strcmp("levelCount", name)) {
SetHeight(atof(value)); SetLevelCount(atof(value));
} else if (0 == strcmp("levelHeihgt", name)) { } else if (0 == strcmp("levelHeihgt", name)) {
SetTimeAction(value); SetLevelHeight(atof(value));
} }
return SceneComponent::SetAttribute(name, value); return SceneComponent::SetAttribute(name, value);

6
src/entities/SceneComponent.cpp
View File

@ -172,8 +172,10 @@ void SceneComponent::AttachParent(SceneComponent* parent) {
LOG_INFO("parent is nullptr"); LOG_INFO("parent is nullptr");
return; return;
} }
parent_ = parent; if (parent_ != parent) {
parent->children_.push_back(this); parent_ = parent;
parent->children_.push_back(this);
}
AttachEntity(parent->GetEntity()); AttachEntity(parent->GetEntity());
if (nullptr != mt_ && nullptr != parent->mt_) { if (nullptr != mt_ && nullptr != parent->mt_) {

2
src/main.cpp
View File

@ -9,9 +9,7 @@
int main(int argc, char* argv[]) { int main(int argc, char* argv[]) {
SpdLogger logger("logs/log.txt", 5); SpdLogger logger("logs/log.txt", 5);
#if (QT_VERSION >= QT_VERSION_CHECK(5,6,0))
Application::setAttribute(Qt::AA_EnableHighDpiScaling); Application::setAttribute(Qt::AA_EnableHighDpiScaling);
#endif
Application app(argc, argv); Application app(argc, argv);
app.setAttribute(Qt::AA_DontCreateNativeWidgetSiblings); app.setAttribute(Qt::AA_DontCreateNativeWidgetSiblings);

7
src/scene/TritonContext.cpp
View File

@ -22,6 +22,7 @@
#include <osgDB/FileNameUtils> #include <osgDB/FileNameUtils>
#include <osgEarth/SpatialReference> #include <osgEarth/SpatialReference>
#include <cstdlib> #include <cstdlib>
#include <QApplication>
#define LC "[TritonContext] " #define LC "[TritonContext] "
@ -97,6 +98,12 @@ TritonContext::initialize(osg::RenderInfo& renderInfo)
resourcePath = osgDB::concatPaths(::getenv("TRITON_PATH"), "Resources"); resourcePath = osgDB::concatPaths(::getenv("TRITON_PATH"), "Resources");
} }
if ( resourcePath.empty() )
{
const QString dir = QString("%1/TritonResources").arg(QApplication::applicationDirPath());
resourcePath = dir.toStdString();
}
_resourceLoader = new ::Triton::ResourceLoader(resourcePath.c_str()); _resourceLoader = new ::Triton::ResourceLoader(resourcePath.c_str());
_environment = new ::Triton::Environment(); _environment = new ::Triton::Environment();

2
src/scene/TritonIntersections.cpp
View File

@ -22,7 +22,7 @@ using namespace osgEarth;
using namespace osgEarth::Triton; using namespace osgEarth::Triton;
TritonIntersections::TritonIntersections() : TritonIntersections::TritonIntersections() :
_maxRange(2.0, Units::KILOMETERS) _maxRange(1.0, Units::KILOMETERS)
{ {
} }

4
src/scene/TritonLayer.cpp
View File

@ -116,7 +116,7 @@ namespace osgEarth { namespace Triton
// Place in the depth-sorted bin and set a rendering order. // Place in the depth-sorted bin and set a rendering order.
// We want Triton to render after the terrain. // We want Triton to render after the terrain.
_drawable->getOrCreateStateSet()->setRenderBinDetails( _drawable->getOrCreateStateSet()->setRenderBinDetails(
_tritonLayer->getRenderBinNumber(), _tritonLayer->getRenderBinNumber(),
"DepthSortedBin"); "DepthSortedBin");
// Install a vdatum for sea level calculations: // Install a vdatum for sea level calculations:
@ -187,7 +187,7 @@ namespace osgEarth { namespace Triton
// Make sure it's in range so as not to waste cycles: // Make sure it's in range so as not to waste cycles:
osg::Vec3d anchor = osg::Vec3d(0,0,0) * local2world; osg::Vec3d anchor = osg::Vec3d(0,0,0) * local2world;
double m = ir->getMaxRange().as(Units::METERS); double m = ir->getMaxRange().as(Units::METERS);
if ((eye-anchor).length2() > (m*m)) if ((eye-anchor).length2() > (m))
{ {
continue; continue;
} }

BIN
src/translations/Dyt_zh_CN.bak.qm
View File

Binary file not shown.

BIN
src/translations/Dyt_zh_CN.qm
View File

Binary file not shown.

202
src/translations/Dyt_zh_CN.ts
View File

@ -97,7 +97,7 @@
<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>
</context> </context>
<context> <context>
@ -199,7 +199,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"/>
@ -361,17 +361,17 @@
<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 type="unfinished"></translation> <translation>新建空间</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 type="unfinished"></translation> <translation>打开空间</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 type="unfinished"></translation> <translation>保存空间</translation>
</message> </message>
<message> <message>
<location filename="../ui/Menu/FileManagerMenu.cpp" line="44"/> <location filename="../ui/Menu/FileManagerMenu.cpp" line="44"/>
@ -382,7 +382,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 type="unfinished"></translation> <translation>打开空间文件</translation>
</message> </message>
<message> <message>
<location filename="../ui/Menu/FileManagerMenu.cpp" line="48"/> <location filename="../ui/Menu/FileManagerMenu.cpp" line="48"/>
@ -393,7 +393,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 type="unfinished"></translation> <translation>保存空间文件</translation>
</message> </message>
</context> </context>
<context> <context>
@ -458,27 +458,27 @@
<message> <message>
<location filename="../ui/MainFrame.cpp" line="40"/> <location filename="../ui/MainFrame.cpp" line="40"/>
<source>Dyt</source> <source>Dyt</source>
<translation type="unfinished"></translation> <translation>Dyt</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 type="unfinished"></translation> <translation>文件管理</translation>
</message> </message>
<message> <message>
<location filename="../ui/MainFrame.cpp" line="106"/> <location filename="../ui/MainFrame.cpp" line="105"/>
<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>
<location filename="../ui/MainFrame.cpp" line="112"/>
<source>simu manager</source> <source>simu manager</source>
<translation type="unfinished"></translation> <translation>仿真管理</translation>
</message>
<message>
<location filename="../ui/MainFrame.cpp" line="108"/>
<source>play manager</source>
<translation>回放管理</translation>
</message>
<message>
<location filename="../ui/MainFrame.cpp" line="111"/>
<source>system manager</source>
<translation>系统管理</translation>
</message> </message>
</context> </context>
<context> <context>
@ -491,7 +491,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"/>
@ -553,7 +553,7 @@
<location filename="../ui/MainWindow.cpp" line="146"/> <location filename="../ui/MainWindow.cpp" line="146"/>
<location filename="../ui/MainWindow.cpp" line="171"/> <location filename="../ui/MainWindow.cpp" line="171"/>
<source>attribute</source> <source>attribute</source>
<translation type="unfinished"></translation> <translation type="unfinished">属性</translation>
</message> </message>
<message> <message>
<location filename="../ui/MainWindow.cpp" line="146"/> <location filename="../ui/MainWindow.cpp" line="146"/>
@ -640,7 +640,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 type="unfinished"></translation> <translation>实体</translation>
</message> </message>
</context> </context>
<context> <context>
@ -650,23 +650,13 @@
<source>ModelBrowserPannal</source> <source>ModelBrowserPannal</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<location filename="../ui/ModelBrowser/ModelBrowserPannal.ui" line="27"/>
<source>新建列</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/ModelBrowser/ModelBrowserPannal.ui" line="32"/>
<source>新建项目</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>ModelTreeWidget</name> <name>ModelTreeWidget</name>
<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 type="unfinished"></translation> <translation>取消关注</translation>
</message> </message>
<message> <message>
<location filename="../ui/ModelBrowser/ModelTreeWidget.cpp" line="115"/> <location filename="../ui/ModelBrowser/ModelTreeWidget.cpp" line="115"/>
@ -701,7 +691,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 type="unfinished"></translation> <translation>关注</translation>
</message> </message>
<message> <message>
<location filename="../ui/ModelBrowser/ModelTreeWidget.cpp" line="260"/> <location filename="../ui/ModelBrowser/ModelTreeWidget.cpp" line="260"/>
@ -716,7 +706,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 type="unfinished"></translation> <translation>删除</translation>
</message> </message>
</context> </context>
<context> <context>
@ -740,12 +730,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 type="unfinished"></translation> <translation>播放</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 type="unfinished"></translation> <translation>停止</translation>
</message> </message>
<message> <message>
<location filename="../ui/Menu/PlayManagerMenu.ui" line="55"/> <location filename="../ui/Menu/PlayManagerMenu.ui" line="55"/>
@ -765,12 +755,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 type="unfinished"></translation> <translation>加速</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 type="unfinished"></translation> <translation>减速</translation>
</message> </message>
<message> <message>
<location filename="../ui/Menu/PlayManagerMenu.cpp" line="34"/> <location filename="../ui/Menu/PlayManagerMenu.cpp" line="34"/>
@ -782,7 +772,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 type="unfinished"></translation> <translation>询问</translation>
</message> </message>
<message> <message>
<location filename="../ui/Menu/PlayManagerMenu.cpp" line="34"/> <location filename="../ui/Menu/PlayManagerMenu.cpp" line="34"/>
@ -794,14 +784,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 type="unfinished"></translation> <translation>未找到对应的空间</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 type="unfinished"></translation> <translation>暂停</translation>
</message> </message>
</context> </context>
<context> <context>
@ -809,7 +799,7 @@
<message> <message>
<location filename="../ui/PropertyBrowser.cpp" line="40"/> <location filename="../ui/PropertyBrowser.cpp" line="40"/>
<source>attribute</source> <source>attribute</source>
<translation type="unfinished"></translation> <translation>属性</translation>
</message> </message>
<message> <message>
<location filename="../ui/PropertyBrowser.cpp" line="55"/> <location filename="../ui/PropertyBrowser.cpp" line="55"/>
@ -839,7 +829,7 @@
<message> <message>
<location filename="../ui/PropertyBrowser/qtpropertybrowserutils.cpp" line="739"/> <location filename="../ui/PropertyBrowser/qtpropertybrowserutils.cpp" line="739"/>
<source>Open File</source> <source>Open File</source>
<translation type="unfinished"></translation> <translation>选择文件</translation>
</message> </message>
<message> <message>
<location filename="../ui/PropertyBrowser/qtpropertybrowserutils.cpp" line="739"/> <location filename="../ui/PropertyBrowser/qtpropertybrowserutils.cpp" line="739"/>
@ -852,7 +842,7 @@
<message> <message>
<location filename="../ui/PropertyBrowser/qtpropertybrowserutils.cpp" line="815"/> <location filename="../ui/PropertyBrowser/qtpropertybrowserutils.cpp" line="815"/>
<source>Open File</source> <source>Open File</source>
<translation type="unfinished"></translation> <translation>选择文件</translation>
</message> </message>
<message> <message>
<location filename="../ui/PropertyBrowser/qtpropertybrowserutils.cpp" line="815"/> <location filename="../ui/PropertyBrowser/qtpropertybrowserutils.cpp" line="815"/>
@ -865,17 +855,17 @@
<message> <message>
<location filename="../common/CrashHandler.cpp" line="69"/> <location filename="../common/CrashHandler.cpp" line="69"/>
<source>error</source> <source>error</source>
<translation type="unfinished"></translation> <translation>错误</translation>
</message> </message>
<message> <message>
<location filename="../common/CrashHandler.cpp" line="70"/> <location filename="../common/CrashHandler.cpp" line="70"/>
<source>the appliaction is crash</source> <source>the appliaction is crash</source>
<translation type="unfinished"></translation> <translation>程序出现了问题</translation>
</message> </message>
<message> <message>
<location filename="../ui/AdvDock/DockAreaTitleBar.cpp" line="158"/> <location filename="../ui/AdvDock/DockAreaTitleBar.cpp" line="158"/>
<source>List all tabs</source> <source>List all tabs</source>
<translation type="unfinished"></translation> <translation>所有标签</translation>
</message> </message>
<message> <message>
<location filename="../ui/AdvDock/DockAreaTitleBar.cpp" line="171"/> <location filename="../ui/AdvDock/DockAreaTitleBar.cpp" line="171"/>
@ -940,7 +930,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>
@ -1142,7 +1132,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>
@ -1150,7 +1140,7 @@
<message> <message>
<location filename="../ui/PropertyBrowser/qtpropertymanager.cpp" line="8308"/> <location filename="../ui/PropertyBrowser/qtpropertymanager.cpp" line="8308"/>
<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="8315"/> <location filename="../ui/PropertyBrowser/qtpropertymanager.cpp" line="8315"/>
@ -1163,7 +1153,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"/>
@ -1251,7 +1241,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"/>
@ -1272,14 +1262,20 @@
<context> <context>
<name>QtOsgViewWidget</name> <name>QtOsgViewWidget</name>
<message> <message>
<location filename="../viewer/QtOsgViewWidget.cpp" line="128"/> <location filename="../viewer/QtOsgViewWidget.cpp" line="123"/>
<source>notify</source> <location filename="../viewer/QtOsgViewWidget.cpp" line="131"/>
<translation type="unfinished"></translation> <source>warning</source>
<translation>警告</translation>
</message> </message>
<message> <message>
<location filename="../viewer/QtOsgViewWidget.cpp" line="128"/> <location filename="../viewer/QtOsgViewWidget.cpp" line="123"/>
<source>default workspace failed</source>
<translation>加载默认空间失败</translation>
</message>
<message>
<location filename="../viewer/QtOsgViewWidget.cpp" line="131"/>
<source>open dyt file failed</source> <source>open dyt file failed</source>
<translation type="unfinished"></translation> <translation>打开空间文件失败</translation>
</message> </message>
</context> </context>
<context> <context>
@ -1293,7 +1289,7 @@
<message> <message>
<location filename="../ui/PropertyBrowser/qtpropertymanager.cpp" line="8663"/> <location filename="../ui/PropertyBrowser/qtpropertymanager.cpp" line="8663"/>
<source>Path</source> <source>Path</source>
<translation type="unfinished"></translation> <translation type="unfinished">路径</translation>
</message> </message>
</context> </context>
<context> <context>
@ -1486,7 +1482,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>
@ -1543,7 +1539,7 @@
<message> <message>
<location filename="../ui/PropertyBrowser/qtpropertymanager.cpp" line="8039"/> <location filename="../ui/PropertyBrowser/qtpropertymanager.cpp" line="8039"/>
<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="8046"/> <location filename="../ui/PropertyBrowser/qtpropertymanager.cpp" line="8046"/>
@ -1604,7 +1600,7 @@
<message> <message>
<location filename="../ui/Menu/SimuRunMenu.ui" line="16"/> <location filename="../ui/Menu/SimuRunMenu.ui" line="16"/>
<source>SimuRunMenu</source> <source>SimuRunMenu</source>
<translation type="unfinished"></translation> <translation>运行</translation>
</message> </message>
</context> </context>
<context> <context>
@ -1630,22 +1626,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 type="unfinished"></translation> <translation>退出</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 type="unfinished"></translation> <translation>ui设置</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 type="unfinished"></translation> <translation>询问</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 type="unfinished"></translation> <translation>确定退出</translation>
</message> </message>
</context> </context>
<context> <context>
@ -1704,103 +1700,103 @@
<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 type="unfinished"></translation> <translation>新建空间</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 type="unfinished"></translation> <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 type="unfinished"></translation> <translation>输入空间名称</translation>
</message> </message>
<message> <message>
<location filename="../ui/WorkSpace/WorkSpaceDlg.ui" line="43"/> <location filename="../ui/WorkSpace/WorkSpaceDlg.ui" line="43"/>
<source>Path</source> <source>Path</source>
<translation type="unfinished"></translation> <translation>路径</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 type="unfinished"></translation> <translation>选择空间保存路径</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 type="unfinished"></translation> <translation>...</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 type="unfinished"></translation> <translation>描述</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 type="unfinished"></translation> <translation>确定</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 type="unfinished"></translation> <translation>取消</translation>
</message> </message>
<message> <message>
<location filename="../ui/WorkSpace/WorkSpaceDlg.cpp" line="26"/> <location filename="../ui/WorkSpace/WorkSpaceDlg.cpp" line="27"/>
<source>new workspace</source> <source>new workspace</source>
<translation type="unfinished"></translation> <translation>新建空间</translation>
</message> </message>
<message> <message>
<location filename="../ui/WorkSpace/WorkSpaceDlg.cpp" line="49"/> <location filename="../ui/WorkSpace/WorkSpaceDlg.cpp" line="52"/>
<location filename="../ui/WorkSpace/WorkSpaceDlg.cpp" line="55"/> <location filename="../ui/WorkSpace/WorkSpaceDlg.cpp" line="58"/>
<location filename="../ui/WorkSpace/WorkSpaceDlg.cpp" line="66"/> <location filename="../ui/WorkSpace/WorkSpaceDlg.cpp" line="68"/>
<location filename="../ui/WorkSpace/WorkSpaceDlg.cpp" line="73"/> <location filename="../ui/WorkSpace/WorkSpaceDlg.cpp" line="75"/>
<location filename="../ui/WorkSpace/WorkSpaceDlg.cpp" line="82"/> <location filename="../ui/WorkSpace/WorkSpaceDlg.cpp" line="84"/>
<location filename="../ui/WorkSpace/WorkSpaceDlg.cpp" line="88"/> <location filename="../ui/WorkSpace/WorkSpaceDlg.cpp" line="90"/>
<location filename="../ui/WorkSpace/WorkSpaceDlg.cpp" line="98"/> <location filename="../ui/WorkSpace/WorkSpaceDlg.cpp" line="100"/>
<source>warning</source> <source>warning</source>
<translation type="unfinished"></translation> <translation>警告</translation>
</message> </message>
<message> <message>
<location filename="../ui/WorkSpace/WorkSpaceDlg.cpp" line="49"/> <location filename="../ui/WorkSpace/WorkSpaceDlg.cpp" line="52"/>
<source>name or save path is empty, please check it</source> <source>name or save path is empty, please check it</source>
<translation type="unfinished"></translation> <translation>当前空间已经存在，请确认</translation>
</message> </message>
<message> <message>
<location filename="../ui/WorkSpace/WorkSpaceDlg.cpp" line="55"/> <location filename="../ui/WorkSpace/WorkSpaceDlg.cpp" line="58"/>
<source>save current workspace?</source> <source>save current workspace?</source>
<translation type="unfinished"></translation> <translation>保存当前空间？</translation>
</message> </message>
<message> <message>
<location filename="../ui/WorkSpace/WorkSpaceDlg.cpp" line="66"/> <location filename="../ui/WorkSpace/WorkSpaceDlg.cpp" line="68"/>
<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 type="unfinished"></translation> <translation>当前空间已经存在，是否覆盖当前空间？</translation>
</message> </message>
<message> <message>
<location filename="../ui/WorkSpace/WorkSpaceDlg.cpp" line="73"/> <location filename="../ui/WorkSpace/WorkSpaceDlg.cpp" line="75"/>
<source>removeRecursively failed</source> <source>removeRecursively failed</source>
<translation type="unfinished"></translation> <translation>删除失败</translation>
</message> </message>
<message> <message>
<location filename="../ui/WorkSpace/WorkSpaceDlg.cpp" line="82"/> <location filename="../ui/WorkSpace/WorkSpaceDlg.cpp" line="84"/>
<source>mkpath failed</source> <source>mkpath failed</source>
<translation type="unfinished"></translation> <translation>创建空间失败</translation>
</message> </message>
<message> <message>
<location filename="../ui/WorkSpace/WorkSpaceDlg.cpp" line="88"/> <location filename="../ui/WorkSpace/WorkSpaceDlg.cpp" line="90"/>
<source>name is exits</source> <source>name is exits</source>
<translation type="unfinished"></translation> <translation>空间已经存在</translation>
</message> </message>
<message> <message>
<location filename="../ui/WorkSpace/WorkSpaceDlg.cpp" line="98"/> <location filename="../ui/WorkSpace/WorkSpaceDlg.cpp" line="100"/>
<source>create workSpace failed</source> <source>create workSpace failed</source>
<translation type="unfinished"></translation> <translation>创建空间失败</translation>
</message> </message>
<message> <message>
<location filename="../ui/WorkSpace/WorkSpaceDlg.cpp" line="107"/> <location filename="../ui/WorkSpace/WorkSpaceDlg.cpp" line="111"/>
<source>save spaceWork directory</source> <source>save spaceWork directory</source>
<translation type="unfinished"></translation> <translation>保存空间路径</translation>
</message> </message>
</context> </context>
<context> <context>

1608
src/translations/Dyt_zh_CN_.ts
View File

File diff suppressed because it is too large Load Diff

9
src/ui/MainFrame.cpp
View File

@ -101,15 +101,14 @@ void MainFrame::InitUI() {
//AddMenuWidget("view_manager", tr("view manager"), new ViewManagerMenu(this)); //AddMenuWidget("view_manager", tr("view manager"), new ViewManagerMenu(this));
//AddMenuWidget("plan_manager", tr("plan manager"), new PlanManagerMenu(this)); //AddMenuWidget("plan_manager", tr("plan manager"), new PlanManagerMenu(this));
//AddMenuWidget("dynamic_display", tr("dynamic display"), new DynamicDisplayMenu(this)); //AddMenuWidget("dynamic_display", tr("dynamic display"), new DynamicDisplayMenu(this));
ChartPlotMenu* chartMenu = new ChartPlotMenu(this);
SystemManagerMenu* system_ = new SystemManagerMenu(this); AddMenuWidget("simu_manager", tr("simu manager"), chartMenu);
AddMenuWidget("system_manager", tr("system manager"), system_);
PlayManagerMenu* playMenu = new PlayManagerMenu(this); PlayManagerMenu* playMenu = new PlayManagerMenu(this);
AddMenuWidget("play_manager", tr("play manager"), playMenu); AddMenuWidget("play_manager", tr("play manager"), playMenu);
ChartPlotMenu *chartMenu = new ChartPlotMenu(this); SystemManagerMenu* system_ = new SystemManagerMenu(this);
AddMenuWidget("simu_manager", tr("simu manager"), chartMenu); AddMenuWidget("system_manager", tr("system manager"), system_);
MainWindow* mainWindow = new MainWindow(this); MainWindow* mainWindow = new MainWindow(this);
layout->addWidget(mainWindow); layout->addWidget(mainWindow);

10
src/ui/ModelBrowser/ModelBrowserPannal.ui
View File

@ -22,16 +22,6 @@
<attribute name="headerStretchLastSection"> <attribute name="headerStretchLastSection">
<bool>false</bool> <bool>false</bool>
</attribute> </attribute>
<column>
<property name="text">
<string>新建列</string>
</property>
</column>
<item>
<property name="text">
<string>新建项目</string>
</property>
</item>
</widget> </widget>
</item> </item>
</layout> </layout>

8
src/ui/WorkSpace/WorkSpaceDlg.cpp
View File

@ -5,6 +5,7 @@
#include "ui/FrameTitleBar.h" #include "ui/FrameTitleBar.h"
#include "app/Application.h"
#include "common/SpdLogger.h" #include "common/SpdLogger.h"
#include "workspace/WorkSpace.h" #include "workspace/WorkSpace.h"
#include "workspace/WorkSpaceManager.h" #include "workspace/WorkSpaceManager.h"
@ -25,6 +26,8 @@ WorkSpaceDlg::WorkSpaceDlg(QWidget* parent)
SetTitle(tr("new workspace")); SetTitle(tr("new workspace"));
const QString path = qApp->applicationDirPath() + "/workspace";
ui->lePath->setText(path);
//setFixedHeight(500); //setFixedHeight(500);
} }
@ -58,7 +61,6 @@ void WorkSpaceDlg::OnSure() {
current->Unlaod(); current->Unlaod();
} }
QString workspacePath = QString("%1/%2").arg(savePath).arg(name); QString workspacePath = QString("%1/%2").arg(savePath).arg(name);
QDir dir(workspacePath); QDir dir(workspacePath);
if (dir.exists()) { if (dir.exists()) {
@ -104,7 +106,9 @@ void WorkSpaceDlg::OnSure() {
} }
void WorkSpaceDlg::OnSelectSavePath() { void WorkSpaceDlg::OnSelectSavePath() {
const QString savePath = QFileDialog::getExistingDirectory(this, tr("save spaceWork directory")); const QString workspacePath = Application::GetWorkSpacePath();
const QString savePath = QFileDialog::getExistingDirectory(this,
tr("save spaceWork directory"), workspacePath, QFileDialog::DontResolveSymlinks);
if (savePath.isEmpty()) { if (savePath.isEmpty()) {
LOG_WARN("save path is empty"); LOG_WARN("save path is empty");
return; return;

2
src/utils/TransformPath.cpp
View File

@ -26,7 +26,7 @@ TransformPath* TransformPath::LoadFromFile(const QString& path, QObject* parent)
if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) { if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) {
LOG_WARN("Cannot open file for reading: path:{} error:{}", LOG_WARN("Cannot open file for reading: path:{} error:{}",
path.toStdString(), file.errorString().toStdString()); path.toLocal8Bit().constData(), file.errorString().toLocal8Bit().constData());
return nullptr; return nullptr;
} }

7
src/viewer/QtOsgViewWidget.cpp
View File

@ -118,14 +118,17 @@ void QtOsgViewWidget::Uninitialize(void) {
void QtOsgViewWidget::LoadDefaultScene(void) { void QtOsgViewWidget::LoadDefaultScene(void) {
dyt_check(nullptr != activeScene_); dyt_check(nullptr != activeScene_);
WorkSpaceManager::Get().LoadDefaultWorkspace(activeScene_); if (nullptr == WorkSpaceManager::Get().LoadDefaultWorkspace(activeScene_)) {
LOG_ERROR("load default workspace failed");
QMessageBox::warning(this, tr("warning"), tr("default workspace failed"));
}
} }
void QtOsgViewWidget::OnLoadDyt(const QString& path) { void QtOsgViewWidget::OnLoadDyt(const QString& path) {
LOG_INFO("load dyt path:{}", path.toStdString()); LOG_INFO("load dyt path:{}", path.toStdString());
WorkSpace* workSpace = WorkSpaceManager::Get().LoadDyt(path); WorkSpace* workSpace = WorkSpaceManager::Get().LoadDyt(path);
if (nullptr == workSpace) { if (nullptr == workSpace) {
QMessageBox::warning(&MainFrame::Get(), tr("notify"), tr("open dyt file failed"), QMessageBox::Ok); QMessageBox::warning(&MainFrame::Get(), tr("warning"), tr("open dyt file failed"), QMessageBox::Ok);
return; return;
} }

6
src/workspace/WorkSpace.cpp
View File

@ -114,10 +114,12 @@ bool WorkSpace::Load(const QString& dyt) {
LOG_INFO("dyt {} loaded", dyt.toStdString()); LOG_INFO("dyt {} loaded", dyt.toStdString());
return true; return true;
} }
LOG_INFO("dyt {} loading", dyt.toLocal8Bit().constData());
path_ = dyt;
WorkSpaceXMLParse parse(this); WorkSpaceXMLParse parse(this);
bool success = parse.Load(dyt); bool success = parse.Load(dyt);
if (success) { if (!success) {
path_ = dyt; path_ = "";
} }
leaded_ = success; leaded_ = success;
return success; return success;

26
src/workspace/WorkSpaceManager.cpp
View File

@ -2,7 +2,9 @@
#include<time.h> #include<time.h>
#include <QSettings> #include <QSettings>
#include <QFileInfo>
#include "app/Application.h"
#include "workspace/WorkSpace.h" #include "workspace/WorkSpace.h"
#include "workspace/Timestep.h" #include "workspace/Timestep.h"
#include "common/SpdLogger.h" #include "common/SpdLogger.h"
@ -31,12 +33,25 @@ WorkSpace* WorkSpaceManager::LoadDefaultWorkspace(class OEScene* secen) {
} }
QSettings settings(iniFile, QSettings::IniFormat); QSettings settings(iniFile, QSettings::IniFormat);
const QString path = settings.value("workspace/path", "").toString(); QString path = settings.value("workspace/name", "").toString();
if (path.isEmpty()) { if (path.isEmpty()) {
LOG_ERROR("default workspace path is empty"); LOG_ERROR("default workspace path is empty");
return nullptr; return nullptr;
} }
WorkSpace* workspace = LoadDyt(path); LOG_INFO("load default workspace name:{}", path.toLocal8Bit().constData());
WorkSpace* workspace = nullptr;
const QString workspaceDir = Application::GetWorkSpacePath();
QFileInfo fileInfo(path);
QString newPath = QString("%1/%2/%3").arg(workspaceDir).arg(fileInfo.baseName()).arg(fileInfo.fileName());
QFileInfo newFileInfo(newPath);
if (newFileInfo.exists()) {
workspace = LoadDyt(newPath);
} else {
newPath = QString("%1/%2").arg(workspaceDir).arg(fileInfo.fileName());
workspace = LoadDyt(newPath);
}
if (nullptr == workspace) { if (nullptr == workspace) {
LOG_ERROR("load default workspace failed"); LOG_ERROR("load default workspace failed");
return nullptr; return nullptr;
@ -60,9 +75,11 @@ void WorkSpaceManager::SaveDefaultWorkspace() {
} }
current->Save(); current->Save();
const QString path = current->GetPath(); QString path = current->GetPath();
QFileInfo fileInfo(path);
LOG_INFO("save default workspace name:{}", fileInfo.fileName().toLocal8Bit().constData());
QSettings settings(iniFile, QSettings::IniFormat); QSettings settings(iniFile, QSettings::IniFormat);
settings.setValue("workspace/path", path); settings.setValue("workspace/name", fileInfo.fileName());
} }
bool WorkSpaceManager::Contains(const QString& name) const { bool WorkSpaceManager::Contains(const QString& name) const {
@ -90,6 +107,7 @@ bool WorkSpaceManager::Remove(const QString& name) {
WorkSpace* WorkSpaceManager::LoadDyt(const QString& dyt) { WorkSpace* WorkSpaceManager::LoadDyt(const QString& dyt) {
dyt_check(nullptr != scene_); dyt_check(nullptr != scene_);
LOG_INFO("load workspace name:{}", dyt.toLocal8Bit().constData());
WorkSpace* workspace = new WorkSpace(this); WorkSpace* workspace = new WorkSpace(this);
workspace->SetActiveScene(scene_); workspace->SetActiveScene(scene_);
if (!workspace->Load(dyt)) { if (!workspace->Load(dyt)) {