Skip to content
Snippets Groups Projects
Commit 0df5dfeb authored by Ludovic Apvrille's avatar Ludovic Apvrille
Browse files

Merge branch 'diplodocus_ch_data_types' into 'master'

Eliminated data types that are not standard in C, for DIPLODOCUS data channels

See merge request !47
parents 36793d28 959d15ef
No related branches found
No related tags found
1 merge request!47Eliminated data types that are not standard in C, for DIPLODOCUS data channels
......@@ -50,13 +50,8 @@ package ui.tmlcd;
*/
public abstract class TMLDataFlowType {
public static final String UINT_16 = "uint_16";
public static final String UINT_32 = "uint_32";
public static final String UINT_64 = "uint_64";
public static final String INT_16 = "int_16";
public static final String INT_32 = "int_32";
public static final String INT_64 = "int_64";
public static final String CPX_32 = "cpx_32";
public static final String CPX_64 = "cpx_64";
public static final String INT_16 = "int16_t";
public static final String INT_32 = "int32_t";
public static final String INT_64 = "int64_t";
}
......@@ -188,14 +188,9 @@ public class JDialogTMLCompositePort extends JDialogBase implements ActionListen
int i;
Vector<String> dataFlowTypes = new Vector<>();
dataFlowTypes.add( TMLDataFlowType.UINT_16 );
dataFlowTypes.add( TMLDataFlowType.UINT_32 );
dataFlowTypes.add( TMLDataFlowType.UINT_64 );
dataFlowTypes.add( TMLDataFlowType.INT_16 );
dataFlowTypes.add( TMLDataFlowType.INT_32 );
dataFlowTypes.add( TMLDataFlowType.INT_64 );
dataFlowTypes.add( TMLDataFlowType.CPX_32 );
dataFlowTypes.add( TMLDataFlowType.CPX_64 );
Container c = getContentPane();
GridBagLayout gridbag0 = new GridBagLayout();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment