Fix colorSensor generation again

IKhonakhbeeva · IKhonakhbeeva · commit ba69099a20c6 · 2020-10-30T17:38:24.000+03:00
diff --git a/plugins/robots/common/trikKit/src/robotModel/trikRobotModelBase.cpp b/plugins/robots/common/trikKit/src/robotModel/trikRobotModelBase.cpp
@@ -97,7 +97,8 @@ TrikRobotModelBase::TrikRobotModelBase(const QString &kitId, const QString &robo
 	addAllowedConnection(PortInfo("ObjectSensorYPort", input, {}, "objectSensorY"), { objectSensorInfo() });
 	addAllowedConnection(PortInfo("ObjectSensorSizePort", input, {}, "objectSensorSize"), { objectSensorInfo() });
 
-	addAllowedConnection(PortInfo("ColorSensorPort", input, {}, "colorSensor"), { colorSensorInfo() });
+	addAllowedConnection(PortInfo("ColorSensorPort", input, {}, "colorSensor"
+			, PortInfo::ReservedVariableType::vector), { colorSensorInfo() });
 
 	addAllowedConnection(PortInfo("ShellPort", output), { shellInfo() });
 
diff --git a/plugins/robots/generators/trik/trikPythonGeneratorLibrary/templates/videosensors/ColorSensor.t b/plugins/robots/generators/trik/trikPythonGeneratorLibrary/templates/videosensors/ColorSensor.t
@@ -1 +1 @@
-brick.colorSensor("video2").read(2, 2)
+brick.colorSensor("video2").read(2, 2)
diff --git a/plugins/robots/generators/trik/trikQtsGeneratorLibrary/templates/videosensors/ColorSensor.t b/plugins/robots/generators/trik/trikQtsGeneratorLibrary/templates/videosensors/ColorSensor.t
@@ -1 +1 @@
-brick.colorSensor("video2").read(2, 2)
+brick.colorSensor("video2").read(2, 2)
diff --git a/qrtranslations/fr/plugins/robots/trikKit_fr.ts b/qrtranslations/fr/plugins/robots/trikKit_fr.ts
@@ -13,7 +13,7 @@
     <name>trik::robotModel::TrikRobotModelBase</name>
     <message>
         <location filename="../../../../plugins/robots/common/trikKit/src/robotModel/trikRobotModelBase.cpp" line="+91"/>
-        <location line="+196"/>
+        <location line="+197"/>
         <source>Video 2</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/qrtranslations/ru/plugins/robots/trikKit_ru.ts b/qrtranslations/ru/plugins/robots/trikKit_ru.ts
@@ -13,7 +13,7 @@
     <name>trik::robotModel::TrikRobotModelBase</name>
     <message>
         <location filename="../../../../plugins/robots/common/trikKit/src/robotModel/trikRobotModelBase.cpp" line="+91"/>
-        <location line="+196"/>
+        <location line="+197"/>
         <source>Video 2</source>
         <translation type="unfinished"></translation>
     </message>

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-brick.colorSensor("video2").read(2, 2)`
	`1`	`+brick.colorSensor("video2").read(2, 2)`