Commit f0c954bf authored by maybites's avatar maybites
Browse files

GUI fixes and beautifying

parent 9ea7d689
This diff is collapsed.
......@@ -10,7 +10,7 @@
}
,
"classnamespace" : "box",
"rect" : [ 83.0, 304.0, 416.0, 391.0 ],
"rect" : [ 348.0, 265.0, 399.0, 392.0 ],
"bglocked" : 0,
"openinpresentation" : 1,
"default_fontsize" : 12.0,
......@@ -38,14 +38,27 @@
"style" : "",
"subpatcher_template" : "",
"assistshowspatchername" : 0,
"title" : "s > MoCap > channel 0",
"boxes" : [ {
"box" : {
"id" : "obj-38",
"maxclass" : "newobj",
"numinlets" : 2,
"numoutlets" : 1,
"outlettype" : [ "" ],
"patching_rect" : [ 426.0, 427.0, 43.0, 22.0 ],
"text" : "pak s i"
}
}
, {
"box" : {
"id" : "obj-31",
"maxclass" : "newobj",
"numinlets" : 2,
"numoutlets" : 2,
"outlettype" : [ "", "" ],
"patching_rect" : [ 539.0, 469.0, 104.0, 22.0 ],
"patching_rect" : [ 564.0, 487.0, 104.0, 22.0 ],
"text" : "routepass bgcolor"
}
......@@ -111,7 +124,7 @@
"numoutlets" : 0,
"patching_rect" : [ 235.083333333333258, 165.0, 59.0, 26.0 ],
"presentation" : 1,
"presentation_rect" : [ 74.0, 27.0, 324.0, 357.0 ],
"presentation_rect" : [ 72.0, 26.0, 325.0, 366.0 ],
"proportion" : 0.5
}
......@@ -565,7 +578,7 @@
]
}
,
"patching_rect" : [ 531.5, 384.0, 68.0, 22.0 ],
"patching_rect" : [ 540.333333333333485, 371.0, 68.0, 22.0 ],
"saved_object_attributes" : {
"description" : "",
"digest" : "",
......@@ -803,7 +816,7 @@
"numinlets" : 1,
"numoutlets" : 1,
"outlettype" : [ "" ],
"patching_rect" : [ 426.0, 460.0, 75.0, 22.0 ],
"patching_rect" : [ 426.0, 483.0, 75.0, 22.0 ],
"text" : "prepend title"
}
......@@ -815,23 +828,11 @@
"numinlets" : 1,
"numoutlets" : 2,
"outlettype" : [ "", "" ],
"patching_rect" : [ 426.0, 504.0, 67.0, 22.0 ],
"patching_rect" : [ 426.0, 512.0, 67.0, 22.0 ],
"save" : [ "#N", "thispatcher", ";", "#Q", "end", ";" ],
"text" : "thispatcher"
}
}
, {
"box" : {
"id" : "obj-8",
"maxclass" : "newobj",
"numinlets" : 1,
"numoutlets" : 1,
"outlettype" : [ "" ],
"patching_rect" : [ 606.0, 384.0, 77.0, 22.0 ],
"text" : "loadmess #2"
}
}
, {
"box" : {
......@@ -840,8 +841,8 @@
"numinlets" : 2,
"numoutlets" : 1,
"outlettype" : [ "" ],
"patching_rect" : [ 426.0, 432.0, 199.0, 22.0 ],
"text" : "sprintf %s > MoCap > channel %s"
"patching_rect" : [ 426.0, 455.0, 231.0, 22.0 ],
"text" : "sprintf symout %s > MoCap > channel %s"
}
}
......@@ -852,22 +853,10 @@
"numinlets" : 2,
"numoutlets" : 2,
"outlettype" : [ "", "" ],
"patching_rect" : [ 426.0, 403.0, 90.0, 22.0 ],
"patching_rect" : [ 426.0, 398.0, 90.0, 22.0 ],
"text" : "route title"
}
}
, {
"box" : {
"id" : "obj-13",
"maxclass" : "newobj",
"numinlets" : 0,
"numoutlets" : 1,
"outlettype" : [ "" ],
"patching_rect" : [ 426.0, 371.0, 103.0, 22.0 ],
"text" : "receiveC #1_peer"
}
}
, {
"box" : {
......@@ -3046,7 +3035,7 @@
,
"patching_rect" : [ 367.833333333333371, 264.0, 349.083333333333258, 100.0 ],
"presentation" : 1,
"presentation_rect" : [ 74.0, 190.0, 338.0, 194.0 ],
"presentation_rect" : [ 72.0, 190.0, 338.0, 194.0 ],
"varname" : "natnet",
"viewvisibility" : 1
}
......@@ -4522,7 +4511,7 @@
,
"patching_rect" : [ 358.5, 76.75, 354.500000000000114, 52.0 ],
"presentation" : 1,
"presentation_rect" : [ 75.5, 57.0, 336.5, 52.0 ],
"presentation_rect" : [ 73.5, 57.0, 336.5, 52.0 ],
"varname" : "connection",
"viewvisibility" : 1
}
......@@ -5473,7 +5462,7 @@
,
"patching_rect" : [ 361.833333333333371, 177.5, 351.166666666666742, 77.0 ],
"presentation" : 1,
"presentation_rect" : [ 74.0, 111.0, 338.0, 77.0 ],
"presentation_rect" : [ 72.0, 111.0, 338.0, 77.0 ],
"varname" : "localudp",
"viewvisibility" : 1
}
......@@ -6070,7 +6059,7 @@
,
"patching_rect" : [ 358.5, 44.75, 332.166666666666629, 30.0 ],
"presentation" : 1,
"presentation_rect" : [ 74.0, 27.0, 338.0, 26.0 ],
"presentation_rect" : [ 72.0, 27.0, 338.0, 26.0 ],
"varname" : "direction",
"viewvisibility" : 1
}
......@@ -6107,12 +6096,36 @@
"mode" : 0,
"numinlets" : 1,
"numoutlets" : 0,
"patching_rect" : [ 539.0, 500.0, 95.0, 26.0 ],
"patching_rect" : [ 564.0, 518.0, 95.0, 26.0 ],
"presentation" : 1,
"presentation_rect" : [ 74.0, 27.0, 324.0, 361.0 ],
"presentation_rect" : [ 74.0, 27.0, 320.0, 361.0 ],
"proportion" : 0.5
}
}
, {
"box" : {
"id" : "obj-8",
"maxclass" : "newobj",
"numinlets" : 1,
"numoutlets" : 1,
"outlettype" : [ "" ],
"patching_rect" : [ 630.0, 371.0, 77.0, 22.0 ],
"text" : "loadmess #2"
}
}
, {
"box" : {
"id" : "obj-13",
"maxclass" : "newobj",
"numinlets" : 0,
"numoutlets" : 1,
"outlettype" : [ "" ],
"patching_rect" : [ 426.0, 371.0, 103.0, 22.0 ],
"text" : "receiveC #1_peer"
}
}
],
"lines" : [ {
......@@ -6202,15 +6215,15 @@
}
, {
"patchline" : {
"destination" : [ "obj-22", 0 ],
"source" : [ "obj-17", 0 ]
"destination" : [ "obj-31", 0 ],
"source" : [ "obj-17", 1 ]
}
}
, {
"patchline" : {
"destination" : [ "obj-31", 0 ],
"source" : [ "obj-17", 1 ]
"destination" : [ "obj-38", 0 ],
"source" : [ "obj-17", 0 ]
}
}
......@@ -6361,6 +6374,13 @@
"source" : [ "obj-36", 0 ]
}
}
, {
"patchline" : {
"destination" : [ "obj-22", 0 ],
"source" : [ "obj-38", 0 ]
}
}
, {
"patchline" : {
......@@ -6485,7 +6505,7 @@
}
, {
"patchline" : {
"destination" : [ "obj-22", 1 ],
"destination" : [ "obj-38", 1 ],
"source" : [ "obj-8", 0 ]
}
......@@ -6499,16 +6519,16 @@
}
],
"dependency_cache" : [ {
"name" : "receiveR.maxpat",
"bootpath" : "~/Arbeiten/01_projekte/181111_IASpace/01_projekte/20xx_Telematik/01_dev/MQTTQuery/patchers/mockup",
"patcherrelativepath" : "../../../MQTTQuery/patchers/mockup",
"name" : "receiveC.maxpat",
"bootpath" : "~/Arbeiten/01_projekte/181111_IASpace/01_projekte/20xx_Telematik/01_dev/telemersive-gateway/patchers/utils",
"patcherrelativepath" : "../utils",
"type" : "JSON",
"implicit" : 1
}
, {
"name" : "receiveC.maxpat",
"bootpath" : "~/Arbeiten/01_projekte/181111_IASpace/01_projekte/20xx_Telematik/01_dev/telemersive-gateway/patchers/utils",
"patcherrelativepath" : "../utils",
"name" : "receiveR.maxpat",
"bootpath" : "~/Arbeiten/01_projekte/181111_IASpace/01_projekte/20xx_Telematik/01_dev/MQTTQuery/patchers/mockup",
"patcherrelativepath" : "../../../MQTTQuery/patchers/mockup",
"type" : "JSON",
"implicit" : 1
}
......
......@@ -10,7 +10,7 @@
}
,
"classnamespace" : "box",
"rect" : [ 468.0, 244.0, 411.0, 108.0 ],
"rect" : [ 468.0, 244.0, 410.0, 109.0 ],
"bglocked" : 0,
"openinpresentation" : 1,
"default_fontsize" : 12.0,
......@@ -38,7 +38,20 @@
"style" : "",
"subpatcher_template" : "",
"assistshowspatchername" : 0,
"title" : "s > OSC > channel 0",
"boxes" : [ {
"box" : {
"id" : "obj-23",
"maxclass" : "newobj",
"numinlets" : 2,
"numoutlets" : 1,
"outlettype" : [ "" ],
"patching_rect" : [ 259.0, 291.0, 43.0, 22.0 ],
"text" : "pak s i"
}
}
, {
"box" : {
"args" : [ "@size", 60, 60 ],
"bgmode" : 0,
......@@ -76,7 +89,7 @@
"numoutlets" : 0,
"patching_rect" : [ 147.0, 171.0, 59.0, 26.0 ],
"presentation" : 1,
"presentation_rect" : [ 74.0, 27.0, 327.0, 79.0 ],
"presentation_rect" : [ 74.0, 26.0, 331.0, 84.0 ],
"proportion" : 0.5
}
......@@ -439,7 +452,7 @@
"numinlets" : 1,
"numoutlets" : 1,
"outlettype" : [ "" ],
"patching_rect" : [ 259.0, 317.0, 75.0, 22.0 ],
"patching_rect" : [ 259.0, 353.0, 75.0, 22.0 ],
"text" : "prepend title"
}
......@@ -451,7 +464,7 @@
"numinlets" : 1,
"numoutlets" : 2,
"outlettype" : [ "", "" ],
"patching_rect" : [ 259.0, 345.0, 67.0, 22.0 ],
"patching_rect" : [ 259.0, 381.0, 67.0, 22.0 ],
"save" : [ "#N", "thispatcher", ";", "#Q", "end", ";" ],
"text" : "thispatcher"
}
......@@ -476,8 +489,8 @@
"numinlets" : 2,
"numoutlets" : 1,
"outlettype" : [ "" ],
"patching_rect" : [ 259.0, 289.0, 177.0, 22.0 ],
"text" : "sprintf %s > OSC > channel %s"
"patching_rect" : [ 259.0, 325.0, 219.0, 22.0 ],
"text" : "sprintf symout %s > OSC > channel %s"
}
}
......@@ -1416,7 +1429,7 @@
,
"patching_rect" : [ 217.0, 124.0, 324.166666666666742, 77.0 ],
"presentation" : 1,
"presentation_rect" : [ 75.5, 29.0, 336.0, 77.0 ],
"presentation_rect" : [ 75.5, 29.0, 336.0, 72.65625 ],
"varname" : "localudp",
"viewvisibility" : 1
}
......@@ -1433,7 +1446,7 @@
"numoutlets" : 0,
"patching_rect" : [ 446.166666666666742, 330.0, 95.0, 26.0 ],
"presentation" : 1,
"presentation_rect" : [ 74.0, 26.0, 327.0, 78.0 ],
"presentation_rect" : [ 74.0, 26.0, 327.0, 80.0 ],
"proportion" : 0.5
}
......@@ -1506,7 +1519,7 @@
, {
"patchline" : {
"destination" : [ "obj-60", 2 ],
"midpoints" : [ 268.5, 377.0, 253.0, 377.0, 253.0, 258.0, 237.5, 258.0 ],
"midpoints" : [ 268.5, 425.0, 253.0, 425.0, 253.0, 258.0, 237.5, 258.0 ],
"source" : [ "obj-14", 0 ]
}
......@@ -1534,7 +1547,7 @@
}
, {
"patchline" : {
"destination" : [ "obj-22", 0 ],
"destination" : [ "obj-23", 0 ],
"source" : [ "obj-17", 0 ]
}
......@@ -1590,6 +1603,13 @@
"source" : [ "obj-22", 0 ]
}
}
, {
"patchline" : {
"destination" : [ "obj-22", 0 ],
"source" : [ "obj-23", 0 ]
}
}
, {
"patchline" : {
......@@ -1758,7 +1778,7 @@
}
, {
"patchline" : {
"destination" : [ "obj-22", 1 ],
"destination" : [ "obj-23", 1 ],
"source" : [ "obj-8", 0 ]
}
......
......@@ -10,7 +10,7 @@
}
,
"classnamespace" : "box",
"rect" : [ 412.0, 329.0, 399.0, 132.0 ],
"rect" : [ 412.0, 329.0, 404.0, 132.0 ],
"bglocked" : 0,
"openinpresentation" : 1,
"default_fontsize" : 12.0,
......@@ -38,7 +38,20 @@
"style" : "",
"subpatcher_template" : "",
"assistshowspatchername" : 0,
"title" : "s > OSC > channel 0",
"boxes" : [ {
"box" : {
"id" : "obj-20",
"maxclass" : "newobj",
"numinlets" : 2,
"numoutlets" : 1,
"outlettype" : [ "" ],
"patching_rect" : [ 259.0, 288.0, 43.0, 22.0 ],
"text" : "pak s i"
}
}
, {
"box" : {
"id" : "obj-26",
"maxclass" : "newobj",
......@@ -69,7 +82,7 @@
"numinlets" : 2,
"numoutlets" : 2,
"outlettype" : [ "", "" ],
"patching_rect" : [ 454.0, 283.0, 104.0, 22.0 ],
"patching_rect" : [ 437.166666666666742, 265.0, 104.0, 22.0 ],
"text" : "routepass bgcolor"
}
......@@ -203,7 +216,7 @@
"numoutlets" : 0,
"patching_rect" : [ 147.0, 171.0, 59.0, 26.0 ],
"presentation" : 1,
"presentation_rect" : [ 74.0, 28.0, 320.0, 94.0 ],
"presentation_rect" : [ 73.0, 27.0, 323.0, 103.0 ],
"proportion" : 0.5
}
......@@ -361,7 +374,7 @@
"numinlets" : 1,
"numoutlets" : 1,
"outlettype" : [ "" ],
"patching_rect" : [ 259.0, 317.0, 75.0, 22.0 ],
"patching_rect" : [ 259.0, 347.0, 75.0, 22.0 ],
"text" : "prepend title"
}
......@@ -373,7 +386,7 @@
"numinlets" : 1,
"numoutlets" : 2,
"outlettype" : [ "", "" ],
"patching_rect" : [ 259.0, 345.0, 67.0, 22.0 ],
"patching_rect" : [ 259.0, 375.0, 67.0, 22.0 ],
"save" : [ "#N", "thispatcher", ";", "#Q", "end", ";" ],
"text" : "thispatcher"
}
......@@ -398,8 +411,8 @@
"numinlets" : 2,
"numoutlets" : 1,
"outlettype" : [ "" ],
"patching_rect" : [ 259.0, 289.0, 177.0, 22.0 ],
"text" : "sprintf %s > OSC > channel %s"
"patching_rect" : [ 259.0, 319.0, 219.0, 22.0 ],
"text" : "sprintf symout %s > OSC > channel %s"
}
}
......@@ -719,7 +732,7 @@
"mode" : 0,
"numinlets" : 1,
"numoutlets" : 0,
"patching_rect" : [ 454.0, 319.0, 95.0, 26.0 ],
"patching_rect" : [ 437.166666666666742, 291.0, 95.0, 26.0 ],
"presentation" : 1,
"presentation_rect" : [ 74.0, 28.0, 320.0, 99.0 ],
"proportion" : 0.5
......@@ -794,7 +807,7 @@
, {
"patchline" : {
"destination" : [ "obj-60", 2 ],
"midpoints" : [ 268.5, 377.0, 251.0, 377.0, 251.0, 249.0, 233.5, 249.0 ],
"midpoints" : [ 268.5, 406.0, 251.0, 406.0, 251.0, 249.0, 233.5, 249.0 ],
"source" : [ "obj-14", 0 ]
}
......@@ -815,7 +828,7 @@
}
, {
"patchline" : {
"destination" : [ "obj-22", 0 ],
"destination" : [ "obj-20", 0 ],
"source" : [ "obj-17", 0 ]
}
......@@ -833,6 +846,13 @@
"source" : [ "obj-2", 0 ]
}
}
, {
"patchline" : {
"destination" : [ "obj-22", 0 ],
"source" : [ "obj-20", 0 ]
}
}
, {
"patchline" : {
......@@ -990,7 +1010,7 @@
}
, {
"patchline" : {
"destination" : [ "obj-22", 1 ],
"destination" : [ "obj-20", 1 ],
"source" : [ "obj-8", 0 ]
}
......
......@@ -10,7 +10,7 @@
}
,
"classnamespace" : "box",
"rect" : [ 514.0, 309.0, 408.0, 278.0 ],
"rect" : [ 514.0, 309.0, 405.0, 276.0 ],
"bglocked" : 0,
"openinpresentation" : 1,
"default_fontsize" : 12.0,
......@@ -38,7 +38,20 @@
"style" : "",
"subpatcher_template" : "",
"assistshowspatchername" : 0,
"title" : "s > UltraGrid > channel 0",
"boxes" : [ {
"box" : {
"id" : "obj-62",
"maxclass" : "newobj",
"numinlets" : 2,
"numoutlets" : 1,
"outlettype" : [ "" ],
"patching_rect" : [ 579.0, 398.0, 43.0, 22.0 ],
"text" : "pak s i"
}
}
, {
"box" : {
"id" : "obj-63",
"maxclass" : "newobj",
......@@ -120,7 +133,7 @@
"numinlets" : 2,
"numoutlets" : 2,
"outlettype" : [ "", "" ],
"patching_rect" : [ 708.0, 435.0, 104.0, 22.0 ],
"patching_rect" : [ 708.0, 463.0, 104.0, 22.0 ],
"text" : "routepass bgcolor"
}
......@@ -424,7 +437,7 @@
"numoutlets" : 0,
"patching_rect" : [ 85.083333333333258, 232.0, 59.0, 26.0 ],
"presentation" : 1,
"presentation_rect" : [ 74.0, 27.0, 324.0, 243.0 ],
"presentation_rect" : [ 74.0, 26.0, 327.0, 247.0 ],
"proportion" : 0.5
}
......@@ -704,7 +717,7 @@
"numinlets" : 1,
"numoutlets" : 1,
"outlettype" : [ "" ],
"patching_rect" : [ 579.0, 425.0, 75.0, 22.0 ],
"patching_rect" : [ 579.0, 453.0, 75.0, 22.0 ],
"text" : "prepend title"
}
......@@ -716,7 +729,7 @@
"numinlets" : 1,
"numoutlets" : 2,
"outlettype" : [ "", "" ],
"patching_rect" : [ 612.166666666666742, 472.0, 67.0, 22.0 ],
"patching_rect" : [ 597.0, 499.0, 67.0, 22.0 ],
"save" : [ "#N", "thispatcher", ";", "#Q", "end", ";" ],
"text" : "thispatcher"
}
......@@ -729,7 +742,7 @@
"numinlets" : 1,
"numoutlets" : 1,
"outlettype" : [ "" ],
"patching_rect" : [ 759.0, 349.0, 77.0, 22.0 ],
"patching_rect" : [ 748.0, 362.0, 77.0, 22.0 ],
"text" : "loadmess #2"
}
......@@ -741,8 +754,8 @@
"numinlets" : 2,
"numoutlets" : 1,
"outlettype" : [ "" ],
"patching_rect" : [ 579.0, 397.0, 199.0, 22.0 ],
"text" : "sprintf %s > UltraGrid > channel %s"
"patching_rect" : [ 579.0, 425.0, 241.0, 22.0 ],
"text" : "sprintf symout %s > UltraGrid > channel %s"
}
}
......@@ -780,8 +793,6 @@
"patching_rect" : [ 668.999999999999886, 21.5, 56.0, 22.0 ],
"restore" : {
"description" : [ "ultragrid" ],
"enable" : [ 0 ],
"select" : [ 1 ],
"updateMenu" : [ 1 ]
}
,
......@@ -836,7 +847,6 @@
"embed" : 1,
"enablehscroll" : 0,
"enablevscroll" : 0,
"hidden" : 1,
"id" : "obj-32",
"lockeddragscroll" : 0,
"lockedsize" : 0,
......@@ -1083,7 +1093,7 @@
"numoutlets" : 1,
"outlettype" : [ "" ],
"patching_rect" : [ 108.0, 221.0, 103.0, 22.0 ],
"text" : "1935_cche"
"text" : "5941_cche"
}
}
......@@ -3278,6 +3288,7 @@
"embed" : 1,
"enablehscroll" : 0,
"enablevscroll" : 0,
"hidden" : 1,
"id" : "obj-15",
"lockeddragscroll" : 0,
"lockedsize" : 0,
......@@ -3419,7 +3430,7 @@
"outlettype" : [ "", "", "", "" ],
"patching_rect" : [ 22.0, 37.0, 56.0, 22.0 ],
"restore" : {
"type" : [ 1 ]
"type" : [ 0 ]
}
,
"text" : "autopattr",
......@@ -4178,6 +4189,7 @@
"embed" : 1,
"enablehscroll" : 0,
"enablevscroll" : 0,
"hidden" : 1,
"id" : "obj-19",
"lockeddragscroll" : 0,
"lockedsize" : 0,
......@@ -5091,7 +5103,6 @@
"embed" : 1,
"enablehscroll" : 0,
"enablevscroll" : 0,
"hidden" : 1,
"id" : "obj-33",
"lockeddragscroll" : 0,
"lockedsize" : 0,
......@@ -7511,6 +7522,7 @@
}
, {
"box" : {
"hidden" : 1,
"hint" : "This allows you to receive another channel to receive than the default. This way you can recieve a stream you are sending yourself to the gateway server.",
"id" : "obj-7",
"items" : [ "default", ",", "channel", 0, ",", "channel", 1, ",", "channel", 2, ",", "channel", 3, ",", "channel", 4, ",", "channel", 5, ",", "channel", 6, ",", "channel", 7, ",", "channel", 8, ",", "channel", 9 ],
......@@ -7631,7 +7643,7 @@
"patching_rect" : [ 151.125, 495.0, 50.0, 22.0 ],
"presentation" : 1,
"presentation_rect" : [ 0.0, 22.0, 46.0, 22.0 ],
"text" : "1",
"text" : "0",
"textcolor" : [ 0.0, 0.0, 0.0, 1.0 ]
}
......@@ -8277,7 +8289,7 @@