Commit eece015d authored by Locatelli's avatar Locatelli
Browse files

Merge remote-tracking branch 'origin/ploty2' into V3.2_191

parents d932a482 ac99776d
......@@ -1330,7 +1330,5 @@
</storageModule>
<storageModule moduleId="refreshScope"/>
<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
</cproject>
To compile and install the modules:
./build.sh
cd build
make mod
To compile and install the modules:
./build.sh
cd build
make mod
<module name="dif_s">
<controller class="dif_s::LiveCamera"/>
<controller class="dif_s::DirectCamera"/>
<include path="$(NOMAD_HOME)/../NomadModules/src"/>
<link path="/opt/baumer-gapi-sdk/lib" lib="bgapi2_genicam"/>
<link lib="opencv_core"/>
<link lib="opencv_calib3d"/>
<link lib="opencv_highgui"/>
<link path="/opt/pylon/lib" lib="GenApi_gcc_v3_1_Basler_pylon"/>
<link path="/opt/pylon/lib" lib="pylonbase" />
<link path="/opt/pylon/lib" lib="GCBase_gcc_v3_1_Basler_pylon"/>
<link path="/opt/pylon/lib" lib="pylonutility"/>
<link lib="opencv_core"/>
<link lib="opencv_calib3d"/>
<link lib="opencv_highgui"/>
<include path="/opt/baumer-gapi-sdk/include/bgapi2_genicam"/>
<include path="/opt/pylon/include"/>
</module>
<plugin>
<controller type="remote_nanokin" role="remote_nanokin1"/>
<number_of_lines nb_lines="1"/>
</plugin>
<controller_plugin_config type="remote_nanokin">
<image key="FUN_GENERATOR"/>
<settings view="remote_nanokinView.xml"/>
<command view="remote_nanokinCommandView.xml"/>
</controller_plugin_config>
<?xml version="1.0" encoding="ISO-8859-1" ?>
<controller type="remote_nanokin">
<property name="commandStatus" type="int32">
</property>
</controller>
<plugin>
<status role="remote_nanokin1" property="commandStatus" prefix="remote_nanokin.statusPrefix" valuesImagesAndLabels="commandStatusUnknown,commandStatusIdle,commandStatusRunning,commandStatusWarning,commandStatusError"/>
<newLine/>
<button role="remote_nanokin1" command="start" prefix="Start"/>
<button role="remote_nanokin1" command="stop" prefix="Stop"/>
</plugin>
......@@ -99,7 +99,7 @@ void SimulatedPslDriver::read() {
TIFFReadScanline(tif, buf, row, 0);
data = (uint16*) buf;
for(uint32 i = 0; i < w;++i) {
tab[row + i * h] = data[i];
tab[h - row + i * h] = data[i];
sum = sum + data[i];
}
}
......
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