Skip to content

Gm fix bagel #2440

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
joshStillerman merged 16 commits into from
Jan 19, 2022
Merged

Gm fix bagel #2440

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
cc8c159
Fix:change incorrect jScope property file
AndreaRigoni Jul 12, 2021
d0c4d1d
Merge branch 'alpha' of https://github.com/MDSplus/mdsplus into alpha
AndreaRigoni Aug 24, 2021
9959fee
Merge branch 'alpha' of https://github.com/MDSplus/mdsplus into alpha
AndreaRigoni Oct 1, 2021
2782812
Merge branch 'alpha' of https://github.com/MDSplus/mdsplus into alpha
AndreaRigoni Oct 22, 2021
6b71300
Merge branch 'alpha' of https://github.com/MDSplus/mdsplus into alpha
AndreaRigoni Nov 3, 2021
e0880ef
Merge branch 'alpha' of https://github.com/MDSplus/mdsplus into alpha
AndreaRigoni Nov 5, 2021
d70611e
Fix:wrong management of nid data un getXXX() methods
AndreaRigoni Nov 5, 2021
96efba1
Merge branch 'alpha' of https://github.com/MDSplus/mdsplus into alpha
AndreaRigoni Nov 8, 2021
8de28fe
Merge branch 'alpha' of https://github.com/MDSplus/mdsplus into alpha
AndreaRigoni Dec 6, 2021
850b2ee
Merge branch 'alpha' of https://github.com/MDSplus/mdsplus into alpha
AndreaRigoni Jan 6, 2022
04610a8
Fix:correct behavior of downsampling between threads
AndreaRigoni Jan 8, 2022
522ff06
Use PickSampleGAM
AndreaRigoni Jan 9, 2022
455eaf0
Use PickSampleGAM
AndreaRigoni Jan 9, 2022
42ab25c
Same behavior in subsampling also for GAMs
AndreaRigoni Jan 10, 2022
707dc94
Merge branch 'alpha' of https://github.com/MDSplus/mdsplus into gm-fi…
AndreaRigoni Jan 13, 2022
3321fe9
Fix field misalignment
AndreaRigoni Jan 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion java/jdevices/src/main/java/MARTE2_SIMULINK_GENERICSetup.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -885,7 +885,7 @@ private void initComponents() {
deviceField2.setIdentifier("");
deviceField2.setLabelString("Timebase div. (if from another thread):");
deviceField2.setNumCols(4);
deviceField2.setOffsetNid(166);
deviceField2.setOffsetNid(174);
jPanel2.add(deviceField2);

jPanel1.add(jPanel2);
Expand Down
2 changes: 1 addition & 1 deletion java/jdevices/src/main/resources/MARTE2_SIMULINK_GENERICSetup.form
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1459,7 +1459,7 @@
<Property name="identifier" type="java.lang.String" value=""/>
<Property name="labelString" type="java.lang.String" value="Timebase div. (if from another thread):"/>
<Property name="numCols" type="int" value="4"/>
<Property name="offsetNid" type="int" value="166"/>
<Property name="offsetNid" type="int" value="174"/>
</Properties>
</Component>
</SubComponents>
Expand Down