fda/ch.psi.fda.ui
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added new channel operations bitwise AND and OR

Browse Source
This commit is contained in:
ebner
2013-05-21 14:21:00 +02:00
parent b12968b6ce
commit fb2b07b133
3 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Readme.md
+6
View File
@@ -0,0 +1,6 @@
To build the whole application use:
```Bash
mvn -DskipTests=true --also-make --projects application install
```
fda.ui.ce/src/main/java/ch/psi/fda/ui/ce/panels/model/ChannelActionPanel.form
+6 -4
View File
@@ -1,4 +1,4 @@
<?xml version="1.1" encoding="UTF-8" ?>
<?xml version="1.0" encoding="UTF-8" ?>
<Form version="1.5" maxVersion="1.7" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
<Properties>
@@ -25,12 +25,12 @@
<Layout>
<DimensionLayout dim="0">
<Group type="103" groupAlignment="0" attributes="0">
<Component id="jPanel1" alignment="0" pref="629" max="32767" attributes="0"/>
<Component id="jPanel1" alignment="0" pref="655" max="32767" attributes="0"/>
</Group>
</DimensionLayout>
<DimensionLayout dim="1">
<Group type="103" groupAlignment="0" attributes="0">
<Component id="jPanel1" alignment="0" max="32767" attributes="0"/>
<Component id="jPanel1" alignment="0" pref="32" max="32767" attributes="0"/>
</Group>
</DimensionLayout>
</Layout>
@@ -105,10 +105,12 @@
<Component class="javax.swing.JComboBox" name="jComboBoxOperation">
<Properties>
<Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
<StringArray count="3">
<StringArray count="5">
<StringItem index="0" value="put"/>
<StringItem index="1" value="putq"/>
<StringItem index="2" value="wait"/>
<StringItem index="3" value="waitAND"/>
<StringItem index="4" value="waitOR"/>
</StringArray>
</Property>
<Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
fda.ui.ce/src/main/java/ch/psi/fda/ui/ce/panels/model/ChannelActionPanel.java
+8 -8
View File
@@ -205,7 +205,7 @@ public class ChannelActionPanel extends javax.swing.JPanel implements ObjectProv
jFormattedTextFieldChannel.setPreferredSize(new java.awt.Dimension(180, 28));
jPanel1.add(jFormattedTextFieldChannel);
jLabel2.setFont(new java.awt.Font("Lucida Grande", 1, 13));
jLabel2.setFont(new java.awt.Font("Lucida Grande", 1, 13)); // NOI18N
jLabel2.setLabelFor(jTextFieldValue);
jLabel2.setText(org.openide.util.NbBundle.getMessage(ChannelActionPanel.class, "ChannelActionPanel.jLabel2.text")); // NOI18N
jLabel2.setToolTipText(org.openide.util.NbBundle.getMessage(ChannelActionPanel.class, "ChannelActionPanel.jLabel2.toolTipText")); // NOI18N
@@ -216,17 +216,17 @@ public class ChannelActionPanel extends javax.swing.JPanel implements ObjectProv
jTextFieldValue.setPreferredSize(new java.awt.Dimension(60, 28));
jPanel1.add(jTextFieldValue);
jLabel3.setFont(new java.awt.Font("Lucida Grande", 1, 13));
jLabel3.setFont(new java.awt.Font("Lucida Grande", 1, 13)); // NOI18N
jLabel3.setLabelFor(jComboBoxOperation);
jLabel3.setText(org.openide.util.NbBundle.getMessage(ChannelActionPanel.class, "ChannelActionPanel.jLabel3.text")); // NOI18N
jPanel1.add(jLabel3);
jComboBoxOperation.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "put", "putq", "wait" }));
jComboBoxOperation.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "put", "putq", "wait", "waitAND", "waitOR" }));
jComboBoxOperation.setToolTipText(org.openide.util.NbBundle.getMessage(ChannelActionPanel.class, "ChannelActionPanel.jComboBoxOperation.toolTipText")); // NOI18N
jComboBoxOperation.setName("Operation"); // NOI18N
jPanel1.add(jComboBoxOperation);
jLabel4.setFont(new java.awt.Font("Lucida Grande", 1, 13));
jLabel4.setFont(new java.awt.Font("Lucida Grande", 1, 13)); // NOI18N
jLabel4.setLabelFor(jComboBoxType);
jLabel4.setText(org.openide.util.NbBundle.getMessage(ChannelActionPanel.class, "ChannelActionPanel.jLabel4.text")); // NOI18N
jPanel1.add(jLabel4);
@@ -236,7 +236,7 @@ public class ChannelActionPanel extends javax.swing.JPanel implements ObjectProv
jComboBoxType.setName("Type"); // NOI18N
jPanel1.add(jComboBoxType);
jLabel5.setFont(new java.awt.Font("Lucida Grande", 1, 13));
jLabel5.setFont(new java.awt.Font("Lucida Grande", 1, 13)); // NOI18N
jLabel5.setLabelFor(jFormattedTextFieldTimeout);
jLabel5.setText(org.openide.util.NbBundle.getMessage(ChannelActionPanel.class, "ChannelActionPanel.jLabel5.text")); // NOI18N
jPanel1.add(jLabel5);
@@ -247,7 +247,7 @@ public class ChannelActionPanel extends javax.swing.JPanel implements ObjectProv
jFormattedTextFieldTimeout.setPreferredSize(new java.awt.Dimension(60, 28));
jPanel1.add(jFormattedTextFieldTimeout);
jLabel6.setFont(new java.awt.Font("Lucida Grande", 1, 13));
jLabel6.setFont(new java.awt.Font("Lucida Grande", 1, 13)); // NOI18N
jLabel6.setLabelFor(jFormattedTextFieldDelay);
jLabel6.setText(org.openide.util.NbBundle.getMessage(ChannelActionPanel.class, "ChannelActionPanel.jLabel6.text")); // NOI18N
jPanel1.add(jLabel6);
@@ -268,11 +268,11 @@ public class ChannelActionPanel extends javax.swing.JPanel implements ObjectProv
this.setLayout(layout);
layout.setHorizontalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(jPanel1, javax.swing.GroupLayout.DEFAULT_SIZE, 629, Short.MAX_VALUE)
.addComponent(jPanel1, javax.swing.GroupLayout.DEFAULT_SIZE, 655, Short.MAX_VALUE)
);
layout.setVerticalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(jPanel1, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(jPanel1, javax.swing.GroupLayout.DEFAULT_SIZE, 32, Short.MAX_VALUE)
);
}// </editor-fold>//GEN-END:initComponents