(codegen): Добавил поддержку type='object'

Utilities/codegen/ctl-cpp-common.xsl

@@ -451,6 +451,8 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::waitSM( int wait_msec, ObjectId _te
 <xsl:if test="normalize-space(@type)='double'"><xsl:value-of select="normalize-space(@name)"/>(0),</xsl:if>
 <xsl:if test="normalize-space(@type)='bool'"><xsl:value-of select="normalize-space(@name)"/>(false),</xsl:if>
 <xsl:if test="normalize-space(@type)='str'"><xsl:value-of select="normalize-space(@name)"/>(""),</xsl:if>
+<xsl:if test="normalize-space(@type)='sensor'"><xsl:value-of select="normalize-space(@name)"/>(DefaultObjectId),</xsl:if>
+<xsl:if test="normalize-space(@type)='object'"><xsl:value-of select="normalize-space(@name)"/>(DefaultObjectId),</xsl:if>
 </xsl:if>
 </xsl:template>
 <xsl:template name="init-variables">
@@ -472,6 +474,12 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::waitSM( int wait_msec, ObjectId _te
 <xsl:if test="normalize-space(@type)='str'">
 <xsl:value-of select="normalize-space(@name)"/>(init3_str(uniset_conf()->getArgParam("--" + argprefix + "<xsl:value-of select="@name"/>"),uniset_conf()->getProp(cnode,"<xsl:value-of select="@name"/>"),"<xsl:value-of select="normalize-space(@default)"/>")),
 </xsl:if>
+<xsl:if test="normalize-space(@type)='sensor'">
+<xsl:value-of select="normalize-space(@name)"/>(uniset_conf()->getSensorID(init3_str(uniset_conf()->getArgParam("--" + argprefix + "<xsl:value-of select="@name"/>"),uniset_conf()->getProp(cnode,"<xsl:value-of select="@name"/>"),"<xsl:value-of select="normalize-space(@default)"/>"))),
+</xsl:if>
+<xsl:if test="normalize-space(@type)='object'">
+<xsl:value-of select="normalize-space(@name)"/>(uniset_conf()->getObjectID(init3_str(uniset_conf()->getArgParam("--" + argprefix + "<xsl:value-of select="@name"/>"),uniset_conf()->getProp(cnode,"<xsl:value-of select="@name"/>"),"<xsl:value-of select="normalize-space(@default)"/>"))),
+</xsl:if>
 </xsl:template>
 
 <xsl:template name="COMMON-CC-HEAD">
@@ -622,6 +630,11 @@ end_private(false)
 
     mylog = make_shared&lt;DebugStream&gt;();
 	mylog-&gt;setLogName(myname);
+	{
+		ostringstream s;
+		s &lt;&lt; myname &lt;&lt; "-log";
+		conf->initDebug(mylog,s.str());
+	}
 
 <xsl:for-each select="//smap/item">
 	<xsl:if test="normalize-space(@no_check_id)!='1'">
@@ -947,6 +960,11 @@ askPause(uniset_conf()->getPIntProp(cnode,"askPause",2000))
 
 	mylog = make_shared&lt;DebugStream&gt;();
 	mylog-&gt;setLogName(myname);
+    {
+        ostringstream s;
+        s &lt;&lt; myname &lt;&lt; "-log";
+        conf->initDebug(mylog, s.str());
+    }
     	
 	si.node = conf->getLocalNode();
 

Utilities/codegen/ctl-cpp-h.xsl

@@ -88,7 +88,7 @@ class <xsl:value-of select="$CLASSNAME"/>_SK:
 		</xsl:text>
 		<xsl:for-each select="//variables/item">
         <xsl:if test="normalize-space(@public)!=''">
-		<xsl:if test="normalize-space(@const)!=''">const </xsl:if>
+    		<xsl:if test="normalize-space(@type)!=''"><xsl:if test="normalize-space(@const)!=''">const </xsl:if></xsl:if>
 		<xsl:if test="normalize-space(@type)='int'">int <xsl:value-of select="@name"/>; /*!&lt; <xsl:value-of select="@comment"/> */
 		</xsl:if>
 		<xsl:if test="normalize-space(@type)='long'">long <xsl:value-of select="@name"/>; /*!&lt; <xsl:value-of select="@comment"/> */
@@ -101,6 +101,10 @@ class <xsl:value-of select="$CLASSNAME"/>_SK:
 		</xsl:if>
 		<xsl:if test="normalize-space(@type)='str'">std::string <xsl:value-of select="@name"/>; /*!&lt; <xsl:value-of select="@comment"/> */
 		</xsl:if>
+		<xsl:if test="normalize-space(@type)='sensor'">UniSetTypes::ObjectId <xsl:value-of select="@name"/>; /*!&lt; <xsl:value-of select="@comment"/> */
+		</xsl:if>
+		<xsl:if test="normalize-space(@type)='object'">UniSetTypes::ObjectId <xsl:value-of select="@name"/>; /*!&lt; <xsl:value-of select="@comment"/> */
+		</xsl:if>
 		</xsl:if>
 		</xsl:for-each>
 		// --- end of public variables ---
@@ -112,7 +116,7 @@ class <xsl:value-of select="$CLASSNAME"/>_SK:
 		<xsl:for-each select="//variables/item">
         <xsl:if test="normalize-space(@private)=''">
 		<xsl:if test="normalize-space(@public)=''">
-		<xsl:if test="normalize-space(@const)!=''">const </xsl:if>
+		<xsl:if test="normalize-space(@type)!=''"><xsl:if test="normalize-space(@const)!=''">const </xsl:if></xsl:if>
 		<xsl:if test="normalize-space(@type)='int'">int <xsl:value-of select="@name"/>; /*!&lt; <xsl:value-of select="@comment"/> */
 		</xsl:if>
 		<xsl:if test="normalize-space(@type)='long'">long <xsl:value-of select="@name"/>; /*!&lt; <xsl:value-of select="@comment"/> */
@@ -125,6 +129,10 @@ class <xsl:value-of select="$CLASSNAME"/>_SK:
 		</xsl:if>
 		<xsl:if test="normalize-space(@type)='str'">std::string <xsl:value-of select="@name"/>; /*!&lt; <xsl:value-of select="@comment"/> */
 		</xsl:if>
+		<xsl:if test="normalize-space(@type)='sensor'">UniSetTypes::ObjectId <xsl:value-of select="@name"/>; /*!&lt; <xsl:value-of select="@comment"/> */
+		</xsl:if>
+		<xsl:if test="normalize-space(@type)='object'">UniSetTypes::ObjectId <xsl:value-of select="@name"/>; /*!&lt; <xsl:value-of select="@comment"/> */
+		</xsl:if>
 		</xsl:if>
 		</xsl:if>
 		</xsl:for-each>
@@ -150,6 +158,8 @@ class <xsl:value-of select="$CLASSNAME"/>_SK:
 		</xsl:if>
 		<xsl:if test="normalize-space(@type)='str'">std::string <xsl:value-of select="@name"/>; /*!&lt; <xsl:value-of select="@comment"/> */
 		</xsl:if>
+		<xsl:if test="normalize-space(@type)='sensor'">UniSetTypes::ObjectId <xsl:value-of select="@name"/>; /*!&lt; <xsl:value-of select="@comment"/> */
+		</xsl:if>
 		</xsl:if>
 		</xsl:for-each>// --- end of private variables ---