modified bug

src/effects/ConeWave.cpp

@@ -93,7 +93,6 @@ ConeWave::ConeWave() {
     coneAlpha_ = 0.7f;
 }
 
-
 ConeWave::~ConeWave(void)
 {
 }

src/entities/ConeWaveComponent.cpp

@@ -18,7 +18,10 @@ ConeWaveComponent::ConeWaveComponent(SceneComponent* parent)
 }
 
 ConeWaveComponent::~ConeWaveComponent() {
-     coneWave_->Destory();
+	if (coneWave_->referenceCount() > 0)
+	{
+		coneWave_->Destory();
+	}
 }
 
 std::string ConeWaveComponent::GetTypeName() {

src/entities/EntitiesManager.cpp

@@ -152,7 +152,8 @@ bool EntitiesManager::DeleteEntity(Entity* entity) {
     // Immediate deletion to ensure scene graph resources are released
     // before viewer/context teardown. Using deleteLater() may invoke
     // QObject cleanup after OSG/GL objects are gone, causing crashes.
-    delete entity;
+    entity->deleteLater();
+
     return true;
 }
 

src/entities/LabelComponent.cpp

@@ -32,7 +32,7 @@ void LabelComponent::AttachEntity(Entity* entity) {
     
     if (entity && !entity->GetName().isEmpty()) {
 		LOG_INFO("LabelComponent: Attaching to entity '{}'", entity->GetName().toUtf8().data());
-        SetText(entity->GetName().toLocal8Bit().data());
+        SetText(entity->GetName().toStdString());
 
         Entity* entity = GetEntity();
         if (nullptr != entity) {
@@ -114,7 +114,7 @@ void LabelComponent::SetText(const std::string& text) {
         text_ = text;
         needUpdate_ = true;
         if (textNode_.valid()) {
-            textNode_->setText(text_);
+			textNode_->setText(text_, osgText::String::ENCODING_UTF8);
         }
     }
 }
@@ -152,11 +152,12 @@ void LabelComponent::CreateTextNode() {
         billboard_->setMode(osg::Billboard::POINT_ROT_EYE);
         
         textNode_ = new osgText::Text();
+		textNode_->setFont("fonts/simhei.ttf");
         
         textNode_->setAlignment(osgText::Text::CENTER_BOTTOM);
         textNode_->setAxisAlignment(osgText::Text::SCREEN);
         textNode_->setCharacterSizeMode(osgText::Text::SCREEN_COORDS);
-        textNode_->setText(text_);
+		textNode_->setText(text_, osgText::String::ENCODING_UTF8);
         textNode_->setPosition(osg::Vec3(0.0f, 0.0f, 0.0f));
         
         billboard_->addDrawable(textNode_.get(), osg::Vec3(0.0f, 0.0f, 5.0f));
@@ -179,7 +180,7 @@ void LabelComponent::CreateTextNode() {
 
 void LabelComponent::UpdateTextNode() {
     if (textNode_.valid()) {
-        textNode_->setText(text_);
+		textNode_->setText(text_, osgText::String::ENCODING_UTF8);
         textNode_->setCharacterSize(fontSize_);
         textNode_->setColor(color_);
         
@@ -188,6 +189,6 @@ void LabelComponent::UpdateTextNode() {
 }
 
 void LabelComponent::UpdateText(const QString& text) {
-	SetText(text.toLocal8Bit().data());
+	SetText(text.toStdString());
 	needUpdate_ = true;
 }

src/main.cpp

@@ -32,6 +32,17 @@ int main(int argc, char* argv[]) {
     app.setAttribute(Qt::AA_DontCreateNativeWidgetSiblings);
     InstallCrashHandler();
 
+	//字体高分屏自适应
+	const float DEFAULT_DPI = 96.0;
+	HDC screen = GetDC(NULL);
+	FLOAT dpiX = static_cast<FLOAT>(GetDeviceCaps(screen, LOGPIXELSX));
+	ReleaseDC(0, screen);
+	float fontSize = dpiX / DEFAULT_DPI;
+
+	QFont font = app.font();
+	font.setPointSize(font.pointSize()*fontSize);
+	app.setFont(font);
+
     // Single-instance guard to avoid multiple launches from repeated clicks
     const QString lockPath = QStandardPaths::writableLocation(QStandardPaths::TempLocation) + "/Dyt_app.lock";
     QLockFile lock(lockPath);

src/scene/ui/QueryElevationWidget.cpp

@@ -11,14 +11,15 @@
 
 
 struct ColorLabel : public osgWidget::Label {
-    ColorLabel(const char* label) :
+    ColorLabel(std::string label) :
         osgWidget::Label("", "") {
-        setFont("fonts/Vera.ttf");
+        setFont("fonts/simhei.ttf");
         setFontSize(14);
         setFontColor(1.0f, 1.0f, 1.0f, 1.0f);
         addHeight(18.0f);
         setCanFill(true);
-        setLabel(label);
+        //setLabel(label);
+		getText()->setText(label, osgText::String::ENCODING_UTF8);
     }
 };
 
@@ -27,7 +28,7 @@ QueryElevationWidget::QueryElevationWidget(OEScene* oeScene)
     , oeScene_(oeScene) {
     LOG_INFO("actor self={}", spdlog::fmt_lib::ptr(this));
 
-    label_ = new ColorLabel(GetElevationString(0, 0, 0).c_str());
+    label_ = new ColorLabel(GetElevationString(0, 0, 0));
     addWidget(label_);
     getBackground()->setColor(0.0f, 0.0f, 0.0f, 0.3f);
 }
@@ -61,8 +62,8 @@ void QueryElevationWidget::OnUpdateGeoPoint(double x, double y, double z) {
     
     dyt_check(nullptr != label_);
 
-    label_->setLabel(GetElevationString(x, y, z));
-
+	label_->getText()->setText(GetElevationString(x, y, z), osgText::String::ENCODING_UTF8);
+    //label_->setLabel(GetElevationString(x, y, z));
 }
 
 void QueryElevationWidget::ResetCanvasPosition(double width, double height) {
@@ -75,7 +76,7 @@ std::string QueryElevationWidget::GetElevationString(double x, double y, double
     QString info = QObject::tr("longitude:") + QString::number(x, 'f', 6) + ", "
         + QObject::tr("latitude:") + QString::number(y, 'f', 6) + ", "
         + QObject::tr("altitude:") + QString::number(z, 'f', 6);
-    return std::string(info.toLocal8Bit().constData());
+    return info.toStdString();
 }
 
 QueryElevationWidget::QueryElevationEventHandler::QueryElevationEventHandler(

src/translations/Dyt_zh_CN.ts

@@ -2235,17 +2235,17 @@
         <translation></translation>
     </message>
     <message>
-        <location filename="../ui/FrameTitleBar.cpp" line="149"/>
+        <location filename="../ui/FrameTitleBar.cpp" line="148"/>
         <source>default</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ui/FrameTitleBar.cpp" line="149"/>
+        <location filename="../ui/FrameTitleBar.cpp" line="148"/>
         <source>silver</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ui/FrameTitleBar.cpp" line="149"/>
+        <location filename="../ui/FrameTitleBar.cpp" line="148"/>
         <source>blue</source>
         <translation></translation>
     </message>
@@ -2261,27 +2261,27 @@
 <context>
     <name>MainFrame</name>
     <message>
-        <location filename="../ui/MainFrame.cpp" line="44"/>
+        <location filename="../ui/MainFrame.cpp" line="46"/>
         <source>Dyt</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ui/MainFrame.cpp" line="103"/>
+        <location filename="../ui/MainFrame.cpp" line="105"/>
         <source>file manager</source>
         <translation>文件管理</translation>
     </message>
     <message>
-        <location filename="../ui/MainFrame.cpp" line="113"/>
+        <location filename="../ui/MainFrame.cpp" line="108"/>
         <source>simu manager</source>
         <translation>仿真管理</translation>
     </message>
     <message>
-        <location filename="../ui/MainFrame.cpp" line="116"/>
+        <location filename="../ui/MainFrame.cpp" line="111"/>
         <source>play manager</source>
         <translation>回放管理</translation>
     </message>
     <message>
-        <location filename="../ui/MainFrame.cpp" line="119"/>
+        <location filename="../ui/MainFrame.cpp" line="114"/>
         <source>system manager</source>
         <translation>系统管理</translation>
     </message>
@@ -2294,7 +2294,7 @@
         <translation></translation>
     </message>
     <message>
-        <location filename="../ui/MainWindow.cpp" line="65"/>
+        <location filename="../ui/MainWindow.cpp" line="66"/>
         <source>model elements</source>
         <translation>模型元素</translation>
     </message>
@@ -2309,7 +2309,7 @@
         <translation>属性</translation>
     </message>
     <message>
-        <location filename="../ui/MainWindow.cpp" line="112"/>
+        <location filename="../ui/MainWindow.cpp" line="109"/>
         <source>Main View</source>
         <translation>主视图</translation>
     </message>
@@ -2435,14 +2435,12 @@
 <context>
     <name>OsgWidget</name>
     <message>
-        <location filename="../viewer/OsgWidget.cpp" line="144"/>
         <source>warning</source>
-        <translation>警告</translation>
+        <translation type="vanished">警告</translation>
     </message>
     <message>
-        <location filename="../viewer/OsgWidget.cpp" line="145"/>
         <source>open dyt file failed</source>
-        <translation>打开dyt文件失败。</translation>
+        <translation type="vanished">打开dyt文件失败。</translation>
     </message>
 </context>
 <context>
@@ -2463,8 +2461,8 @@
     <message>
         <location filename="../ui/Menu/PlayManagerMenu.ui" line="26"/>
         <location filename="../ui/Menu/PlayManagerMenu.cpp" line="55"/>
-        <location filename="../ui/Menu/PlayManagerMenu.cpp" line="166"/>
-        <location filename="../ui/Menu/PlayManagerMenu.cpp" line="173"/>
+        <location filename="../ui/Menu/PlayManagerMenu.cpp" line="163"/>
+        <location filename="../ui/Menu/PlayManagerMenu.cpp" line="170"/>
         <source>play</source>
         <translation>开始</translation>
     </message>
@@ -2529,7 +2527,7 @@
     <message>
         <location filename="../ui/Menu/PlayManagerMenu.cpp" line="48"/>
         <location filename="../ui/Menu/PlayManagerMenu.cpp" line="52"/>
-        <location filename="../ui/Menu/PlayManagerMenu.cpp" line="163"/>
+        <location filename="../ui/Menu/PlayManagerMenu.cpp" line="160"/>
         <source>pause</source>
         <translation>暂停</translation>
     </message>
@@ -2550,322 +2548,322 @@
         <translation>属性</translation>
     </message>
     <message>
-        <location filename="../ui/PropertyBrowser.cpp" line="69"/>
-        <location filename="../ui/PropertyBrowser.cpp" line="72"/>
-        <location filename="../ui/PropertyBrowser.cpp" line="1308"/>
+        <location filename="../ui/PropertyBrowser.cpp" line="67"/>
+        <location filename="../ui/PropertyBrowser.cpp" line="70"/>
+        <location filename="../ui/PropertyBrowser.cpp" line="1290"/>
         <source>WorkSpace</source>
         <translation>工作区间</translation>
     </message>
     <message>
-        <location filename="../ui/PropertyBrowser.cpp" line="102"/>
-        <location filename="../ui/PropertyBrowser.cpp" line="105"/>
+        <location filename="../ui/PropertyBrowser.cpp" line="97"/>
+        <location filename="../ui/PropertyBrowser.cpp" line="100"/>
         <source>Entity</source>
         <translation>实体</translation>
     </message>
     <message>
-        <location filename="../ui/PropertyBrowser.cpp" line="179"/>
+        <location filename="../ui/PropertyBrowser.cpp" line="172"/>
         <source>Basic</source>
         <translation>基础信息</translation>
     </message>
     <message>
-        <location filename="../ui/PropertyBrowser.cpp" line="181"/>
+        <location filename="../ui/PropertyBrowser.cpp" line="174"/>
         <source>Type</source>
         <translation>图表类型</translation>
     </message>
     <message>
-        <location filename="../ui/PropertyBrowser.cpp" line="186"/>
+        <location filename="../ui/PropertyBrowser.cpp" line="179"/>
         <source>Name</source>
         <translation>名称</translation>
     </message>
     <message>
-        <location filename="../ui/PropertyBrowser.cpp" line="196"/>
+        <location filename="../ui/PropertyBrowser.cpp" line="189"/>
         <source>FileName</source>
         <translation>文件名称</translation>
     </message>
     <message>
-        <location filename="../ui/PropertyBrowser.cpp" line="201"/>
+        <location filename="../ui/PropertyBrowser.cpp" line="194"/>
         <source>Path</source>
         <translation>路径</translation>
     </message>
     <message>
-        <location filename="../ui/PropertyBrowser.cpp" line="216"/>
-        <location filename="../ui/PropertyBrowser.cpp" line="457"/>
-        <location filename="../ui/PropertyBrowser.cpp" line="731"/>
-        <location filename="../ui/PropertyBrowser.cpp" line="804"/>
-        <location filename="../ui/PropertyBrowser.cpp" line="914"/>
-        <location filename="../ui/PropertyBrowser.cpp" line="1051"/>
+        <location filename="../ui/PropertyBrowser.cpp" line="208"/>
+        <location filename="../ui/PropertyBrowser.cpp" line="448"/>
+        <location filename="../ui/PropertyBrowser.cpp" line="720"/>
+        <location filename="../ui/PropertyBrowser.cpp" line="790"/>
+        <location filename="../ui/PropertyBrowser.cpp" line="898"/>
+        <location filename="../ui/PropertyBrowser.cpp" line="1034"/>
         <source>Chart</source>
         <translation>图表属性</translation>
     </message>
     <message>
-        <location filename="../ui/PropertyBrowser.cpp" line="220"/>
+        <location filename="../ui/PropertyBrowser.cpp" line="212"/>
         <source>Curve Type</source>
         <translation>曲线类型</translation>
     </message>
     <message>
-        <location filename="../ui/PropertyBrowser.cpp" line="226"/>
-        <location filename="../ui/PropertyBrowser.cpp" line="459"/>
+        <location filename="../ui/PropertyBrowser.cpp" line="218"/>
+        <location filename="../ui/PropertyBrowser.cpp" line="450"/>
         <source>xCount</source>
         <translation>X轴间隔数目</translation>
     </message>
     <message>
-        <location filename="../ui/PropertyBrowser.cpp" line="238"/>
-        <location filename="../ui/PropertyBrowser.cpp" line="462"/>
+        <location filename="../ui/PropertyBrowser.cpp" line="230"/>
+        <location filename="../ui/PropertyBrowser.cpp" line="453"/>
         <source>yCount</source>
         <translation>Y轴间隔数目</translation>
     </message>
     <message>
-        <location filename="../ui/PropertyBrowser.cpp" line="250"/>
-        <location filename="../ui/PropertyBrowser.cpp" line="491"/>
+        <location filename="../ui/PropertyBrowser.cpp" line="242"/>
+        <location filename="../ui/PropertyBrowser.cpp" line="482"/>
         <source>xTitle</source>
         <translation>X轴标题</translation>
     </message>
     <message>
-        <location filename="../ui/PropertyBrowser.cpp" line="262"/>
-        <location filename="../ui/PropertyBrowser.cpp" line="494"/>
+        <location filename="../ui/PropertyBrowser.cpp" line="254"/>
+        <location filename="../ui/PropertyBrowser.cpp" line="485"/>
         <source>yTitle</source>
         <translation>Y轴标题</translation>
     </message>
     <message>
-        <location filename="../ui/PropertyBrowser.cpp" line="274"/>
-        <location filename="../ui/PropertyBrowser.cpp" line="523"/>
+        <location filename="../ui/PropertyBrowser.cpp" line="266"/>
+        <location filename="../ui/PropertyBrowser.cpp" line="514"/>
         <source>xMin</source>
         <translation>X轴最小值</translation>
     </message>
     <message>
-        <location filename="../ui/PropertyBrowser.cpp" line="286"/>
-        <location filename="../ui/PropertyBrowser.cpp" line="526"/>
+        <location filename="../ui/PropertyBrowser.cpp" line="278"/>
+        <location filename="../ui/PropertyBrowser.cpp" line="517"/>
         <source>xMax</source>
         <translation>X轴最大值</translation>
     </message>
     <message>
-        <location filename="../ui/PropertyBrowser.cpp" line="298"/>
-        <location filename="../ui/PropertyBrowser.cpp" line="545"/>
+        <location filename="../ui/PropertyBrowser.cpp" line="290"/>
+        <location filename="../ui/PropertyBrowser.cpp" line="536"/>
         <source>yMin</source>
         <translation>Y轴最小值</translation>
     </message>
     <message>
-        <location filename="../ui/PropertyBrowser.cpp" line="310"/>
-        <location filename="../ui/PropertyBrowser.cpp" line="548"/>
+        <location filename="../ui/PropertyBrowser.cpp" line="302"/>
+        <location filename="../ui/PropertyBrowser.cpp" line="539"/>
         <source>yMax</source>
         <translation>Y轴最大值</translation>
     </message>
     <message>
-        <location filename="../ui/PropertyBrowser.cpp" line="322"/>
-        <location filename="../ui/PropertyBrowser.cpp" line="589"/>
-        <location filename="../ui/PropertyBrowser.cpp" line="745"/>
-        <location filename="../ui/PropertyBrowser.cpp" line="812"/>
-        <location filename="../ui/PropertyBrowser.cpp" line="962"/>
-        <location filename="../ui/PropertyBrowser.cpp" line="1053"/>
+        <location filename="../ui/PropertyBrowser.cpp" line="314"/>
+        <location filename="../ui/PropertyBrowser.cpp" line="580"/>
+        <location filename="../ui/PropertyBrowser.cpp" line="734"/>
+        <location filename="../ui/PropertyBrowser.cpp" line="798"/>
+        <location filename="../ui/PropertyBrowser.cpp" line="946"/>
+        <location filename="../ui/PropertyBrowser.cpp" line="1036"/>
         <source>timeParam</source>
         <translation>时间列</translation>
     </message>
     <message>
-        <location filename="../ui/PropertyBrowser.cpp" line="336"/>
+        <location filename="../ui/PropertyBrowser.cpp" line="328"/>
         <source>CurveProperty</source>
         <translation>曲线属性</translation>
     </message>
     <message>
-        <location filename="../ui/PropertyBrowser.cpp" line="343"/>
-        <location filename="../ui/PropertyBrowser.cpp" line="610"/>
-        <location filename="../ui/PropertyBrowser.cpp" line="971"/>
+        <location filename="../ui/PropertyBrowser.cpp" line="335"/>
+        <location filename="../ui/PropertyBrowser.cpp" line="600"/>
+        <location filename="../ui/PropertyBrowser.cpp" line="955"/>
         <source>name</source>
         <translation>名称</translation>
     </message>
     <message>
-        <location filename="../ui/PropertyBrowser.cpp" line="359"/>
-        <location filename="../ui/PropertyBrowser.cpp" line="626"/>
-        <location filename="../ui/PropertyBrowser.cpp" line="987"/>
+        <location filename="../ui/PropertyBrowser.cpp" line="351"/>
+        <location filename="../ui/PropertyBrowser.cpp" line="616"/>
+        <location filename="../ui/PropertyBrowser.cpp" line="971"/>
         <source>color</source>
         <translation>颜色</translation>
     </message>
     <message>
-        <location filename="../ui/PropertyBrowser.cpp" line="377"/>
-        <location filename="../ui/PropertyBrowser.cpp" line="641"/>
+        <location filename="../ui/PropertyBrowser.cpp" line="369"/>
+        <location filename="../ui/PropertyBrowser.cpp" line="630"/>
         <source>start</source>
         <translation>数据开始列</translation>
     </message>
     <message>
-        <location filename="../ui/PropertyBrowser.cpp" line="380"/>
-        <location filename="../ui/PropertyBrowser.cpp" line="644"/>
+        <location filename="../ui/PropertyBrowser.cpp" line="372"/>
+        <location filename="../ui/PropertyBrowser.cpp" line="633"/>
         <source>stop</source>
         <translation>数据结束列</translation>
     </message>
     <message>
-        <location filename="../ui/PropertyBrowser.cpp" line="409"/>
-        <location filename="../ui/PropertyBrowser.cpp" line="671"/>
+        <location filename="../ui/PropertyBrowser.cpp" line="401"/>
+        <location filename="../ui/PropertyBrowser.cpp" line="660"/>
         <source>x</source>
         <translation>x</translation>
     </message>
     <message>
-        <location filename="../ui/PropertyBrowser.cpp" line="412"/>
-        <location filename="../ui/PropertyBrowser.cpp" line="674"/>
+        <location filename="../ui/PropertyBrowser.cpp" line="404"/>
+        <location filename="../ui/PropertyBrowser.cpp" line="663"/>
         <source>y</source>
         <translation>y</translation>
     </message>
     <message>
-        <location filename="../ui/PropertyBrowser.cpp" line="465"/>
+        <location filename="../ui/PropertyBrowser.cpp" line="456"/>
         <source>zCount</source>
         <translation>Z轴间隔数目</translation>
     </message>
     <message>
-        <location filename="../ui/PropertyBrowser.cpp" line="497"/>
+        <location filename="../ui/PropertyBrowser.cpp" line="488"/>
         <source>zTitle</source>
         <translation>Z轴标题</translation>
     </message>
     <message>
-        <location filename="../ui/PropertyBrowser.cpp" line="567"/>
+        <location filename="../ui/PropertyBrowser.cpp" line="558"/>
         <source>zMin</source>
         <translation>Z轴最小值</translation>
     </message>
     <message>
-        <location filename="../ui/PropertyBrowser.cpp" line="570"/>
+        <location filename="../ui/PropertyBrowser.cpp" line="561"/>
         <source>zMax</source>
         <translation>Z轴最大值</translation>
     </message>
     <message>
-        <location filename="../ui/PropertyBrowser.cpp" line="604"/>
+        <location filename="../ui/PropertyBrowser.cpp" line="594"/>
         <source>SurfacesProp</source>
         <translation>曲面属性</translation>
     </message>
     <message>
-        <location filename="../ui/PropertyBrowser.cpp" line="677"/>
+        <location filename="../ui/PropertyBrowser.cpp" line="666"/>
         <source>z</source>
         <translation>z</translation>
     </message>
     <message>
-        <location filename="../ui/PropertyBrowser.cpp" line="733"/>
+        <location filename="../ui/PropertyBrowser.cpp" line="722"/>
         <source>headerString</source>
         <translation>表头</translation>
     </message>
     <message>
-        <location filename="../ui/PropertyBrowser.cpp" line="806"/>
+        <location filename="../ui/PropertyBrowser.cpp" line="792"/>
         <source>openColor</source>
         <translation>亮灯颜色</translation>
     </message>
     <message>
-        <location filename="../ui/PropertyBrowser.cpp" line="809"/>
+        <location filename="../ui/PropertyBrowser.cpp" line="795"/>
         <source>closeColor</source>
         <translation>灭灯颜色</translation>
     </message>
     <message>
-        <location filename="../ui/PropertyBrowser.cpp" line="842"/>
+        <location filename="../ui/PropertyBrowser.cpp" line="826"/>
         <source>Light Rows</source>
         <translation>信号灯属性</translation>
     </message>
     <message>
-        <location filename="../ui/PropertyBrowser.cpp" line="848"/>
-        <location filename="../ui/PropertyBrowser.cpp" line="1073"/>
+        <location filename="../ui/PropertyBrowser.cpp" line="832"/>
+        <location filename="../ui/PropertyBrowser.cpp" line="1056"/>
         <source>names</source>
         <translation>名称</translation>
     </message>
     <message>
-        <location filename="../ui/PropertyBrowser.cpp" line="871"/>
+        <location filename="../ui/PropertyBrowser.cpp" line="855"/>
         <source>data</source>
         <translation>数据</translation>
     </message>
     <message>
-        <location filename="../ui/PropertyBrowser.cpp" line="952"/>
+        <location filename="../ui/PropertyBrowser.cpp" line="936"/>
         <source>AngularCount</source>
         <translation>角度间隔数目</translation>
     </message>
     <message>
-        <location filename="../ui/PropertyBrowser.cpp" line="953"/>
+        <location filename="../ui/PropertyBrowser.cpp" line="937"/>
         <source>RadialCount</source>
         <translation>径向间隔数目</translation>
     </message>
     <message>
-        <location filename="../ui/PropertyBrowser.cpp" line="954"/>
+        <location filename="../ui/PropertyBrowser.cpp" line="938"/>
         <source>AngularTitle</source>
         <translation>角度标题</translation>
     </message>
     <message>
-        <location filename="../ui/PropertyBrowser.cpp" line="955"/>
+        <location filename="../ui/PropertyBrowser.cpp" line="939"/>
         <source>RadialTitle</source>
         <translation>径向标题</translation>
     </message>
     <message>
-        <location filename="../ui/PropertyBrowser.cpp" line="956"/>
+        <location filename="../ui/PropertyBrowser.cpp" line="940"/>
         <source>AngularMin</source>
         <translation>角度最小值</translation>
     </message>
     <message>
-        <location filename="../ui/PropertyBrowser.cpp" line="957"/>
+        <location filename="../ui/PropertyBrowser.cpp" line="941"/>
         <source>AngularMax</source>
         <translation>角度最大值</translation>
     </message>
     <message>
-        <location filename="../ui/PropertyBrowser.cpp" line="958"/>
+        <location filename="../ui/PropertyBrowser.cpp" line="942"/>
         <source>RadialMin</source>
         <translation>径向最小值</translation>
     </message>
     <message>
-        <location filename="../ui/PropertyBrowser.cpp" line="959"/>
+        <location filename="../ui/PropertyBrowser.cpp" line="943"/>
         <source>RadialMax</source>
         <translation>径向最大值</translation>
     </message>
     <message>
-        <location filename="../ui/PropertyBrowser.cpp" line="960"/>
+        <location filename="../ui/PropertyBrowser.cpp" line="944"/>
         <source>AngularUnit</source>
         <translation>角度单位</translation>
     </message>
     <message>
-        <location filename="../ui/PropertyBrowser.cpp" line="961"/>
+        <location filename="../ui/PropertyBrowser.cpp" line="945"/>
         <source>RadialUnit</source>
         <translation>径向单位</translation>
     </message>
     <message>
-        <location filename="../ui/PropertyBrowser.cpp" line="965"/>
+        <location filename="../ui/PropertyBrowser.cpp" line="949"/>
         <source>Lines Prop</source>
         <translation>点属性</translation>
     </message>
     <message>
-        <location filename="../ui/PropertyBrowser.cpp" line="1003"/>
+        <location filename="../ui/PropertyBrowser.cpp" line="986"/>
         <source>Angular</source>
         <translation>角度数据列</translation>
     </message>
     <message>
-        <location filename="../ui/PropertyBrowser.cpp" line="1019"/>
+        <location filename="../ui/PropertyBrowser.cpp" line="1002"/>
         <source>Radial</source>
         <translation>径向数据列</translation>
     </message>
     <message>
-        <location filename="../ui/PropertyBrowser.cpp" line="1067"/>
+        <location filename="../ui/PropertyBrowser.cpp" line="1050"/>
         <source>Image Prop</source>
         <translation>图像属性</translation>
     </message>
     <message>
-        <location filename="../ui/PropertyBrowser.cpp" line="1074"/>
+        <location filename="../ui/PropertyBrowser.cpp" line="1057"/>
         <source>File name list</source>
         <translation>名称列表</translation>
     </message>
     <message>
-        <location filename="../ui/PropertyBrowser.cpp" line="1097"/>
+        <location filename="../ui/PropertyBrowser.cpp" line="1080"/>
         <source>datas</source>
         <translation>数据</translation>
     </message>
     <message>
-        <location filename="../ui/PropertyBrowser.cpp" line="1098"/>
+        <location filename="../ui/PropertyBrowser.cpp" line="1081"/>
         <source>Image data per file</source>
         <translation>对应的数据列</translation>
     </message>
     <message>
-        <location filename="../ui/PropertyBrowser.cpp" line="1125"/>
+        <location filename="../ui/PropertyBrowser.cpp" line="1108"/>
         <source>path</source>
         <translation>路径</translation>
     </message>
     <message>
-        <location filename="../ui/PropertyBrowser.cpp" line="1141"/>
+        <location filename="../ui/PropertyBrowser.cpp" line="1125"/>
         <source>suffix</source>
         <translation>后缀</translation>
     </message>
     <message>
-        <location filename="../ui/PropertyBrowser.cpp" line="1366"/>
+        <location filename="../ui/PropertyBrowser.cpp" line="1348"/>
         <source>ModelBase</source>
         <translation>模型</translation>
     </message>
     <message>
-        <location filename="../ui/PropertyBrowser.cpp" line="1371"/>
+        <location filename="../ui/PropertyBrowser.cpp" line="1353"/>
         <source>color base</source>
         <translation>颜色</translation>
     </message>
@@ -2909,17 +2907,17 @@
         <translation>应用程序崩溃</translation>
     </message>
     <message>
-        <location filename="../scene/ui/QueryElevationWidget.cpp" line="75"/>
+        <location filename="../scene/ui/QueryElevationWidget.cpp" line="76"/>
         <source>longitude:</source>
         <translation>经度：</translation>
     </message>
     <message>
-        <location filename="../scene/ui/QueryElevationWidget.cpp" line="76"/>
+        <location filename="../scene/ui/QueryElevationWidget.cpp" line="77"/>
         <source>latitude:</source>
         <translation>纬度：</translation>
     </message>
     <message>
-        <location filename="../scene/ui/QueryElevationWidget.cpp" line="77"/>
+        <location filename="../scene/ui/QueryElevationWidget.cpp" line="78"/>
         <source>altitude:</source>
         <translation>高度：</translation>
     </message>
@@ -2930,7 +2928,7 @@
     </message>
     <message>
         <location filename="../ui/Menu/FileManagerMenu.cpp" line="57"/>
-        <location filename="../ui/Menu/FileManagerMenu.cpp" line="91"/>
+        <location filename="../ui/Menu/FileManagerMenu.cpp" line="92"/>
         <source>Dyt Files (*.dyt)</source>
         <translation>Dyt文件(*.dyt)</translation>
     </message>
@@ -2945,29 +2943,29 @@
         <translation>保存当前工作空间？</translation>
     </message>
     <message>
-        <location filename="../ui/Menu/FileManagerMenu.cpp" line="84"/>
-        <location filename="../ui/Menu/FileManagerMenu.cpp" line="108"/>
-        <location filename="../ui/Menu/FileManagerMenu.cpp" line="156"/>
-        <location filename="../ui/Menu/FileManagerMenu.cpp" line="204"/>
-        <location filename="../ui/Menu/FileManagerMenu.cpp" line="252"/>
-        <location filename="../ui/Menu/FileManagerMenu.cpp" line="301"/>
-        <location filename="../ui/Menu/FileManagerMenu.cpp" line="317"/>
+        <location filename="../ui/Menu/FileManagerMenu.cpp" line="85"/>
+        <location filename="../ui/Menu/FileManagerMenu.cpp" line="109"/>
+        <location filename="../ui/Menu/FileManagerMenu.cpp" line="157"/>
+        <location filename="../ui/Menu/FileManagerMenu.cpp" line="205"/>
+        <location filename="../ui/Menu/FileManagerMenu.cpp" line="253"/>
+        <location filename="../ui/Menu/FileManagerMenu.cpp" line="302"/>
+        <location filename="../ui/Menu/FileManagerMenu.cpp" line="318"/>
         <source>prompt</source>
         <translation>提示</translation>
     </message>
     <message>
-        <location filename="../ui/Menu/FileManagerMenu.cpp" line="84"/>
-        <location filename="../ui/Menu/FileManagerMenu.cpp" line="108"/>
-        <location filename="../ui/Menu/FileManagerMenu.cpp" line="156"/>
-        <location filename="../ui/Menu/FileManagerMenu.cpp" line="204"/>
-        <location filename="../ui/Menu/FileManagerMenu.cpp" line="252"/>
-        <location filename="../ui/Menu/FileManagerMenu.cpp" line="301"/>
-        <location filename="../ui/Menu/FileManagerMenu.cpp" line="317"/>
+        <location filename="../ui/Menu/FileManagerMenu.cpp" line="85"/>
+        <location filename="../ui/Menu/FileManagerMenu.cpp" line="109"/>
+        <location filename="../ui/Menu/FileManagerMenu.cpp" line="157"/>
+        <location filename="../ui/Menu/FileManagerMenu.cpp" line="205"/>
+        <location filename="../ui/Menu/FileManagerMenu.cpp" line="253"/>
+        <location filename="../ui/Menu/FileManagerMenu.cpp" line="302"/>
+        <location filename="../ui/Menu/FileManagerMenu.cpp" line="318"/>
         <source>please create workspace first</source>
         <translation>请先创建工作区间。</translation>
     </message>
     <message>
-        <location filename="../ui/Menu/FileManagerMenu.cpp" line="91"/>
+        <location filename="../ui/Menu/FileManagerMenu.cpp" line="92"/>
         <source>Save Workspace</source>
         <translation>保存工作区间</translation>
     </message>

src/ui/Layout/AddParamSetting.cpp

@@ -518,6 +518,13 @@ void AddParamSetting::slotButtonCommit()
 
 			sett.setValue("Value", strValue);
 		}
+		else if (strType == "a+bi")
+		{
+			QLineEdit* pCuralue = (QLineEdit*)ui.tableWidget->cellWidget(iRow, 6);
+			QString strValue = pCuralue->text();
+			QString strIn = QString("%1 = %2;").arg(strName).arg(strValue);
+			out << strIn << "\n";  
+		}
 		else
 		{
 			sett.setValue("MaxValue", 0);

src/ui/MainFrame.cpp

@@ -53,6 +53,8 @@ MainFrame::MainFrame(QWidget *parent) :
     InitUI();
 
     SetTitleBar(ui->titleFrame);
+
+	setObjectName("MainFrame");
 }
 
 MainFrame::~MainFrame()

src/ui/Panel/SurfacePanel.cpp

@@ -508,6 +508,14 @@ void SurfacePanel::slotEndLoadData()
 	if (nullptr != dockWidget_)
 	{
 		dockWidget_->setWindowTitle(m_title);
+
+		if (m_thread)
+		{
+			m_thread->requestExit();
+			m_thread->wait();
+			m_thread->deleteLater();
+			m_thread = nullptr;
+		}
 	}
 }
 

src/ui/PropertyBrowser/qtpropertymanager.cpp

@@ -7578,8 +7578,8 @@ QString QtTransfromPropertyManager::valueText(const QtProperty* property) const
 
 	QTransformAttribute c = it.value();
 	osg::Vec3 t = c.GetLocation();
-	osg::Vec3 r = c.GetLocation();
-	osg::Vec3 s = c.GetLocation();
+	osg::Vec3 r = c.GetRotation();
+	osg::Vec3 s = c.GetScale();
     return QCoreApplication::translate("QtPropertyBrowserUtils", "[%1, %2, %3] [%4, %5, %6] [%7, %8, %9]")
         .arg(t.x()).arg(t.y()).arg(t.z())
 		.arg(r.x()).arg(r.y()).arg(r.z())

src/ui/WorkSpace/WorkSpaceDlg.cpp

@@ -96,7 +96,7 @@ void WorkSpaceDlg::OnSure() {
     workSpace->SetDescribe(ui->etDescribe->toPlainText());
     workSpace->SetCommondFilePath(commondPath_);
     // Execute commands configured for onCreate right after workspace is set up
-    workSpace->ExecuteCommands(WorkSpace::CommandWhen::OnCreate);
+    //workSpace->ExecuteCommands(WorkSpace::CommandWhen::OnCreate);
     
     WorkSpaceManager::Get().SetCurrent(workSpace);
     accept();