(codegen): сделал вылавливание исключений при работе с датчиками

Utilities/codegen/ctl-cpp-cc-alone-ask.xsl

@@ -212,6 +212,8 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::askValue( UniSetTypes::ObjectId _si
 // -----------------------------------------------------------------------------
 bool <xsl:value-of select="$CLASSNAME"/>_SK::getState( UniSetTypes::ObjectId _sid )
 {
+	try
+	{
 	<xsl:for-each select="//sensors/item/consumers/consumer">
 	<xsl:if test="normalize-space(@name)=$OID">
 	<xsl:if test="normalize-space(../../@msg)!='1'">
@@ -219,19 +221,19 @@ bool <xsl:value-of select="$CLASSNAME"/>_SK::getState( UniSetTypes::ObjectId _si
 		{
 	<xsl:choose>
 	<xsl:when test="normalize-space(../../@iotype)='DI'">
-		<xsl:call-template name="setprefix"/><xsl:value-of select="../../@name"/> = ui.getState(<xsl:value-of select="../../@name"/>);
+		<xsl:text>		</xsl:text><xsl:call-template name="setprefix"/><xsl:value-of select="../../@name"/> = ui.getState(<xsl:value-of select="../../@name"/>);
 			return <xsl:call-template name="setprefix"/><xsl:value-of select="../../@name"/>;
 	</xsl:when>
 	<xsl:when test="normalize-space(../../@iotype)='DO'">
-		<xsl:call-template name="setprefix"/><xsl:value-of select="../../@name"/> = ui.getState(<xsl:value-of select="../../@name"/>);
+		<xsl:text>		</xsl:text><xsl:call-template name="setprefix"/><xsl:value-of select="../../@name"/> = ui.getState(<xsl:value-of select="../../@name"/>);
 			return <xsl:call-template name="setprefix"/><xsl:value-of select="../../@name"/>;
 	</xsl:when>
 	<xsl:when test="normalize-space(../../@iotype)='AO'">
-		<xsl:call-template name="setprefix"/><xsl:value-of select="../../@name"/> = ui.getValue(<xsl:value-of select="../../@name"/>);
+		<xsl:text>		</xsl:text><xsl:call-template name="setprefix"/><xsl:value-of select="../../@name"/> = ui.getValue(<xsl:value-of select="../../@name"/>);
 			return <xsl:call-template name="setprefix"/><xsl:value-of select="../../@name"/>;
 	</xsl:when>
 	<xsl:when test="normalize-space(../../@iotype)='AI'">
-		<xsl:call-template name="setprefix"/><xsl:value-of select="../../@name"/> = ui.getValue(<xsl:value-of select="../../@name"/>);
+		<xsl:text>		</xsl:text><xsl:call-template name="setprefix"/><xsl:value-of select="../../@name"/> = ui.getValue(<xsl:value-of select="../../@name"/>);
 			return <xsl:call-template name="setprefix"/><xsl:value-of select="../../@name"/>;
 	</xsl:when>
 	</xsl:choose>
@@ -243,6 +245,12 @@ bool <xsl:value-of select="$CLASSNAME"/>_SK::getState( UniSetTypes::ObjectId _si
 			&lt;&lt; _sid &lt;&lt; endl;
 
 		return false;
+	}
+	catch(Exception&amp; ex)
+	{
+		unideb[Debug::CRIT] &lt;&lt; myname &lt;&lt; "(getState): " &lt;&lt; ex &lt;&lt; endl;
+		throw ex;
+	}
 }
 // -----------------------------------------------------------------------------
 void <xsl:value-of select="$CLASSNAME"/>_SK::updateOutputs( bool _force )
@@ -303,6 +311,8 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::setMsg( UniSetTypes::ObjectId _code
 
 <xsl:template name="getdata">
 <xsl:param name="output">0</xsl:param>	
+	try
+	{
 <xsl:if test="normalize-space(../../@msg)!='1'">
 <xsl:if test="normalize-space(@name)=$OID">
 <xsl:choose>
@@ -312,8 +322,6 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::setMsg( UniSetTypes::ObjectId _code
 	<xsl:when test="normalize-space(../../@iotype)='AI'">
 		<xsl:call-template name="setprefix"/><xsl:value-of select="../../@name"/> = ui.getValue(<xsl:value-of select="../../@name"/>);
 	</xsl:when>
-</xsl:choose>
-<xsl:choose>
 	<xsl:when test="normalize-space(../../@iotype)='DO'">
 		<xsl:call-template name="setprefix"/><xsl:value-of select="../../@name"/> = ui.getState(<xsl:value-of select="../../@name"/>);
 	</xsl:when>
@@ -323,6 +331,12 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::setMsg( UniSetTypes::ObjectId _code
 </xsl:choose>
 </xsl:if>
 </xsl:if>
+	}
+	catch(Exception&amp; ex)
+	{
+		unideb[Debug::CRIT] &lt;&lt; myname &lt;&lt; "(getdata): " &lt;&lt; ex &lt;&lt; endl;
+		throw ex;
+	}
 </xsl:template>
 
 <xsl:template name="setdata">
@@ -349,6 +363,8 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::setMsg( UniSetTypes::ObjectId _code
 </xsl:template>
 
 <xsl:template name="gensetdata">
+			try
+			{
 <xsl:choose>
 	<xsl:when test="normalize-space(../../@iotype)='DO'">
 				ui.setState( <xsl:value-of select="../../@name"/>, <xsl:call-template name="setprefix"/><xsl:value-of select="../../@name"/>, node_<xsl:value-of select="../../@name"/> );
@@ -367,10 +383,18 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::setMsg( UniSetTypes::ObjectId _code
 				ui.saveValue( si,<xsl:call-template name="setprefix"/><xsl:value-of select="../../@name"/>,UniversalIO::AnalogInput, getId() );
 	</xsl:when>
 </xsl:choose>
+			}
+			catch(Exception&amp; ex)
+			{
+				unideb[Debug::CRIT] &lt;&lt; myname &lt;&lt; "(setdata): " &lt;&lt; ex &lt;&lt; endl;
+				throw ex;
+			}
 </xsl:template>
 
 <xsl:template name="setdata_val">
 <xsl:param name="setval"></xsl:param>
+	try
+	{
 <xsl:choose>
 	<xsl:when test="normalize-space(../../@iotype)='DO'">
 		ui.setState( <xsl:value-of select="../../@name"/>,<xsl:value-of select="$setval"/>,node_<xsl:value-of select="../../@name"/> );
@@ -389,6 +413,12 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::setMsg( UniSetTypes::ObjectId _code
 		ui.saveValue( si,<xsl:value-of select="$setval"/>,UniversalIO::AnalogInput, getId() );
 	</xsl:when>
 </xsl:choose>
+	}
+	catch(Exception&amp; ex)
+	{
+		unideb[Debug::CRIT] &lt;&lt; myname &lt;&lt; "(setdata): " &lt;&lt; ex &lt;&lt; endl;
+		throw ex;
+	}
 </xsl:template>
 
 <xsl:template name="check_changes">

Utilities/codegen/ctl-cpp-cc-alone.xsl

@@ -233,6 +233,8 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::setMsg( UniSetTypes::ObjectId _code
 
 <xsl:template name="getdata">
 <xsl:param name="output">0</xsl:param>	
+	try
+	{
 <xsl:if test="normalize-space(../../@msg)!='1'">
 <xsl:if test="normalize-space(@name)=$OID">
 <xsl:choose>
@@ -253,6 +255,12 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::setMsg( UniSetTypes::ObjectId _code
 </xsl:choose>
 </xsl:if>
 </xsl:if>
+	}
+	catch( Exception&amp; ex )
+	{
+		unideb[Debug::CRIT] &lt;&lt; myname &lt;&lt; "(getdata): " &lt;&lt; ex &lt;&lt; endl;
+		throw ex;
+	}
 </xsl:template>
 
 <xsl:template name="setdata">
@@ -279,6 +287,8 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::setMsg( UniSetTypes::ObjectId _code
 </xsl:template>
 
 <xsl:template name="gensetdata">
+	try
+	{
 <xsl:choose>
 	<xsl:when test="normalize-space(../../@iotype)='DO'">
 		ui.setState( <xsl:value-of select="../../@name"/>, <xsl:call-template name="setprefix"/><xsl:value-of select="../../@name"/> );
@@ -297,10 +307,18 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::setMsg( UniSetTypes::ObjectId _code
 		ui.saveValue( si,<xsl:call-template name="setprefix"/><xsl:value-of select="../../@name"/>,UniversalIO::AnalogInput, getId() );
 	</xsl:when>
 </xsl:choose>
+	}
+	catch( Exception&amp; ex )
+	{
+		unideb[Debug::CRIT] &lt;&lt; myname &lt;&lt; "(setdata): " &lt;&lt; ex &lt;&lt; endl;
+		throw ex;
+	}
 </xsl:template>
 
 <xsl:template name="setdata_val">
 <xsl:param name="setval"></xsl:param>	
+	try
+	{
 <xsl:choose>
 	<xsl:when test="normalize-space(../../@iotype)='DO'">
 		ui.setState( <xsl:value-of select="../../@name"/>,<xsl:value-of select="$setval"/> );
@@ -319,6 +337,13 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::setMsg( UniSetTypes::ObjectId _code
 		ui.saveValue( si,<xsl:value-of select="$setval"/>,UniversalIO::AnalogInput, getId() );
 	</xsl:when>
 </xsl:choose>
+	}
+	catch( Exception&amp; ex )
+	{
+		unideb[Debug::CRIT] &lt;&lt; myname &lt;&lt; "(setdata): " &lt;&lt; ex &lt;&lt; endl;
+		throw ex;
+	}
+
 </xsl:template>
 
 <xsl:template name="check_changes">

Utilities/codegen/ctl-cpp-cc-ask.xsl

@@ -182,24 +182,26 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::askValue( UniSetTypes::ObjectId _si
 // -----------------------------------------------------------------------------
 bool <xsl:value-of select="$CLASSNAME"/>_SK::getState( UniSetTypes::ObjectId _sid )
 {
+	try
+	{
 <xsl:for-each select="//smap/item">
 		if( _sid == <xsl:value-of select="@name"/> &amp;&amp; <xsl:value-of select="@name"/> != DefaultObjectId )
 		{
 	<xsl:choose>
 	<xsl:when test="normalize-space(@iotype)='DI'">
-		<xsl:call-template name="setprefix"/><xsl:value-of select="@name"/> = ui.getState(<xsl:value-of select="@name"/>, node_<xsl:value-of select="@name"/>);
+		<xsl:text>		</xsl:text><xsl:call-template name="setprefix"/><xsl:value-of select="@name"/> = ui.getState(<xsl:value-of select="@name"/>, node_<xsl:value-of select="@name"/>);
 			return <xsl:call-template name="setprefix"/><xsl:value-of select="@name"/>;
 	</xsl:when>
 	<xsl:when test="normalize-space(@iotype)='DO'">
-		<xsl:call-template name="setprefix"/><xsl:value-of select="@name"/> = ui.getState(<xsl:value-of select="@name"/>, node_<xsl:value-of select="@name"/>);
+		<xsl:text>		</xsl:text><xsl:call-template name="setprefix"/><xsl:value-of select="@name"/> = ui.getState(<xsl:value-of select="@name"/>, node_<xsl:value-of select="@name"/>);
 			return <xsl:call-template name="setprefix"/><xsl:value-of select="@name"/>;
 	</xsl:when>
 	<xsl:when test="normalize-space(@iotype)='AO'">
-		<xsl:call-template name="setprefix"/><xsl:value-of select="@name"/> = ui.getValue(<xsl:value-of select="@name"/>, node_<xsl:value-of select="@name"/>);
+		<xsl:text>		</xsl:text><xsl:call-template name="setprefix"/><xsl:value-of select="@name"/> = ui.getValue(<xsl:value-of select="@name"/>, node_<xsl:value-of select="@name"/>);
 			return <xsl:call-template name="setprefix"/><xsl:value-of select="@name"/>;
 	</xsl:when>
 	<xsl:when test="normalize-space(@iotype)='AI'">
-		<xsl:call-template name="setprefix"/><xsl:value-of select="@name"/> = ui.getValue(<xsl:value-of select="@name"/>, node_<xsl:value-of select="@name"/>);
+		<xsl:text>		</xsl:text><xsl:call-template name="setprefix"/><xsl:value-of select="@name"/> = ui.getValue(<xsl:value-of select="@name"/>, node_<xsl:value-of select="@name"/>);
 			return <xsl:call-template name="setprefix"/><xsl:value-of select="@name"/>;
 	</xsl:when>
 	</xsl:choose>
@@ -207,6 +209,12 @@ bool <xsl:value-of select="$CLASSNAME"/>_SK::getState( UniSetTypes::ObjectId _si
 </xsl:for-each>
 		unideb[Debug::CRIT] &lt;&lt; myname &lt;&lt; "(getState): Обращение к неизвестному ДИСКРЕТНОМУ датчику sid="
 			&lt;&lt; _sid &lt;&lt; endl;
+	}
+	catch(Exception&amp; ex)
+	{
+		unideb[Debug::CRIT] &lt;&lt; myname &lt;&lt; "(getState): " &lt;&lt; ex &lt;&lt; endl;
+		throw ex;
+	}
 	
 	return false;
 }
@@ -279,6 +287,8 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::setMsg( UniSetTypes::ObjectId _code
 <xsl:param name="output">0</xsl:param>	
 	if( <xsl:value-of select="@name"/> != DefaultObjectId )
 	{
+		try
+		{
 		<xsl:choose>
 			<xsl:when test="normalize-space(@iotype)='DI'">
 				<xsl:call-template name="setprefix"/><xsl:value-of select="@name"/> = ui.getState(<xsl:value-of select="@name"/>, node_<xsl:value-of select="@name"/>);
@@ -294,11 +304,19 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::setMsg( UniSetTypes::ObjectId _code
 			</xsl:when>
 		</xsl:choose>
 		}
+		catch( UniSetTypes::Exception&amp; ex )
+		{
+			unideb[Debug::CRIT] &lt;&lt; myname &lt;&lt; "(getdata): " &lt;&lt; ex &lt;&lt; endl;
+			throw ex;
+		}
+	}
 </xsl:template>
 
 <xsl:template name="setdata">
 			if( <xsl:value-of select="@name"/> != DefaultObjectId )
 			{
+				try
+				{
 			<xsl:choose>
 			<xsl:when test="normalize-space(@iotype)='DI'">
 					si.id 	= <xsl:value-of select="@name"/>;
@@ -318,12 +336,20 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::setMsg( UniSetTypes::ObjectId _code
 			</xsl:when>
 			</xsl:choose>
 				}
+				catch( UniSetTypes::Exception&amp; ex )
+				{
+					unideb[Debug::CRIT] &lt;&lt; myname &lt;&lt; "(setdata): " &lt;&lt; ex &lt;&lt; endl;
+					throw ex;
+				}
+			}
 </xsl:template>
 
 <xsl:template name="setdata_value">
 <xsl:param name="setval">0</xsl:param>	
 	if( <xsl:value-of select="@name"/> != DefaultObjectId )
 	{
+		try
+		{
 	<xsl:choose>
 		<xsl:when test="normalize-space(@iotype)='DI'">
 			si.id 	= <xsl:value-of select="@name"/>;
@@ -343,6 +369,12 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::setMsg( UniSetTypes::ObjectId _code
 		</xsl:when>
 	</xsl:choose>
 		}
+		catch( UniSetTypes::Exception&amp; ex )
+		{
+			unideb[Debug::CRIT] &lt;&lt; myname &lt;&lt; "(setdata): " &lt;&lt; ex &lt;&lt; endl;
+			throw ex;
+		}
+	}
 </xsl:template>
 
 

Utilities/codegen/ctl-cpp-cc.xsl

@@ -220,6 +220,8 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::setMsg( UniSetTypes::ObjectId code,
 
 <xsl:template name="getdata">
 <xsl:param name="output">0</xsl:param>	
+	try
+	{
 		if( <xsl:value-of select="@name"/> != DefaultObjectId )
 		{
 <xsl:choose>
@@ -239,9 +241,17 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::setMsg( UniSetTypes::ObjectId code,
 	</xsl:when>
 </xsl:choose>
 		}
+	}
+	catch( Exception&amp; ex )
+	{
+		unideb[Debug::CRIT] &lt;&lt; myname &lt;&lt; "(getdata): " &lt;&lt; ex &lt;&lt; endl;
+		throw ex;
+	}
 </xsl:template>
 
 <xsl:template name="setdata">
+	try
+	{
 		if( <xsl:value-of select="@name"/> != DefaultObjectId )
 		{
 <xsl:choose>
@@ -263,10 +273,18 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::setMsg( UniSetTypes::ObjectId code,
 	</xsl:when>
 </xsl:choose>
 		}
+	}
+	catch( Exception&amp; ex )
+	{
+		unideb[Debug::CRIT] &lt;&lt; myname &lt;&lt; "(setdata): " &lt;&lt; ex &lt;&lt; endl;
+		throw ex;
+	}
 </xsl:template>
 
 <xsl:template name="setdata_value">
 <xsl:param name="setval">0</xsl:param>	
+	try
+	{
 		if( <xsl:value-of select="@name"/> != DefaultObjectId )
 		{
 <xsl:choose>
@@ -288,9 +306,17 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::setMsg( UniSetTypes::ObjectId code,
 	</xsl:when>
 </xsl:choose>
 		}
+	}
+	catch( Exception&amp; ex )
+	{
+		unideb[Debug::CRIT] &lt;&lt; myname &lt;&lt; "(setdata): " &lt;&lt; ex &lt;&lt; endl;
+		throw ex;
+	}
 </xsl:template>
 
 <xsl:template name="setmsg_val">
+	try
+	{
 		if( <xsl:value-of select="@name"/> != DefaultObjectId )
 		{
 <xsl:choose>
@@ -312,6 +338,12 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::setMsg( UniSetTypes::ObjectId code,
 	</xsl:when>
 </xsl:choose>
 		}
+	}
+	catch( Exception&amp; ex )
+	{
+		unideb[Debug::CRIT] &lt;&lt; myname &lt;&lt; "(setmsg): " &lt;&lt; ex &lt;&lt; endl;
+		throw ex;
+	}
 </xsl:template>