Compare commits

...

2 Commits

Author SHA1 Message Date
d6aecc5183 modify scene and ui txt 2025-01-21 08:28:25 +08:00
155324ea2f modify trnas path 2025-01-21 08:27:44 +08:00
9 changed files with 96 additions and 95 deletions

View File

@ -84,7 +84,8 @@ void RecourceHelper::Init() {
#ifndef NDEBUG
const QString transName = QString("./%1_%2.qm").arg(appName, QLocale().name());
#else
const QString transName = QString("./translations/%1_%2.qm").arg(appName, QLocale().name());
const QString appDirPath = QApplication::applicationDirPath();
const QString transName = QString("%1/translations/%2_%3.qm").arg(appDirPath, appName, QLocale().name());
#endif
qDebug() << transName;
bool success = trans_.load(transName);

View File

@ -116,7 +116,8 @@ void ConeWave::CreateTexturedCone(osg::Geode* geode) {
fragmentShader->setShaderSource(fragSource);
osg::StateSet* stateset = coneDrawable_->getOrCreateStateSet();
stateset->setRenderBinDetails(120, "OSGEARTH_SCREEN_SPACE_LAYOUT_BIN");
//stateset->setRenderBinDetails(120, "OSGEARTH_SCREEN_SPACE_LAYOUT_BIN");
stateset->setRenderBinDetails(120, "RenderBin");
osg::ref_ptr<osg::BlendFunc> blendFunc = new osg::BlendFunc();
stateset->setAttributeAndModes(blendFunc, osg::StateAttribute::ON);
osg::ref_ptr<osg::Program> program = new osg::Program();

View File

@ -29,6 +29,7 @@ OEScene::OEScene() {
const std::string& basePath = RecourceHelper::Get().GetBasePath().toStdString();
pathList.push_back(basePath + "/resources/earth/");
pathList.push_back(basePath + "/resources/textures/");
root_ = new osg::Group;
}
@ -50,6 +51,17 @@ void OEScene::AttachView(OsgView* view) {
return;
}
osg::Node* rootNode = view->GetView()->getSceneData();
if (nullptr != rootNode) {
int parantCount = rootNode->getNumParents();
for (int i = 0; i < parantCount; ++i) {
rootNode->getParent(i)->removeChild(rootNode);
}
root_->addChild(rootNode);
}
view->GetView()->setSceneData(root_);
earthRootNode_ = osgDB::readNodeFile("triton.earth");
if (!earthRootNode_) {
LOG_ERROR("read earth node(triton.earth) failed");
@ -59,36 +71,18 @@ void OEScene::AttachView(OsgView* view) {
earthMapNode_ = osgEarth::MapNode::get(earthRootNode_);
LOG_INFO("earth map node get success: {}", earthMapNode_.valid());
g_srs_ = earthMapNode_->getMapSRS();
entityRoot_ = new osg::Group;
if (earthMapNode_) {
earthMapNode_->addChild(entityRoot_);
g_srs_ = earthMapNode_->getMapSRS();
dyt_check(nullptr != g_srs_);
}
root_->addChild(entityRoot_);
skyDome_ = osgEarth::SkyNode::create();
if (!earthMapNode_) {
LOG_WARN("eart map node is nullptr");
return;
}
root_->addChild(skyDome_);
skyDome_->addChild(earthMapNode_);
osg::Node* node = view->GetView()->getSceneData();
if (nullptr == node) {
LOG_INFO("view scene data is nullptr, root valid:{}", skyDome_.valid());
view->GetView()->setSceneData(skyDome_);
} else {
osg::Group* group = node->asGroup();
if (nullptr != group) {
LOG_INFO("node is group");
group->addChild(skyDome_);
} else {
LOG_INFO("node is not group");
}
}
skyDome_->attach(view->GetView());
skyDome_->setAtmosphereVisible(true);
@ -152,7 +146,7 @@ osg::ref_ptr<osg::TextureCubeMap> OEScene::LoadCubeMapTextures(const std::string
}
osg::Group* OEScene::GetData() {
return earthMapNode_;
return root_;
}

View File

@ -33,7 +33,7 @@ public:
osg::Group* GetData();
inline osg::Group* GetScene(void) {
return earthMapNode_.get();
return root_.get();
}
osgEarth::MapNode* GetMapNode(void) const {
@ -46,6 +46,7 @@ public:
OESceneUI* GetOrCreateSceneUI();
private:
osg::ref_ptr<osg::Group> root_;
osg::ref_ptr<osg::Node> earthRootNode_;
osg::ref_ptr<osgEarth::MapNode> earthMapNode_;
osg::ref_ptr<osg::Group> entityRoot_;

View File

@ -17,7 +17,7 @@ BackGroundWidget::BackGroundWidget(const std::string& name,
//osg::Image *image = ImageUtils::readImage(fileName);
LOG_INFO("setimage, {}", fileName);
setImage(fileName, true);
setImage(fileName, false);
setTexCoord(0.0f, 0.0f, osgWidget::Widget::LOWER_LEFT);
setTexCoord(1.0f, 0.0f, osgWidget::Widget::LOWER_RIGHT);

View File

@ -27,7 +27,7 @@ QueryElevationWidget::QueryElevationWidget(OEScene* oeScene)
, oeScene_(oeScene) {
LOG_INFO("actor self={}", spdlog::fmt_lib::ptr(this));
label_ = new ColorLabel("Pick me!");
label_ = new ColorLabel("");
addWidget(label_);
getBackground()->setColor(0.0f, 0.0f, 0.0f, 0.3f);
}

Binary file not shown.

View File

@ -356,7 +356,7 @@
<message>
<location filename="../ui/Menu/FileManagerMenu.ui" line="20"/>
<source>new workspace</source>
<translation type="unfinished"></translation>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/Menu/FileManagerMenu.ui" line="30"/>
@ -453,32 +453,32 @@
<message>
<location filename="../ui/MainFrame.cpp" line="42"/>
<source>Dyt</source>
<translation type="unfinished"></translation>
<translation>Dyt</translation>
</message>
<message>
<location filename="../ui/MainFrame.cpp" line="101"/>
<source>file manager</source>
<translation type="unfinished"></translation>
<translation></translation>
</message>
<message>
<location filename="../ui/MainFrame.cpp" line="107"/>
<source>simu manager</source>
<translation type="unfinished"></translation>
<translation>仿</translation>
</message>
<message>
<location filename="../ui/MainFrame.cpp" line="110"/>
<source>play manager</source>
<translation type="unfinished"></translation>
<translation></translation>
</message>
<message>
<location filename="../ui/MainFrame.cpp" line="113"/>
<source>window manager</source>
<translation type="unfinished"></translation>
<translation></translation>
</message>
<message>
<location filename="../ui/MainFrame.cpp" line="116"/>
<source>system manager</source>
<translation type="unfinished"></translation>
<translation></translation>
</message>
</context>
<context>
@ -491,12 +491,12 @@
<message>
<location filename="../ui/MainWindow.cpp" line="71"/>
<source>model elements</source>
<translation type="unfinished"></translation>
<translation></translation>
</message>
<message>
<location filename="../ui/MainWindow.cpp" line="77"/>
<source>attribte</source>
<translation type="unfinished"></translation>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/MainWindow.cpp" line="114"/>
@ -553,7 +553,7 @@
<location filename="../ui/MainWindow.cpp" line="146"/>
<location filename="../ui/MainWindow.cpp" line="171"/>
<source>attribute</source>
<translation type="unfinished"></translation>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/MainWindow.cpp" line="146"/>
@ -645,7 +645,7 @@
<message>
<location filename="../ui/ModelBrowser/ModelTreeWidget.cpp" line="96"/>
<source>Release Track</source>
<translation type="unfinished"></translation>
<translation></translation>
</message>
<message>
<location filename="../ui/ModelBrowser/ModelTreeWidget.cpp" line="113"/>
@ -680,7 +680,7 @@
<message>
<location filename="../ui/ModelBrowser/ModelTreeWidget.cpp" line="250"/>
<source>Track</source>
<translation type="unfinished"></translation>
<translation></translation>
</message>
<message>
<location filename="../ui/ModelBrowser/ModelTreeWidget.cpp" line="258"/>
@ -695,7 +695,7 @@
<message>
<location filename="../ui/ModelBrowser/ModelTreeWidget.cpp" line="269"/>
<source>Delete</source>
<translation type="unfinished"></translation>
<translation></translation>
</message>
</context>
<context>
@ -711,7 +711,7 @@
<message>
<location filename="../ui/Menu/PlayManagerMenu.ui" line="14"/>
<source>PlayManagerMenu</source>
<translation type="unfinished"></translation>
<translation></translation>
</message>
<message>
<location filename="../ui/Menu/PlayManagerMenu.ui" line="20"/>
@ -719,12 +719,12 @@
<location filename="../ui/Menu/PlayManagerMenu.cpp" line="150"/>
<location filename="../ui/Menu/PlayManagerMenu.cpp" line="157"/>
<source>play</source>
<translation type="unfinished"></translation>
<translation></translation>
</message>
<message>
<location filename="../ui/Menu/PlayManagerMenu.ui" line="27"/>
<source>stop</source>
<translation type="unfinished"></translation>
<translation></translation>
</message>
<message>
<location filename="../ui/Menu/PlayManagerMenu.ui" line="55"/>
@ -744,24 +744,16 @@
<message>
<location filename="../ui/Menu/PlayManagerMenu.ui" line="105"/>
<source>up</source>
<translation type="unfinished"></translation>
<translation></translation>
</message>
<message>
<location filename="../ui/Menu/PlayManagerMenu.ui" line="112"/>
<source>down</source>
<translation type="unfinished"></translation>
<translation></translation>
</message>
<message>
<location filename="../ui/Menu/PlayManagerMenu.cpp" line="34"/>
<location filename="../ui/Menu/PlayManagerMenu.cpp" line="41"/>
<location filename="../ui/Menu/PlayManagerMenu.cpp" line="63"/>
<location filename="../ui/Menu/PlayManagerMenu.cpp" line="70"/>
<location filename="../ui/Menu/PlayManagerMenu.cpp" line="81"/>
<location filename="../ui/Menu/PlayManagerMenu.cpp" line="88"/>
<location filename="../ui/Menu/PlayManagerMenu.cpp" line="99"/>
<location filename="../ui/Menu/PlayManagerMenu.cpp" line="106"/>
<source>question</source>
<translation type="unfinished"></translation>
<translation type="obsolete"></translation>
</message>
<message>
<location filename="../ui/Menu/PlayManagerMenu.cpp" line="34"/>
@ -773,14 +765,26 @@
<location filename="../ui/Menu/PlayManagerMenu.cpp" line="99"/>
<location filename="../ui/Menu/PlayManagerMenu.cpp" line="106"/>
<source>has not workspace</source>
<translation type="unfinished"></translation>
<translation></translation>
</message>
<message>
<location filename="../ui/Menu/PlayManagerMenu.cpp" line="34"/>
<location filename="../ui/Menu/PlayManagerMenu.cpp" line="41"/>
<location filename="../ui/Menu/PlayManagerMenu.cpp" line="63"/>
<location filename="../ui/Menu/PlayManagerMenu.cpp" line="70"/>
<location filename="../ui/Menu/PlayManagerMenu.cpp" line="81"/>
<location filename="../ui/Menu/PlayManagerMenu.cpp" line="88"/>
<location filename="../ui/Menu/PlayManagerMenu.cpp" line="99"/>
<location filename="../ui/Menu/PlayManagerMenu.cpp" line="106"/>
<source>warning</source>
<translation></translation>
</message>
<message>
<location filename="../ui/Menu/PlayManagerMenu.cpp" line="48"/>
<location filename="../ui/Menu/PlayManagerMenu.cpp" line="52"/>
<location filename="../ui/Menu/PlayManagerMenu.cpp" line="147"/>
<source>pause</source>
<translation type="unfinished"></translation>
<translation></translation>
</message>
</context>
<context>
@ -788,7 +792,7 @@
<message>
<location filename="../ui/PropertyBrowser.cpp" line="40"/>
<source>attribute</source>
<translation type="unfinished"></translation>
<translation></translation>
</message>
<message>
<location filename="../ui/PropertyBrowser.cpp" line="55"/>
@ -1134,7 +1138,7 @@
<message>
<location filename="../ui/PropertyBrowser/qtpropertymanager.cpp" line="8328"/>
<source>Name</source>
<translation type="unfinished"></translation>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/PropertyBrowser/qtpropertymanager.cpp" line="8335"/>
@ -1235,7 +1239,7 @@
<message>
<location filename="../ui/PropertyBrowser/qtpropertymanager.cpp" line="7792"/>
<source>Name</source>
<translation type="unfinished"></translation>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/PropertyBrowser/qtpropertymanager.cpp" line="7799"/>
@ -1259,7 +1263,7 @@
<location filename="../viewer/QtOsgViewWidget.cpp" line="369"/>
<location filename="../viewer/QtOsgViewWidget.cpp" line="377"/>
<source>warning</source>
<translation type="unfinished"></translation>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../viewer/QtOsgViewWidget.cpp" line="369"/>
@ -1283,7 +1287,7 @@
<message>
<location filename="../ui/PropertyBrowser/qtpropertymanager.cpp" line="8683"/>
<source>Path</source>
<translation type="unfinished"></translation>
<translation type="unfinished"></translation>
</message>
</context>
<context>
@ -1533,7 +1537,7 @@
<message>
<location filename="../ui/PropertyBrowser/qtpropertymanager.cpp" line="8059"/>
<source>Name</source>
<translation type="unfinished"></translation>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/PropertyBrowser/qtpropertymanager.cpp" line="8066"/>
@ -1615,27 +1619,27 @@
<message>
<location filename="../ui/Menu/SystemManagerMenu.ui" line="14"/>
<source>SystemManagerMenu</source>
<translation type="unfinished"></translation>
<translation></translation>
</message>
<message>
<location filename="../ui/Menu/SystemManagerMenu.ui" line="20"/>
<source>exit</source>
<translation type="unfinished"></translation>
<translation>退</translation>
</message>
<message>
<location filename="../ui/Menu/SystemManagerMenu.ui" line="40"/>
<source>ui setting</source>
<translation type="unfinished"></translation>
<translation>ui设置</translation>
</message>
<message>
<location filename="../ui/Menu/SystemManagerMenu.cpp" line="28"/>
<source>question</source>
<translation type="unfinished"></translation>
<translation></translation>
</message>
<message>
<location filename="../ui/Menu/SystemManagerMenu.cpp" line="28"/>
<source>are you sure to exit</source>
<translation type="unfinished"></translation>
<translation>退</translation>
</message>
</context>
<context>
@ -1702,52 +1706,52 @@
<message>
<location filename="../ui/WorkSpace/WorkSpaceDlg.ui" line="14"/>
<source>New WorkSpace</source>
<translation type="unfinished"></translation>
<translation></translation>
</message>
<message>
<location filename="../ui/WorkSpace/WorkSpaceDlg.ui" line="22"/>
<source>Name</source>
<translation type="unfinished"></translation>
<translation></translation>
</message>
<message>
<location filename="../ui/WorkSpace/WorkSpaceDlg.ui" line="32"/>
<source>input workspace name</source>
<translation type="unfinished"></translation>
<translation></translation>
</message>
<message>
<location filename="../ui/WorkSpace/WorkSpaceDlg.ui" line="43"/>
<source>Path</source>
<translation type="unfinished"></translation>
<translation></translation>
</message>
<message>
<location filename="../ui/WorkSpace/WorkSpaceDlg.ui" line="56"/>
<source>select workspace save path</source>
<translation type="unfinished"></translation>
<translation></translation>
</message>
<message>
<location filename="../ui/WorkSpace/WorkSpaceDlg.ui" line="63"/>
<source>...</source>
<translation type="unfinished"></translation>
<translation></translation>
</message>
<message>
<location filename="../ui/WorkSpace/WorkSpaceDlg.ui" line="74"/>
<source>describe</source>
<translation type="unfinished"></translation>
<translation></translation>
</message>
<message>
<location filename="../ui/WorkSpace/WorkSpaceDlg.ui" line="101"/>
<source>Sure</source>
<translation type="unfinished"></translation>
<translation></translation>
</message>
<message>
<location filename="../ui/WorkSpace/WorkSpaceDlg.ui" line="108"/>
<source>Cancel</source>
<translation type="unfinished"></translation>
<translation></translation>
</message>
<message>
<location filename="../ui/WorkSpace/WorkSpaceDlg.cpp" line="27"/>
<source>new workspace</source>
<translation type="unfinished"></translation>
<translation></translation>
</message>
<message>
<location filename="../ui/WorkSpace/WorkSpaceDlg.cpp" line="52"/>
@ -1758,47 +1762,47 @@
<location filename="../ui/WorkSpace/WorkSpaceDlg.cpp" line="90"/>
<location filename="../ui/WorkSpace/WorkSpaceDlg.cpp" line="100"/>
<source>warning</source>
<translation type="unfinished"></translation>
<translation></translation>
</message>
<message>
<location filename="../ui/WorkSpace/WorkSpaceDlg.cpp" line="52"/>
<source>name or save path is empty, please check it</source>
<translation type="unfinished"></translation>
<translation></translation>
</message>
<message>
<location filename="../ui/WorkSpace/WorkSpaceDlg.cpp" line="58"/>
<source>save current workspace?</source>
<translation type="unfinished"></translation>
<translation></translation>
</message>
<message>
<location filename="../ui/WorkSpace/WorkSpaceDlg.cpp" line="68"/>
<source>current path is contains current folder, do you want to overwrite it?</source>
<translation type="unfinished"></translation>
<translation></translation>
</message>
<message>
<location filename="../ui/WorkSpace/WorkSpaceDlg.cpp" line="75"/>
<source>removeRecursively failed</source>
<translation type="unfinished"></translation>
<translation></translation>
</message>
<message>
<location filename="../ui/WorkSpace/WorkSpaceDlg.cpp" line="84"/>
<source>mkpath failed</source>
<translation type="unfinished"></translation>
<translation></translation>
</message>
<message>
<location filename="../ui/WorkSpace/WorkSpaceDlg.cpp" line="90"/>
<source>name is exits</source>
<translation type="unfinished"></translation>
<translation></translation>
</message>
<message>
<location filename="../ui/WorkSpace/WorkSpaceDlg.cpp" line="100"/>
<source>create workSpace failed</source>
<translation type="unfinished"></translation>
<translation></translation>
</message>
<message>
<location filename="../ui/WorkSpace/WorkSpaceDlg.cpp" line="111"/>
<source>save spaceWork directory</source>
<translation type="unfinished"></translation>
<translation></translation>
</message>
</context>
<context>

View File

@ -31,14 +31,14 @@ PlayManagerMenu::~PlayManagerMenu() {
void PlayManagerMenu::OnPlay() {
workSpace_ = WorkSpaceManager::Get().GetCurrent();
if (nullptr == workSpace_) {
QMessageBox::warning(&MainFrame::Get(), tr("question"), tr("has not workspace"),
QMessageBox::warning(&MainFrame::Get(), tr("warning"), tr("has not workspace"),
QMessageBox::Ok);
LOG_INFO("current is nullptr");
return;
}
Timestep* timestep = workSpace_->GetTimestep();
if (nullptr == timestep) {
QMessageBox::warning(&MainFrame::Get(), tr("question"), tr("has not workspace"),
QMessageBox::warning(&MainFrame::Get(), tr("warning"), tr("has not workspace"),
QMessageBox::Ok);
LOG_INFO("current is nullptr");
return;
@ -60,14 +60,14 @@ void PlayManagerMenu::OnPlay() {
void PlayManagerMenu::OnStop() {
workSpace_ = WorkSpaceManager::Get().GetCurrent();
if (nullptr == workSpace_) {
QMessageBox::warning(&MainFrame::Get(), tr("question"), tr("has not workspace"),
QMessageBox::warning(&MainFrame::Get(), tr("warning"), tr("has not workspace"),
QMessageBox::Ok);
LOG_INFO("current is nullptr");
return;
}
Timestep* timestep = workSpace_->GetTimestep();
if (nullptr == timestep) {
QMessageBox::warning(&MainFrame::Get(), tr("question"), tr("has not workspace"),
QMessageBox::warning(&MainFrame::Get(), tr("warning"), tr("has not workspace"),
QMessageBox::Ok);
LOG_INFO("current is nullptr");
return;
@ -78,14 +78,14 @@ void PlayManagerMenu::OnStop() {
void PlayManagerMenu::OnUp() {
workSpace_ = WorkSpaceManager::Get().GetCurrent();
if (nullptr == workSpace_) {
QMessageBox::warning(&MainFrame::Get(), tr("question"), tr("has not workspace"),
QMessageBox::warning(&MainFrame::Get(), tr("warning"), tr("has not workspace"),
QMessageBox::Ok);
LOG_INFO("current is nullptr");
return;
}
Timestep* timestep = workSpace_->GetTimestep();
if (nullptr == timestep) {
QMessageBox::warning(&MainFrame::Get(), tr("question"), tr("has not workspace"),
QMessageBox::warning(&MainFrame::Get(), tr("warning"), tr("has not workspace"),
QMessageBox::Ok);
LOG_INFO("current is nullptr");
return;
@ -96,14 +96,14 @@ void PlayManagerMenu::OnUp() {
void PlayManagerMenu::OnDown() {
workSpace_ = WorkSpaceManager::Get().GetCurrent();
if (nullptr == workSpace_) {
QMessageBox::warning(&MainFrame::Get(), tr("question"), tr("has not workspace"),
QMessageBox::warning(&MainFrame::Get(), tr("warning"), tr("has not workspace"),
QMessageBox::Ok);
LOG_INFO("current is nullptr");
return;
}
Timestep* timestep = workSpace_->GetTimestep();
if (nullptr == timestep) {
QMessageBox::warning(&MainFrame::Get(), tr("question"), tr("has not workspace"),
QMessageBox::warning(&MainFrame::Get(), tr("warning"), tr("has not workspace"),
QMessageBox::Ok);
LOG_INFO("current is nullptr");
return;