[ref]同步711

product/src/tools/WaveAnalyze/CComtradeFile.cpp

@@ -3793,7 +3793,7 @@ void CComtradeFile::LoadDisplayOption()
 	int i,nIndex;
 	QString szCnt,szSub;
 	//显示属性
-	nIndex = CSectionOperate::GetSection(sectlist,tr("Display Attribute"),tr("SHENZHEN KANGBIDA CONTROL TECHNOLOGY CO.LTD"));//显示属性
+	nIndex = CSectionOperate::GetSection(sectlist,tr("Display Attribute"),tr("SHENZHEN BYD CO.LTD"));//显示属性
 
 	if(nIndex<0) return;
 	CInfSection& sect1 = sectlist[nIndex];
@@ -3803,7 +3803,7 @@ void CComtradeFile::LoadDisplayOption()
 	m_DispAttr.m_dTagsHeight = sect1.GetAttribute(tr("State Channel Height"), "20").toDouble();//状态通道高度
 	
 	//模拟通道显示属性
-	nIndex = CSectionOperate::GetSection(sectlist, tr("Analogous Channel Display"),tr("SHENZHEN KANGBIDA CONTROL TECHNOLOGY CO.LTD"));//模拟通道显示
+	nIndex = CSectionOperate::GetSection(sectlist, tr("Analogous Channel Display"),tr("SHENZHEN BYD CO.LTD"));//模拟通道显示
 	if(nIndex<0) return;
 	CInfSection sect2 = sectlist[nIndex];;
 	int nAnalogueNum = sect2.GetAttribute(tr("Analogous Channel Count"), "0").toInt();//模拟通道个数
@@ -3831,7 +3831,7 @@ void CComtradeFile::LoadDisplayOption()
 	}
 	
 	//状态通道显示属性
-	nIndex = CSectionOperate::GetSection(sectlist, tr("State Channel Display"), tr("SHENZHEN KANGBIDA CONTROL TECHNOLOGY CO.LTD"));//状态通道显示
+	nIndex = CSectionOperate::GetSection(sectlist, tr("State Channel Display"), tr("SHENZHEN BYD CO.LTD"));//状态通道显示
 	if(nIndex<0) return;
 	CInfSection sect3 = sectlist[nIndex];
 	int nDigitalNum = sect3.GetAttribute(tr("State Channel Count"), "0").toInt();//状态通道个数

product/src/tools/WaveAnalyze/comtrade.ts

@@ -713,7 +713,7 @@ asasas</oldsource>
     <message>
         <location filename="CBarGraphShow.cpp" line="562"/>
         <source>SHENZHEN KANGBIDA CONTROL TECHNOLOGY CO.LTD</source>
-        <translation>广州市宏茂技术有限公司</translation>
+        <translation>深圳市远信储能技术有限公司</translation>
     </message>
 </context>
 <context>
@@ -977,7 +977,7 @@ asasas</oldsource>
     <message>
         <location filename="CBaseCompute.cpp" line="1589"/>
         <source>SHENZHEN KANGBIDA CONTROL TECHNOLOGY CO.LTD</source>
-        <translation>广州市宏茂技术有限公司</translation>
+        <translation>深圳市远信储能技术有限公司</translation>
     </message>
 </context>
 <context>
@@ -1066,7 +1066,7 @@ asasas</oldsource>
         <location filename="CComtradeFile.cpp" line="3981"/>
         <location filename="CComtradeFile.cpp" line="4009"/>
         <source>SHENZHEN KANGBIDA CONTROL TECHNOLOGY CO.LTD</source>
-        <translation>广州市宏茂技术有限公司</translation>
+        <translation>深圳市远信储能技术有限公司</translation>
     </message>
     <message>
         <location filename="CComtradeFile.cpp" line="3975"/>
@@ -1870,7 +1870,7 @@ asasas</oldsource>
     <message>
         <location filename="CFaultLineCompute.cpp" line="466"/>
         <source>SHENZHEN KANGBIDA CONTROL TECHNOLOGY CO.LTD</source>
-        <translation>广州市宏茂技术有限公司</translation>
+        <translation>深圳市远信储能技术有限公司</translation>
     </message>
 </context>
 <context>
@@ -2071,7 +2071,7 @@ asasas</oldsource>
     <message>
         <location filename="CFaultLocation.cpp" line="2582"/>
         <source>SHENZHEN KANGBIDA CONTROL TECHNOLOGY CO.LTD</source>
-        <translation>广州市宏茂技术有限公司</translation>
+        <translation>深圳市远信储能技术有限公司</translation>
     </message>
 </context>
 <context>
@@ -2224,7 +2224,7 @@ asasas</oldsource>
     <message>
         <location filename="CFaultPhaseCompute.cpp" line="1162"/>
         <source>SHENZHEN KANGBIDA CONTROL TECHNOLOGY CO.LTD</source>
-        <translation>广州市宏茂技术有限公司</translation>
+        <translation>深圳市远信储能技术有限公司</translation>
     </message>
 </context>
 <context>
@@ -2271,7 +2271,7 @@ asasas</oldsource>
     <message>
         <location filename="CFormulaCompute.cpp" line="367"/>
         <source>SHENZHEN KANGBIDA CONTROL TECHNOLOGY CO.LTD</source>
-        <translation>广州市宏茂技术有限公司</translation>
+        <translation>深圳市远信储能技术有限公司</translation>
     </message>
 </context>
 <context>
@@ -2289,7 +2289,7 @@ asasas</oldsource>
     <message>
         <location filename="CFormulaEditor.cpp" line="257"/>
         <source>SHENZHEN KANGBIDA CONTROL TECHNOLOGY CO.LTD</source>
-        <translation>广州市宏茂技术有限公司</translation>
+        <translation>深圳市远信储能技术有限公司</translation>
     </message>
 </context>
 <context>
@@ -2536,7 +2536,7 @@ asasas</oldsource>
     <message>
         <location filename="CHarmonicCompute.cpp" line="759"/>
         <source>SHENZHEN KANGBIDA CONTROL TECHNOLOGY CO.LTD</source>
-        <translation>广州市宏茂技术有限公司</translation>
+        <translation>深圳市远信储能技术有限公司</translation>
     </message>
 </context>
 <context>
@@ -2566,7 +2566,7 @@ asasas</oldsource>
     <message>
         <location filename="charmonicset.cpp" line="121"/>
         <source>SHENZHEN KANGBIDA CONTROL TECHNOLOGY CO.LTD</source>
-        <translation>广州市宏茂技术有限公司</translation>
+        <translation>深圳市远信储能技术有限公司</translation>
     </message>
     <message>
         <location filename="charmonicset.cpp" line="167"/>
@@ -2818,7 +2818,7 @@ asasas</oldsource>
     <message>
         <location filename="CImpedCompute.cpp" line="788"/>
         <source>SHENZHEN KANGBIDA CONTROL TECHNOLOGY CO.LTD</source>
-        <translation>广州市宏茂技术有限公司</translation>
+        <translation>深圳市远信储能技术有限公司</translation>
     </message>
 </context>
 <context>
@@ -3269,7 +3269,7 @@ asasas</oldsource>
     <message>
         <location filename="CListGraphShow.cpp" line="281"/>
         <source>SHENZHEN KANGBIDA CONTROL TECHNOLOGY CO.LTD</source>
-        <translation>广州市宏茂技术有限公司</translation>
+        <translation>深圳市远信储能技术有限公司</translation>
     </message>
     <message>
         <location filename="CListGraphShow.cpp" line="293"/>
@@ -3547,7 +3547,7 @@ asasas</oldsource>
     <message>
         <location filename="CPieGraphShow.cpp" line="516"/>
         <source>SHENZHEN KANGBIDA CONTROL TECHNOLOGY CO.LTD</source>
-        <translation>广州市宏茂技术有限公司</translation>
+        <translation>深圳市远信储能技术有限公司</translation>
     </message>
 </context>
 <context>
@@ -3786,7 +3786,7 @@ asasas</oldsource>
     <message>
         <location filename="CPowerCompute.cpp" line="1034"/>
         <source>SHENZHEN KANGBIDA CONTROL TECHNOLOGY CO.LTD</source>
-        <translation>广州市宏茂技术有限公司</translation>
+        <translation>深圳市远信储能技术有限公司</translation>
     </message>
 </context>
 <context>
@@ -4170,7 +4170,7 @@ p, li { white-space: pre-wrap; }
         <location filename="creportdialog.cpp" line="294"/>
         <location filename="creportdialog.cpp" line="2319"/>
         <source>SHENZHEN KANGBIDA CONTROL TECHNOLOGY CO.LTD</source>
-        <translation>广州市宏茂技术有限公司</translation>
+        <translation>深圳市远信储能技术有限公司</translation>
     </message>
     <message>
         <location filename="creportdialog.cpp" line="308"/>
@@ -4938,7 +4938,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="CSingleListGraphShow.cpp" line="228"/>
         <source>SHENZHEN KANGBIDA CONTROL TECHNOLOGY CO.LTD</source>
-        <translation>广州市宏茂技术有限公司</translation>
+        <translation>深圳市远信储能技术有限公司</translation>
     </message>
     <message>
         <location filename="CSingleListGraphShow.cpp" line="240"/>
@@ -5619,7 +5619,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="ctoolapp.cpp" line="39"/>
         <source>SHENZHEN KANGBIDA CONTROL TECHNOLOGY CO.LTD</source>
-        <translation>广州市宏茂技术有限公司</translation>
+        <translation>深圳市远信储能技术有限公司</translation>
     </message>
     <message>
         <location filename="ctoolapp.cpp" line="40"/>
@@ -5739,7 +5739,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="CVectorList.cpp" line="281"/>
         <source>SHENZHEN KANGBIDA CONTROL TECHNOLOGY CO.LTD</source>
-        <translation>广州市宏茂技术有限公司</translation>
+        <translation>深圳市远信储能技术有限公司</translation>
     </message>
     <message>
         <location filename="CVectorList.cpp" line="293"/>
@@ -5968,7 +5968,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="CVectorPicture.cpp" line="480"/>
         <source>SHENZHEN KANGBIDA CONTROL TECHNOLOGY CO.LTD</source>
-        <translation>广州市宏茂技术有限公司</translation>
+        <translation>深圳市远信储能技术有限公司</translation>
     </message>
 </context>
 <context>
@@ -8251,7 +8251,7 @@ p, li { white-space: pre-wrap; }
         <location filename="FormulaList.cpp" line="43"/>
         <location filename="OperationList.cpp" line="81"/>
         <source>SHENZHEN KANGBIDA CONTROL TECHNOLOGY CO.LTD</source>
-        <translation type="unfinished">广州市宏茂技术有限公司</translation>
+        <translation type="unfinished">深圳市远信储能技术有限公司</translation>
     </message>
     <message>
         <location filename="Formula.cpp" line="534"/>
@@ -8546,7 +8546,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="FormulaList.cpp" line="132"/>
         <source>SHENZHEN KANGBIDA CONTROL TECHNOLOGY CO.LTD curve</source>
-        <translation>广州市宏茂技术有限公司 曲线</translation>
+        <translation>深圳市远信储能技术有限公司 曲线</translation>
     </message>
     <message>
         <location filename="FormulaList.cpp" line="134"/>

product/src/tools/WaveAnalyze/ctoolapp.cpp

@@ -37,10 +37,10 @@ CToolApp::CToolApp(int &argc, char **argv)
     if ( argc >= 2 )
         m_sFilePath = QString::fromLocal8Bit(argv[1]);
 
-    setOrganizationName( tr("SHENZHEN KANGBIDA CONTROL TECHNOLOGY CO.LTD") );
-    setApplicationName( tr("ISCS-6000 Wave Analyze") );
+    setOrganizationName( tr("IOT") );
+    setApplicationName( tr("Wave Analyze") );
 
-    m_sToolName = "ISCS-6000 Wave Analyze";
+    m_sToolName = "Wave Analyze";
 	m_sVersion = "Verion 1.0";
     m_sUpdateDate = "Dec 15 2018,15:20:00";