Commit f324d15b authored by Ludovic Apvrille's avatar Ludovic Apvrille

Merge branch 'new_merge' into 'master'

New merge

See merge request !147
parents d699954b 858f03b9
<?xml version="1.0" encoding="UTF-8"?>
<TURTLEGMODELING version="1.0beta">
<Modeling type="SystemC-AMS" nameTab="SystemC_AMS" >
<SysCAMSComponentTaskDiagramPanel name="SystemC-AMS Component Diagram" minX="10" maxX="2500" minY="10" maxY="1500" TDF="true" DE="true" zoom="1.0" >
<CONNECTOR type="1601" id="1" >
<cdparam x="605" y="294" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="connector" />
<P1 x="605" y="294" id="2" />
<P2 x="700" y="294" id="21" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<COMPONENT type="1607" id="48" >
<cdparam x="342" y="148" />
<sizeparam width="663" height="284" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="Composite component" value="module_test" />
<TGConnectingPoint num="0" id="40" />
<TGConnectingPoint num="1" id="41" />
<TGConnectingPoint num="2" id="42" />
<TGConnectingPoint num="3" id="43" />
<TGConnectingPoint num="4" id="44" />
<TGConnectingPoint num="5" id="45" />
<TGConnectingPoint num="6" id="46" />
<TGConnectingPoint num="7" id="47" />
</COMPONENT>
<SUBCOMPONENT type="1602" id="20" >
<father id="48" num="0" />
<cdparam x="392" y="213" />
<sizeparam width="200" height="150" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="463" minY="0" maxY="134" />
<infoparam name="Primitive component - Block TDF" value="Block_TDF_0" />
<TGConnectingPoint num="0" id="12" />
<TGConnectingPoint num="1" id="13" />
<TGConnectingPoint num="2" id="14" />
<TGConnectingPoint num="3" id="15" />
<TGConnectingPoint num="4" id="16" />
<TGConnectingPoint num="5" id="17" />
<TGConnectingPoint num="6" id="18" />
<TGConnectingPoint num="7" id="19" />
<extraparam>
<Attribute period="1.0" time="s" processCode="void processing() {
}
" constructorCode="" listStruct="" nameTemplate="" typeTemplate="int" valueTemplate="" listTypedef="" />
</extraparam>
</SUBCOMPONENT>
<SUBCOMPONENT type="1604" id="11" >
<father id="20" num="0" />
<cdparam x="579" y="281" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="137" />
<infoparam name="Primitive port - Port TDF" value="sensorOut" />
<TGConnectingPoint num="0" id="2" />
<TGConnectingPoint num="1" id="3" />
<TGConnectingPoint num="2" id="4" />
<TGConnectingPoint num="3" id="5" />
<TGConnectingPoint num="4" id="6" />
<TGConnectingPoint num="5" id="7" />
<TGConnectingPoint num="6" id="8" />
<TGConnectingPoint num="7" id="9" />
<TGConnectingPoint num="8" id="10" />
<extraparam>
<Prop commName="sensorOut" commType="0" origin="1" period="-1.0" time="s" rate="-1" delay="-1" type="int" />
</extraparam>
</SUBCOMPONENT>
<SUBCOMPONENT type="1602" id="39" >
<father id="48" num="1" />
<cdparam x="713" y="214" />
<sizeparam width="200" height="150" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="463" minY="0" maxY="134" />
<infoparam name="Primitive component" value="analog_to_digital" />
<TGConnectingPoint num="0" id="31" />
<TGConnectingPoint num="1" id="32" />
<TGConnectingPoint num="2" id="33" />
<TGConnectingPoint num="3" id="34" />
<TGConnectingPoint num="4" id="35" />
<TGConnectingPoint num="5" id="36" />
<TGConnectingPoint num="6" id="37" />
<TGConnectingPoint num="7" id="38" />
<extraparam>
<Attribute period="1.0" time="s" processCode="void processing() {
int res;
int s = 1;
int step;
double in=0.0;
double maxVoltage=0.01;
using namespace std;
for(step=0; step &lt; s; step++) {
in =+1.0;
}
res = lround((in/maxVoltage)*(1&lt;&lt;(5-1)));
}
" constructorCode="" listStruct="" nameTemplate="" typeTemplate="int" valueTemplate="" listTypedef="" />
</extraparam>
</SUBCOMPONENT>
<SUBCOMPONENT type="1604" id="30" >
<father id="39" num="0" />
<cdparam x="700" y="281" />
<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="137" />
<infoparam name="Primitive port" value="sensorIn" />
<TGConnectingPoint num="0" id="21" />
<TGConnectingPoint num="1" id="22" />
<TGConnectingPoint num="2" id="23" />
<TGConnectingPoint num="3" id="24" />
<TGConnectingPoint num="4" id="25" />
<TGConnectingPoint num="5" id="26" />
<TGConnectingPoint num="6" id="27" />
<TGConnectingPoint num="7" id="28" />
<TGConnectingPoint num="8" id="29" />
<extraparam>
<Prop commName="sensorIn" commType="0" origin="0" period="-1.0" time="s" rate="1" delay="0" type="int" />
</extraparam>
</SUBCOMPONENT>
</SysCAMSComponentTaskDiagramPanel>
</Modeling>
</TURTLEGMODELING>
\ No newline at end of file
......@@ -97,6 +97,7 @@ import ui.avatarsmd.*;
import ui.diplodocusmethodology.DiplodocusMethodologyDiagramPanel;
import ui.ebrdd.EBRDDPanel;
import ui.eln.ELNDiagramPanel;
import ui.syscams.SysCAMSComponentTaskDiagramPanel;
import ui.ftd.FaultTreeDiagramPanel;
import ui.iod.InteractionOverviewDiagramPanel;
import ui.ncdd.NCDiagramPanel;
......@@ -6466,10 +6467,10 @@ public class GTURTLEModeling {
((AvatarCDPanel) tdp).setConnectorsToFront();
}
/*if (tdp instanceof SysCAMSComponentTaskDiagramPanel) {
if (tdp instanceof SysCAMSComponentTaskDiagramPanel) {
//TraceManager.addDev("Connectors...");
((SysCAMSComponentTaskDiagramPanel) tdp).setConnectorsToFront();
}*/
}
if (tdp instanceof ELNDiagramPanel) {
// TraceManager.addDev("Connectors...");
......
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