Commit f424f655 by Pascal Bigot

--no commit message

parent 757fe185
...@@ -370,6 +370,7 @@ namespace CommonLib ...@@ -370,6 +370,7 @@ namespace CommonLib
string strTemp = strTab[iTokenIndex]; string strTemp = strTab[iTokenIndex];
strTemp = strTemp.Trim(')'); strTemp = strTemp.Trim(')');
strTemp = strTemp.Trim('('); strTemp = strTemp.Trim('(');
strTemp = strTemp.Trim(' ');
string strTok = strTemp; string strTok = strTemp;
strTok = strTok.Trim(); strTok = strTok.Trim();
......
...@@ -502,6 +502,9 @@ namespace CommonLib ...@@ -502,6 +502,9 @@ namespace CommonLib
string strTempParam = Params[i].Trim(); string strTempParam = Params[i].Trim();
if (!ScriptParser.IsNumericValue(strTempParam)) if (!ScriptParser.IsNumericValue(strTempParam))
{ {
Data dt = m_Document.GestData.QuickGetFromSymbol(strTempParam) as Data;
if (dt == null)
Traces.LogAddCritical(TraceCat.Parser, string.Format("Error while searching for parameter data {0}, not found", strTempParam));
retDatas[i] = (Data)m_Document.GestData.QuickGetFromSymbol(strTempParam); retDatas[i] = (Data)m_Document.GestData.QuickGetFromSymbol(strTempParam);
} }
else else
......
...@@ -68,13 +68,21 @@ namespace CommonLib ...@@ -68,13 +68,21 @@ namespace CommonLib
protected void VirtualDataValueChange(VirtualData vData) protected void VirtualDataValueChange(VirtualData vData)
{ {
for (int i = 0; i < m_dataGrid.Rows.Count; i++) if (this.InvokeRequired)
{ {
string RowDataSymbol = (string)m_dataGrid.Rows[i].Cells[0].Value; EventVirtualDataValueChange d = new EventVirtualDataValueChange(VirtualDataValueChange);
if (RowDataSymbol == vData.Symbol) this.Invoke(d, vData);
}
else
{
for (int i = 0; i < m_dataGrid.Rows.Count; i++)
{ {
m_dataGrid.Rows[i].Cells["Value"].Value = vData.Value.ToString(); string RowDataSymbol = (string)m_dataGrid.Rows[i].Cells[0].Value;
return; if (RowDataSymbol == vData.Symbol)
{
m_dataGrid.Rows[i].Cells["Value"].Value = vData.Value.ToString();
return;
}
} }
} }
} }
......
...@@ -273,6 +273,11 @@ namespace CommonLib ...@@ -273,6 +273,11 @@ namespace CommonLib
return LogAdd(TracesLevel.Debug, cat, sMessage1); return LogAdd(TracesLevel.Debug, cat, sMessage1);
} }
public static bool LogAddCritical(TraceCat cat, string sMessage1)
{
return LogAdd(TracesLevel.Critical, cat, sMessage1);
}
public static bool LogAddDebug(TraceCat cat,string sMessage1, string sMessage2) public static bool LogAddDebug(TraceCat cat,string sMessage1, string sMessage2)
{ {
return LogAdd(TracesLevel.Debug, cat, sMessage1, sMessage2); return LogAdd(TracesLevel.Debug, cat, sMessage1, sMessage2);
......
...@@ -76,6 +76,7 @@ ...@@ -76,6 +76,7 @@
<ItemGroup> <ItemGroup>
<EmbeddedResource Include="UpdaterMainForm.resx"> <EmbeddedResource Include="UpdaterMainForm.resx">
<DependentUpon>UpdaterMainForm.cs</DependentUpon> <DependentUpon>UpdaterMainForm.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource> </EmbeddedResource>
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment