Skip to content

Commit 4db25aa

Browse files
committed
calcExpr only processes symbols
1 parent 2c17809 commit 4db25aa

1 file changed

Lines changed: 68 additions & 34 deletions

File tree

mercury_ide/patchers/calcExpr.maxpat

Lines changed: 68 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
"fileversion" : 1,
44
"appversion" : {
55
"major" : 8,
6-
"minor" : 1,
7-
"revision" : 3,
6+
"minor" : 2,
7+
"revision" : 2,
88
"architecture" : "x64",
99
"modernui" : 1
1010
}
1111
,
1212
"classnamespace" : "box",
13-
"rect" : [ 908.0, 206.0, 640.0, 480.0 ],
13+
"rect" : [ 766.0, 206.0, 640.0, 480.0 ],
1414
"bglocked" : 0,
1515
"openinpresentation" : 0,
1616
"default_fontsize" : 12.0,
@@ -37,27 +37,40 @@
3737
"tags" : "",
3838
"style" : "",
3939
"subpatcher_template" : "",
40+
"assistshowspatchername" : 0,
4041
"boxes" : [ {
4142
"box" : {
42-
"id" : "obj-1",
43+
"id" : "obj-27",
4344
"maxclass" : "newobj",
44-
"numinlets" : 2,
45-
"numoutlets" : 2,
46-
"outlettype" : [ "", "" ],
47-
"patching_rect" : [ 185.0, 180.0, 60.0, 22.0 ],
48-
"text" : "zl.change"
45+
"numinlets" : 1,
46+
"numoutlets" : 1,
47+
"outlettype" : [ "" ],
48+
"patching_rect" : [ 149.0, 120.0, 57.0, 22.0 ],
49+
"text" : "tosymbol"
4950
}
5051

5152
}
5253
, {
5354
"box" : {
54-
"id" : "obj-86",
55+
"id" : "obj-26",
5556
"maxclass" : "newobj",
5657
"numinlets" : 1,
5758
"numoutlets" : 1,
58-
"outlettype" : [ "" ],
59-
"patching_rect" : [ 174.0, 90.0, 59.0, 22.0 ],
60-
"text" : "tosymbol"
59+
"outlettype" : [ "float" ],
60+
"patching_rect" : [ 90.0, 135.0, 19.0, 22.0 ],
61+
"text" : "t f"
62+
}
63+
64+
}
65+
, {
66+
"box" : {
67+
"id" : "obj-25",
68+
"maxclass" : "newobj",
69+
"numinlets" : 3,
70+
"numoutlets" : 3,
71+
"outlettype" : [ "", "", "" ],
72+
"patching_rect" : [ 90.0, 90.0, 78.0, 22.0 ],
73+
"text" : "route float int"
6174
}
6275

6376
}
@@ -68,7 +81,7 @@
6881
"numinlets" : 1,
6982
"numoutlets" : 2,
7083
"outlettype" : [ "bang", "" ],
71-
"patching_rect" : [ 174.0, 120.0, 30.0, 22.0 ],
84+
"patching_rect" : [ 149.0, 155.0, 30.0, 22.0 ],
7285
"text" : "t b l"
7386
}
7487

@@ -78,10 +91,10 @@
7891
"id" : "obj-78",
7992
"maxclass" : "newobj",
8093
"numinlets" : 1,
81-
"numoutlets" : 2,
82-
"outlettype" : [ "", "" ],
83-
"patching_rect" : [ 185.0, 300.0, 43.0, 22.0 ],
84-
"text" : "jit.spill"
94+
"numoutlets" : 3,
95+
"outlettype" : [ "", "", "" ],
96+
"patching_rect" : [ 160.0, 290.0, 40.0, 22.0 ],
97+
"text" : "jit.iter"
8598
}
8699

87100
}
@@ -92,7 +105,7 @@
92105
"numinlets" : 1,
93106
"numoutlets" : 2,
94107
"outlettype" : [ "jit_matrix", "" ],
95-
"patching_rect" : [ 60.0, 180.0, 113.0, 22.0 ],
108+
"patching_rect" : [ 35.0, 200.0, 113.0, 22.0 ],
96109
"text" : "jit.matrix 1 float64 1"
97110
}
98111

@@ -104,7 +117,7 @@
104117
"numinlets" : 1,
105118
"numoutlets" : 1,
106119
"outlettype" : [ "" ],
107-
"patching_rect" : [ 185.0, 210.0, 81.0, 22.0 ],
120+
"patching_rect" : [ 160.0, 200.0, 81.0, 22.0 ],
108121
"text" : "prepend expr"
109122
}
110123

@@ -116,7 +129,7 @@
116129
"numinlets" : 2,
117130
"numoutlets" : 2,
118131
"outlettype" : [ "jit_matrix", "" ],
119-
"patching_rect" : [ 185.0, 265.0, 46.0, 22.0 ],
132+
"patching_rect" : [ 160.0, 255.0, 46.0, 22.0 ],
120133
"text" : "jit.expr"
121134
}
122135

@@ -130,7 +143,7 @@
130143
"numinlets" : 0,
131144
"numoutlets" : 1,
132145
"outlettype" : [ "" ],
133-
"patching_rect" : [ 174.0, 40.0, 30.0, 30.0 ]
146+
"patching_rect" : [ 90.0, 45.0, 30.0, 30.0 ]
134147
}
135148

136149
}
@@ -142,15 +155,43 @@
142155
"maxclass" : "outlet",
143156
"numinlets" : 1,
144157
"numoutlets" : 0,
145-
"patching_rect" : [ 185.0, 375.0, 30.0, 30.0 ]
158+
"patching_rect" : [ 90.0, 335.0, 30.0, 30.0 ]
146159
}
147160

148161
}
149162
],
150163
"lines" : [ {
151164
"patchline" : {
152-
"destination" : [ "obj-71", 0 ],
153-
"source" : [ "obj-1", 0 ]
165+
"destination" : [ "obj-26", 0 ],
166+
"source" : [ "obj-25", 1 ]
167+
}
168+
169+
}
170+
, {
171+
"patchline" : {
172+
"destination" : [ "obj-26", 0 ],
173+
"source" : [ "obj-25", 0 ]
174+
}
175+
176+
}
177+
, {
178+
"patchline" : {
179+
"destination" : [ "obj-27", 0 ],
180+
"source" : [ "obj-25", 2 ]
181+
}
182+
183+
}
184+
, {
185+
"patchline" : {
186+
"destination" : [ "obj-88", 0 ],
187+
"source" : [ "obj-26", 0 ]
188+
}
189+
190+
}
191+
, {
192+
"patchline" : {
193+
"destination" : [ "obj-83", 0 ],
194+
"source" : [ "obj-27", 0 ]
154195
}
155196

156197
}
@@ -184,7 +225,7 @@
184225
}
185226
, {
186227
"patchline" : {
187-
"destination" : [ "obj-1", 0 ],
228+
"destination" : [ "obj-71", 0 ],
188229
"source" : [ "obj-83", 1 ]
189230
}
190231

@@ -198,14 +239,7 @@
198239
}
199240
, {
200241
"patchline" : {
201-
"destination" : [ "obj-83", 0 ],
202-
"source" : [ "obj-86", 0 ]
203-
}
204-
205-
}
206-
, {
207-
"patchline" : {
208-
"destination" : [ "obj-86", 0 ],
242+
"destination" : [ "obj-25", 0 ],
209243
"source" : [ "obj-87", 0 ]
210244
}
211245

0 commit comments

Comments
 (0)