Skip to content
GitLab
Commit 9ea7d689 authored by maybites's avatar maybites
Browse files

update GUI 

fix peer info to dynamically loaded devices
parent ddf7c390
Expand all Hide whitespace changes
Inline Side-by-side
patchers/devices/deviceMC_button.maxpat
View file @ 9ea7d689
......@@ -107,7 +107,7 @@
}
, {
"box" : {
"args" : [ "@size", 25, 25, "@colorON", 1.0, 0.626032, 0.149606, 1.0, "@colorOFF", 0.695364, 0.0, 0.0377, 1.0 ],
"args" : [ "@size", 25, 25 ],
"bgmode" : 0,
"border" : 0,
"clickthrough" : 0,
......@@ -118,7 +118,7 @@
"lockedsize" : 0,
"maxclass" : "bpatcher",
"name" : "deviceMC_icon.maxpat",
"numinlets" : 1,
"numinlets" : 2,
"numoutlets" : 2,
"offset" : [ 0.0, 0.0 ],
"outlettype" : [ "int", "" ],
......@@ -161,8 +161,8 @@
"numinlets" : 0,
"numoutlets" : 1,
"outlettype" : [ "" ],
"patching_rect" : [ 99.0, 187.0, 60.0, 22.0 ],
"text" : "r #1_peer"
"patching_rect" : [ 99.0, 187.0, 103.0, 22.0 ],
"text" : "receiveC #1_peer"
}
}
......@@ -299,6 +299,13 @@
}
],
"dependency_cache" : [ {
"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" : "deviceMC_icon.maxpat",
"bootpath" : "~/Arbeiten/01_projekte/181111_IASpace/01_projekte/20xx_Telematik/01_dev/telemersive-gateway/patchers/devices",
"patcherrelativepath" : ".",
......@@ -347,8 +354,6 @@
, {
"name" : "rnbodefault",
"default" : {
"color" : [ 0.929412, 0.929412, 0.352941, 1.0 ],
"fontname" : [ "Lato" ],
"bgfillcolor" : {
"type" : "color",
"color" : [ 0.031372549019608, 0.125490196078431, 0.211764705882353, 1.0 ],
......@@ -359,11 +364,13 @@
"autogradient" : 0.0
}
,
"fontname" : [ "Lato" ],
"accentcolor" : [ 0.343034118413925, 0.506230533123016, 0.86220508813858, 1.0 ],
"bgcolor" : [ 0.031372549019608, 0.125490196078431, 0.211764705882353, 1.0 ],
"color" : [ 0.929412, 0.929412, 0.352941, 1.0 ],
"elementcolor" : [ 0.357540726661682, 0.515565991401672, 0.861786782741547, 1.0 ],
"stripecolor" : [ 0.258338063955307, 0.352425158023834, 0.511919498443604, 1.0 ],
"fontsize" : [ 12.0 ]
"fontsize" : [ 12.0 ],
"bgcolor" : [ 0.031372549019608, 0.125490196078431, 0.211764705882353, 1.0 ]
}
,
"parentstyle" : "",
......@@ -372,7 +379,7 @@
, {
"name" : "rnbohighcontrast",
"default" : {
"color" : [ 1.0, 0.874509803921569, 0.141176470588235, 1.0 ],
"editing_bgcolor" : [ 0.258823529411765, 0.258823529411765, 0.258823529411765, 1.0 ],
"bgfillcolor" : {
"type" : "color",
"color" : [ 0.0, 0.0, 0.0, 1.0 ],
......@@ -385,14 +392,14 @@
,
"selectioncolor" : [ 0.301960784313725, 0.694117647058824, 0.949019607843137, 1.0 ],
"locked_bgcolor" : [ 0.258823529411765, 0.258823529411765, 0.258823529411765, 1.0 ],
"editing_bgcolor" : [ 0.258823529411765, 0.258823529411765, 0.258823529411765, 1.0 ],
"accentcolor" : [ 0.666666666666667, 0.666666666666667, 0.666666666666667, 1.0 ],
"bgcolor" : [ 0.0, 0.0, 0.0, 1.0 ],
"textcolor" : [ 1.0, 1.0, 1.0, 1.0 ],
"color" : [ 1.0, 0.874509803921569, 0.141176470588235, 1.0 ],
"elementcolor" : [ 0.223386004567146, 0.254748553037643, 0.998085916042328, 1.0 ],
"clearcolor" : [ 1.0, 1.0, 1.0, 0.0 ],
"textcolor" : [ 1.0, 1.0, 1.0, 1.0 ],
"stripecolor" : [ 0.258823529411765, 0.258823529411765, 0.258823529411765, 1.0 ],
"fontsize" : [ 13.0 ],
"bgcolor" : [ 0.0, 0.0, 0.0, 1.0 ],
"textcolor_inverse" : [ 1.0, 1.0, 1.0, 1.0 ]
}
,
......
patchers/devices/deviceMC_icon.maxpat
View file @ 9ea7d689
......@@ -10,7 +10,7 @@
}
,
"classnamespace" : "box",
"rect" : [ 332.0, 417.0, 676.0, 480.0 ],
"rect" : [ 526.0, 325.0, 784.0, 480.0 ],
"bglocked" : 0,
"openinpresentation" : 1,
"default_fontsize" : 12.0,
......@@ -39,6 +39,43 @@
"subpatcher_template" : "",
"assistshowspatchername" : 0,
"boxes" : [ {
"box" : {
"id" : "obj-25",
"maxclass" : "message",
"numinlets" : 2,
"numoutlets" : 1,
"outlettype" : [ "" ],
"patching_rect" : [ 674.0, 196.0, 139.0, 22.0 ],
"text" : "0.834646 0.271511 0. 1."
}
}
, {
"box" : {
"id" : "obj-40",
"maxclass" : "newobj",
"numinlets" : 1,
"numoutlets" : 1,
"outlettype" : [ "" ],
"patching_rect" : [ 674.0, 225.0, 109.0, 22.0 ],
"text" : "prepend bgoncolor"
}
}
, {
"box" : {
"comment" : "",
"id" : "obj-23",
"index" : 0,
"maxclass" : "inlet",
"numinlets" : 0,
"numoutlets" : 1,
"outlettype" : [ "" ],
"patching_rect" : [ 506.0, 29.0, 30.0, 30.0 ]
}
}
, {
"box" : {
"id" : "obj-13",
"maxclass" : "newobj",
......@@ -415,8 +452,8 @@
"numinlets" : 2,
"numoutlets" : 1,
"outlettype" : [ "" ],
"patching_rect" : [ 590.0, 162.0, 105.0, 22.0 ],
"text" : "0. 0.5 0.265625 1."
"patching_rect" : [ 590.0, 162.0, 125.0, 22.0 ],
"text" : "0.695364 0. 0.0377 1."
}
}
......@@ -439,8 +476,8 @@
"numinlets" : 2,
"numoutlets" : 1,
"outlettype" : [ "" ],
"patching_rect" : [ 560.0, 114.0, 119.0, 22.0 ],
"text" : "0. 0.875 0.300781 1."
"patching_rect" : [ 560.0, 114.0, 139.0, 22.0 ],
"text" : "1. 0.626032 0.149606 1."
}
}
......@@ -450,6 +487,7 @@
"dataname" : "",
"draggable" : 1,
"filename" : "Sink.svg",
"hidden" : 1,
"hint" : "Send stream to machine in local LAN",
"id" : "obj-21",
"ignoreclick" : 1,
......@@ -1065,6 +1103,7 @@
"dataname" : "",
"draggable" : 1,
"filename" : "DownLocal.svg",
"hidden" : 1,
"hint" : "",
"id" : "obj-19",
"ignoreclick" : 1,
......@@ -1084,6 +1123,7 @@
"dataname" : "",
"draggable" : 1,
"filename" : "UpLocal.svg",
"hidden" : 1,
"hint" : "",
"id" : "obj-20",
"ignoreclick" : 1,
......@@ -1300,6 +1340,13 @@
"source" : [ "obj-22", 0 ]
}
}
, {
"patchline" : {
"destination" : [ "obj-3", 0 ],
"source" : [ "obj-23", 0 ]
}
}
, {
"patchline" : {
......@@ -1307,6 +1354,13 @@
"source" : [ "obj-24", 0 ]
}
}
, {
"patchline" : {
"destination" : [ "obj-40", 0 ],
"source" : [ "obj-25", 0 ]
}
}
, {
"patchline" : {
......@@ -1488,6 +1542,13 @@
"source" : [ "obj-4", 1 ]
}
}
, {
"patchline" : {
"destination" : [ "obj-1", 0 ],
"source" : [ "obj-40", 0 ]
}
}
, {
"patchline" : {
......@@ -1520,6 +1581,14 @@
, {
"patchline" : {
"destination" : [ "obj-11", 0 ],
"order" : 1,
"source" : [ "obj-5", 0 ]
}
}
, {
"patchline" : {
"destination" : [ "obj-25", 0 ],
"order" : 0,
"source" : [ "obj-5", 0 ]
}
......@@ -1528,7 +1597,7 @@
, {
"patchline" : {
"destination" : [ "obj-7", 0 ],
"order" : 1,
"order" : 2,
"source" : [ "obj-5", 0 ]
}
......@@ -1592,6 +1661,43 @@
"dependency_cache" : [ ],
"autosave" : 0,
"styles" : [ {
"name" : "AudioStatus_Menu",
"default" : {
"bgfillcolor" : {
"type" : "color",
"color" : [ 0.294118, 0.313726, 0.337255, 1 ],
"color1" : [ 0.454902, 0.462745, 0.482353, 0.0 ],
"color2" : [ 0.290196, 0.309804, 0.301961, 1.0 ],
"angle" : 270.0,
"proportion" : 0.39,
"autogradient" : 0
}
}
,
"parentstyle" : "",
"multi" : 0
}
, {
"name" : "Jamoma_highlighted_orange",
"default" : {
"accentcolor" : [ 1.0, 0.5, 0.0, 1.0 ]
}
,
"parentstyle" : "",
"multi" : 0
}
, {
"name" : "STYLE1",
"parentstyle" : "",
"multi" : 0
}
, {
"name" : "jpatcher001",
"parentstyle" : "",
"multi" : 0
}
, {
"name" : "rnbodefault",
"default" : {
"color" : [ 0.929412, 0.929412, 0.352941, 1.0 ],
......
patchers/devices/deviceMC_view.maxpat
View file @ 9ea7d689
This diff is collapsed.
patchers/devices/deviceOSC_button.maxpat
View file @ 9ea7d689
......@@ -107,7 +107,7 @@
}
, {
"box" : {
"args" : [ "@size", 25, 25, "@colorON", 0.212598, 0.672707, 1.0, 1.0, "@colorOFF", 0.04181, 0.0, 0.86755, 1.0 ],
"args" : [ "@size", 25, 25 ],
"bgmode" : 0,
"border" : 0,
"clickthrough" : 0,
......@@ -118,7 +118,7 @@
"lockedsize" : 0,
"maxclass" : "bpatcher",
"name" : "deviceOSC_icon.maxpat",
"numinlets" : 1,
"numinlets" : 2,
"numoutlets" : 2,
"offset" : [ 0.0, 0.0 ],
"outlettype" : [ "int", "" ],
......@@ -161,8 +161,8 @@
"numinlets" : 0,
"numoutlets" : 1,
"outlettype" : [ "" ],
"patching_rect" : [ 124.0, 130.0, 60.0, 22.0 ],
"text" : "r #1_peer"
"patching_rect" : [ 124.0, 130.0, 103.0, 22.0 ],
"text" : "receiveC #1_peer"
}
}
......@@ -298,6 +298,13 @@
}
],
"dependency_cache" : [ {
"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" : "deviceOSC_icon.maxpat",
"bootpath" : "~/Arbeiten/01_projekte/181111_IASpace/01_projekte/20xx_Telematik/01_dev/telemersive-gateway/patchers/devices",
"patcherrelativepath" : ".",
......@@ -346,8 +353,6 @@
, {
"name" : "rnbodefault",
"default" : {
"color" : [ 0.929412, 0.929412, 0.352941, 1.0 ],
"fontname" : [ "Lato" ],
"bgfillcolor" : {
"type" : "color",
"color" : [ 0.031372549019608, 0.125490196078431, 0.211764705882353, 1.0 ],
......@@ -358,11 +363,13 @@
"autogradient" : 0.0
}
,
"fontname" : [ "Lato" ],
"accentcolor" : [ 0.343034118413925, 0.506230533123016, 0.86220508813858, 1.0 ],
"bgcolor" : [ 0.031372549019608, 0.125490196078431, 0.211764705882353, 1.0 ],
"color" : [ 0.929412, 0.929412, 0.352941, 1.0 ],
"elementcolor" : [ 0.357540726661682, 0.515565991401672, 0.861786782741547, 1.0 ],
"stripecolor" : [ 0.258338063955307, 0.352425158023834, 0.511919498443604, 1.0 ],
"fontsize" : [ 12.0 ]
"fontsize" : [ 12.0 ],
"bgcolor" : [ 0.031372549019608, 0.125490196078431, 0.211764705882353, 1.0 ]
}
,
"parentstyle" : "",
......@@ -371,7 +378,7 @@
, {
"name" : "rnbohighcontrast",
"default" : {
"color" : [ 1.0, 0.874509803921569, 0.141176470588235, 1.0 ],
"editing_bgcolor" : [ 0.258823529411765, 0.258823529411765, 0.258823529411765, 1.0 ],
"bgfillcolor" : {
"type" : "color",
"color" : [ 0.0, 0.0, 0.0, 1.0 ],
......@@ -384,14 +391,14 @@
,
"selectioncolor" : [ 0.301960784313725, 0.694117647058824, 0.949019607843137, 1.0 ],
"locked_bgcolor" : [ 0.258823529411765, 0.258823529411765, 0.258823529411765, 1.0 ],
"editing_bgcolor" : [ 0.258823529411765, 0.258823529411765, 0.258823529411765, 1.0 ],
"accentcolor" : [ 0.666666666666667, 0.666666666666667, 0.666666666666667, 1.0 ],
"bgcolor" : [ 0.0, 0.0, 0.0, 1.0 ],
"textcolor" : [ 1.0, 1.0, 1.0, 1.0 ],
"color" : [ 1.0, 0.874509803921569, 0.141176470588235, 1.0 ],
"elementcolor" : [ 0.223386004567146, 0.254748553037643, 0.998085916042328, 1.0 ],
"clearcolor" : [ 1.0, 1.0, 1.0, 0.0 ],
"textcolor" : [ 1.0, 1.0, 1.0, 1.0 ],
"stripecolor" : [ 0.258823529411765, 0.258823529411765, 0.258823529411765, 1.0 ],
"fontsize" : [ 13.0 ],
"bgcolor" : [ 0.0, 0.0, 0.0, 1.0 ],
"textcolor_inverse" : [ 1.0, 1.0, 1.0, 1.0 ]
}
,
......
patchers/devices/deviceOSC_icon.maxpat
View file @ 9ea7d689
......@@ -10,7 +10,7 @@
}
,
"classnamespace" : "box",
"rect" : [ 363.0, 158.0, 622.0, 325.0 ],
"rect" : [ 363.0, 158.0, 852.0, 380.0 ],
"bglocked" : 0,
"openinpresentation" : 1,
"default_fontsize" : 12.0,
......@@ -39,6 +39,43 @@
"subpatcher_template" : "",
"assistshowspatchername" : 0,
"boxes" : [ {
"box" : {
"id" : "obj-22",
"maxclass" : "message",
"numinlets" : 2,
"numoutlets" : 1,
"outlettype" : [ "" ],
"patching_rect" : [ 728.0, 110.0, 139.0, 22.0 ],
"text" : "0.052632 0.359294 1. 1."
}
}
, {
"box" : {
"id" : "obj-24",
"maxclass" : "newobj",
"numinlets" : 1,
"numoutlets" : 1,
"outlettype" : [ "" ],
"patching_rect" : [ 728.0, 140.0, 109.0, 22.0 ],
"text" : "prepend bgoncolor"
}
}
, {
"box" : {
"comment" : "",
"id" : "obj-21",
"index" : 0,
"maxclass" : "inlet",
"numinlets" : 0,
"numoutlets" : 1,
"outlettype" : [ "" ],
"patching_rect" : [ 402.5, 4.0, 30.0, 30.0 ]
}
}
, {
"box" : {
"comment" : "",
"id" : "obj-20",
......@@ -57,8 +94,8 @@
"numinlets" : 2,
"numoutlets" : 1,
"outlettype" : [ "" ],
"patching_rect" : [ 602.0, 110.0, 105.0, 22.0 ],
"text" : "0. 0.5 0.265625 1."
"patching_rect" : [ 602.0, 110.0, 125.0, 22.0 ],
"text" : "0.04181 0. 0.86755 1."
}
}
......@@ -69,8 +106,8 @@
"numinlets" : 2,
"numoutlets" : 1,
"outlettype" : [ "" ],
"patching_rect" : [ 572.0, 82.0, 119.0, 22.0 ],
"text" : "0. 0.875 0.300781 1."
"patching_rect" : [ 572.0, 82.0, 139.0, 22.0 ],
"text" : "0.212598 0.672707 1. 1."
}
}
......@@ -105,7 +142,7 @@
"numinlets" : 2,
"numoutlets" : 2,
"outlettype" : [ "", "" ],
"patching_rect" : [ 365.75, 34.0, 86.0, 22.0 ],
"patching_rect" : [ 365.75, 42.0, 86.0, 22.0 ],
"text" : "routepass size"
}
......@@ -117,7 +154,7 @@
"numinlets" : 1,
"numoutlets" : 2,
"outlettype" : [ "", "" ],
"patching_rect" : [ 312.75, 4.0, 72.0, 22.0 ],
"patching_rect" : [ 312.75, 12.0, 72.0, 22.0 ],
"text" : "patcherargs"
}
......@@ -189,7 +226,7 @@
"numinlets" : 1,
"numoutlets" : 1,
"outlettype" : [ "" ],
"patching_rect" : [ 229.0, 46.0, 70.0, 22.0 ],
"patching_rect" : [ 229.0, 54.0, 70.0, 22.0 ],
"text" : "loadmess 0"
}
......@@ -458,7 +495,7 @@
, {
"patchline" : {
"destination" : [ "obj-16", 0 ],
"order" : 0,
"order" : 1,
"source" : [ "obj-19", 0 ]
}
......@@ -466,10 +503,39 @@
, {
"patchline" : {
"destination" : [ "obj-18", 0 ],
"order" : 1,
"order" : 2,
"source" : [ "obj-19", 0 ]
}
}
, {
"patchline" : {
"destination" : [ "obj-22", 0 ],
"order" : 0,
"source" : [ "obj-19", 0 ]
}
}
, {
"patchline" : {
"destination" : [ "obj-11", 0 ],
"source" : [ "obj-21", 0 ]
}
}
, {
"patchline" : {
"destination" : [ "obj-24", 0 ],
"source" : [ "obj-22", 0 ]
}
}
, {
"patchline" : {
"destination" : [ "obj-7", 0 ],
"source" : [ "obj-24", 0 ]
}
}
, {
"patchline" : {
......@@ -605,9 +671,47 @@
"dependency_cache" : [ ],
"autosave" : 0,
"styles" : [ {
"name" : "AudioStatus_Menu",
"default" : {
"bgfillcolor" : {
"type" : "color",
"color" : [ 0.294118, 0.313726, 0.337255, 1 ],
"color1" : [ 0.454902, 0.462745, 0.482353, 0.0 ],
"color2" : [ 0.290196, 0.309804, 0.301961, 1.0 ],
"angle" : 270.0,
"proportion" : 0.39,
"autogradient" : 0
}
}
,
"parentstyle" : "",
"multi" : 0
}
, {
"name" : "Jamoma_highlighted_orange",
"default" : {
"accentcolor" : [ 1.0, 0.5, 0.0, 1.0 ]
}
,
"parentstyle" : "",
"multi" : 0
}
, {
"name" : "STYLE1",
"parentstyle" : "",
"multi" : 0
}
, {
"name" : "jpatcher001",
"parentstyle" : "",
"multi" : 0
}
, {
"name" : "rnbodefault",
"default" : {
"color" : [ 0.929412, 0.929412, 0.352941, 1.0 ],
"fontname" : [ "Lato" ],
"bgfillcolor" : {
"type" : "color",
"color" : [ 0.031372549019608, 0.125490196078431, 0.211764705882353, 1.0 ],
......@@ -618,12 +722,11 @@
"autogradient" : 0.0
}
,
"stripecolor" : [ 0.258338063955307, 0.352425158023834, 0.511919498443604, 1.0 ],
"bgcolor" : [ 0.031372549019608, 0.125490196078431, 0.211764705882353, 1.0 ],
"fontsize" : [ 12.0 ],
"accentcolor" : [ 0.343034118413925, 0.506230533123016, 0.86220508813858, 1.0 ],
"bgcolor" : [ 0.031372549019608, 0.125490196078431, 0.211764705882353, 1.0 ],
"elementcolor" : [ 0.357540726661682, 0.515565991401672, 0.861786782741547, 1.0 ],
"fontname" : [ "Lato" ]
"stripecolor" : [ 0.258338063955307, 0.352425158023834, 0.511919498443604, 1.0 ],
"fontsize" : [ 12.0 ]
}
,
"parentstyle" : "",
......@@ -632,8 +735,6 @@
, {
"name" : "rnbohighcontrast",
"default" : {
"locked_bgcolor" : [ 0.258823529411765, 0.258823529411765, 0.258823529411765, 1.0 ],
"textcolor_inverse" : [ 1.0, 1.0, 1.0, 1.0 ],
"color" : [ 1.0, 0.874509803921569, 0.141176470588235, 1.0 ],
"bgfillcolor" : {
"type" : "color",
......@@ -645,15 +746,17 @@
"autogradient" : 0.0
}
,
"textcolor" : [ 1.0, 1.0, 1.0, 1.0 ],
"stripecolor" : [ 0.258823529411765, 0.258823529411765, 0.258823529411765, 1.0 ],
"bgcolor" : [ 0.0, 0.0, 0.0, 1.0 ],
"fontsize" : [ 13.0 ],
"selectioncolor" : [ 0.301960784313725, 0.694117647058824, 0.949019607843137, 1.0 ],
"locked_bgcolor" : [ 0.258823529411765, 0.258823529411765, 0.258823529411765, 1.0 ],
"editing_bgcolor" : [ 0.258823529411765, 0.258823529411765, 0.258823529411765, 1.0 ],
"accentcolor" : [ 0.666666666666667, 0.666666666666667, 0.666666666666667, 1.0 ],
"bgcolor" : [ 0.0, 0.0, 0.0, 1.0 ],
"textcolor" : [ 1.0, 1.0, 1.0, 1.0 ],
"elementcolor" : [ 0.223386004567146, 0.254748553037643, 0.998085916042328, 1.0 ],
"editing_bgcolor" : [ 0.258823529411765, 0.258823529411765, 0.258823529411765, 1.0 ],
"clearcolor" : [ 1.0, 1.0, 1.0, 0.0 ],
"selectioncolor" : [ 0.301960784313725, 0.694117647058824, 0.949019607843137, 1.0 ]
"stripecolor" : [ 0.258823529411765, 0.258823529411765, 0.258823529411765, 1.0 ],
"fontsize" : [ 13.0 ],
"textcolor_inverse" : [ 1.0, 1.0, 1.0, 1.0 ]
}
,
"parentstyle" : "",
......
patchers/devices/deviceOSC_view.maxpat
View file @ 9ea7d689
......@@ -10,7 +10,7 @@
}
,
"classnamespace" : "box",
"rect" : [ 650.0, 177.0, 411.0, 108.0 ],
"rect" : [ 468.0, 244.0, 411.0, 108.0 ],
"bglocked" : 0,
"openinpresentation" : 1,
"default_fontsize" : 12.0,
......@@ -40,7 +40,7 @@
"assistshowspatchername" : 0,
"boxes" : [ {
"box" : {
"args" : [ "@size", 60, 60, "@colorON", 0.212598, 0.672707, 1.0, 1.0, "@colorOFF", 0.04181, 0.0, 0.86755, 1.0 ],
"args" : [ "@size", 60, 60 ],
"bgmode" : 0,
"border" : 0,
"clickthrough" : 0,
......@@ -51,7 +51,7 @@
"lockedsize" : 0,