Skip to content
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

Jump to bottom

Rework "environment" figure to be more detailed #101

Merged
merged 8 commits into from
Jul 3, 2024
Merged

Rework "environment" figure to be more detailed #101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
42ede64
Added USB connection to go from curdes to personal computer
yarikoptic May 30, 2024
8fae03d
Moved personal computer outside of the operator
yarikoptic May 30, 2024
00659f4
Some intermediate madness with more connections etc
yarikoptic Jun 14, 2024
4fc7633
Helper rules to build png and svg for any dot
yarikoptic Jun 14, 2024
961a395
added splitters and trying to make it somehow work
yarikoptic Jun 14, 2024
3b053fd
"Final" version of the schematic for ReproFlow
yarikoptic Jun 14, 2024
cbb76c3
Ignore .png from git for now -- too big to carrry changes; there is svg
yarikoptic Jun 14, 2024
7d174f2
Merge remote-tracking branch 'origin/master' into enh-environment-dot
yarikoptic Jun 14, 2024
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
1 change: 1 addition & 0 deletions docs/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
environment.png
9 changes: 7 additions & 2 deletions docs/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,7 @@
environment.png: environment.dot
dot -Tpng environment.dot -o environment.png
all: environment.png environment.svg

%.png: %.dot
dot -Tpng "$<" -o "$@"

%.svg: %.dot
dot -Tsvg "$<" -o "$@"
266 changes: 172 additions & 94 deletions docs/environment.dot
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,65 +1,98 @@
digraph graphname {
//newrank=true;
size="14,8";
graph [fontname = "sans", margin=0, splines=spline];
rankdir="LR";
// size="14,8";
graph [
fontname = "sans", margin=0, splines=spline,
// pad="1",
nodesep="1",
ranksep="1.5"
];
rankdir="TB";
node [fontname = "sans", style=filled];
edge [fontname = "sans", color=gray50];
ntp[label="NTP Server", shape=ellipse, fillcolor="#90B0FF", color=none, fontcolor=gray95]
aud[
label =<<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="grey96">
ntp[label=" NTP Server ", shape=none, fillcolor="#90B0FF", color=none, fontcolor=gray95]

// mag for "magewell"
mag1[
label =<<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="grey96" COLOR="white">
<TR>
<TD PORT="a">Audio/Video converter</TD>
<TD PORT="usb">USB</TD>
</TR>
<TD PORT="a">Audio/Video Converter #1<br/>(for ReproStim)</TD>
<TD PORT="dvi">DVI</TD>
<TD PORT="aux">AUX</TD>
</TR>
</TABLE>>
fillcolor=none;
shape=none;
color="#DDDDDD",
fillcolor="white";
shape=box;
color="#00FF00",
];
eve[
label =<<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="grey96">
label =<<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="grey96" COLOR="white">
<TR>
<TD> Event Recorder </TD>
<TD PORT="usb">USB</TD>
<TD> MicroPython <br/>Event Recorder</TD>
</TR>
</TABLE>>
fillcolor=none;
shape=none;
color="#DDDDDD",
</TABLE>>;
fillcolor="white";
shape=box;
color="#00FF00",
];
dat[label=" Data Integrator ", shape=box, color="#BBBBBB", fillcolor=grey93];
pac[
label =<<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="grey96">
dat[label="Data Capture Server", shape=none, fillcolor="#90B0FF", color=none, fontcolor=gray95];
dat[
label =<<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" COLOR="white">
<TR>
<TD PORT="a"> PACS Server </TD>
<TD PORT="usb">USB</TD>
<TD PORT="a"> ReproIn-er<BR/>(Meta)data Capture Server</TD>
<TD PORT="eth">ETH</TD>
</TR>
</TABLE>>
fillcolor=none;
shape=none;
color="#DDDDDD",
</TABLE>>;
fillcolor="#90B0FF";
shape=box;
color="#00FF00",
];
bid[label="BIDS Converter", shape=box, color="#BBBBBB", fillcolor=grey93];
dis[
label =<<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="grey96">

// shape=box, color="#BBBBBB", fillcolor=grey93];
pac[label=" PACS Server ", shape=none, fillcolor="#90B0FF", color=none, fontcolor=gray95];
// pac[
// label =<<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="grey96">
// <TR>
// <TD PORT="a"> PACS Server </TD>
// <TD PORT="eth">ETH</TD>
// </TR>
// </TABLE>>
// fillcolor="white";
// shape=none;
// color="#DDDDDD",
// ];
bid[label="ReproIn Server\n(BIDS Converter)", shape=box, fillcolor="#90B0FF", color="#00FF00", fontcolor=gray95];
// shape=box, color="#BBBBBB", fillcolor=grey93];
mag2[
label =<<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="grey96" COLOR="white">
<TR>
<TD PORT="a"> Display Converter </TD>
<TD PORT="usb">USB</TD>
</TR>
<TD PORT="a">Audio/Video Converter #2<br/>(for con/noisseur)</TD>
<TD PORT="aux">AUX</TD>
<TD PORT="dvi">DVI</TD>
<TD PORT="usb">USB</TD> // swap of usb and dvi leads to jump

</TR>

</TABLE>>
fillcolor=none;
shape=none;
color="#DDDDDD",
fillcolor="white";
shape=box;
color="#00FF00",
];
rec[
label =<<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="grey96">
<TR>
<TD PORT="a">Response Collector<BR/><FONT COLOR="#999999">(Current Designs)</FONT></TD>
<TD PORT="ttl">Parallel<BR/>TTL</TD>
<TD PORT="a">Response Collector<BR/><FONT COLOR="#999999">(Current Designs, Birch)</FONT></TD>
<TD PORT="ttl">36 PIN<BR/>TTL</TD>
<TD PORT="optictrig">Optic<BR/>Trigger</TD>
<TD PORT="opticresp">Optic<BR/>Responses</TD>
<TD PORT="usb">USB</TD>
<TD PORT="eth">ETH</TD>
</TR>
</TABLE>>
fillcolor=none;
</TABLE>>;
fillcolor="white";
shape=none;
color="#DDDDDD",
];
Expand All @@ -69,46 +102,29 @@ digraph graphname {
color=red;
margin=10;

per[
label =<<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="grey96">
<TR><TD ROWSPAN="3">Personal Computer</TD></TR>
<TR>
<TD PORT="vga">VGA</TD>
</TR>
<TR>
<TD PORT="aux">AUX</TD>
</TR>
</TABLE>>
fillcolor=none;
shape=none;
color="#DDDDDD",
];
mrm[label="MRI Monitor", shape=box, color="#DDDDDD", fillcolor=grey96, fontcolor="#AAAAAA"];

mrm[label=" MRI Monitor ", shape=box, color="#DDDDDD", fillcolor=grey96, fontcolor="#AAAAAA"];
mri[
label =<<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="grey96">
<TR><TD ROWSPAN="4"> MRI System <BR/><FONT COLOR="#999999">(Siemens)</FONT></TD></TR>
<TR>
<TD PORT="dvi">DVI</TD>
</TR>
<TR>
<TD PORT="optic">optic</TD>
</TR>
<TR>
<TD PORT="eth">ETH</TD>
</TR>
</TABLE>>
fillcolor=none,
shape=none,
color="#DDDDDD",
label=<<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" COLOR="white">
<TR><TD COLSPAN="3">MRI System</TD></TR>
<TR>
<TD PORT="optic">optic</TD>
<TD PORT="dvi">DVI</TD>
<TD PORT="eth">ETH</TD>
</TR>
</TABLE>>;
fillcolor="#90B0FF";
shape=box;
color="#DDDDDD";
];
ale[label=" Alert Monitor ", shape=box, color="#DDDDDD", fillcolor=grey96, fontcolor="#AAAAAA"];
}
ale[label="Metadata Entry and Alert\nDesktop", shape=none, fillcolor="#90B0FF", color=none, fontcolor=gray95];
dvisplit[label="DVI\nSplitter", shape=oval, style=dashed, color="#00FF00"];
}

subgraph cluster_subject {
label="Subject";
fontcolor="#22AA22";
color="#22AA22";
fontcolor="#888822";
color="#888822";
margin=10;

vid[label=" Video Projector ", shape=box, color="#DDDDDD", fillcolor=grey96, fontcolor="#AAAAAA"];
Expand All @@ -120,35 +136,97 @@ digraph graphname {
<TD PORT="optic">optic</TD>
</TR>
</TABLE>>
fillcolor=none;
fillcolor="white";
shape=none;
color="#DDDDDD",
];
}

subgraph cluster_experimenter {
label="Experimenter";
fontcolor="#22AA22";
color="#22AA22";
margin=10;

per[
label =<<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="grey96">
<TR>
<TD PORT="usb">USB</TD>
<TD ROWSPAN="2">Experimenter<br/>Laptop</TD>
<TD PORT="eth">ETH</TD>
</TR>
<TR>
<TD PORT="vga">VGA</TD>
<TD PORT="aux">AUX</TD>
</TR>
</TABLE>>
fillcolor="white";
shape=none;
color="#DDDDDD",
];

srm[label="Scanner Room Monitor", shape=box, color="#DDDDDD", fillcolor=grey96, fontcolor="#AAAAAA"];

}


subgraph cluster_legend {
label="ReproFlow Legend";
fontcolor="black";
color="#22AA22";
margin=10;

reproadd[label="ReproNim added", shape=box, color="#00FF00", fillcolor=white];
server[label="Server/Desktop", shape=box, color="white", fillcolor="#90B0FF"];

}

mri:dvi:n -> mrm[constraint=false];
per:vga -> vid;
per:aux:e -> hea;
mri:optic -> rec:a;
res:optic -> rec:a;
rec:ttl -> eve;
eve:usb -> dat:w;
mri:dvi:e -> dis:a;
per:vga -> aud:a:w[weight=5];
per:aux:e -> aud:a:w;
mri:eth -> pac:a;
pac:eth:e -> bid;
dat -> bid;
dis:usb -> dat:w;
ntp -> dat[label="WiFi ", color="#5588FF", fontcolor="#5588FF"];
aud:usb -> dat:w;
dat -> ale[weight=3];
vgasplit[label="VGA\nSplitter", shape=oval, style=dashed, color="#00FF00"];
auxsplit[label="Audio\nSplitter", shape=oval, style=dashed, color="#00FF00"];

mri:dvi -> dvisplit[color="#228822"];
dvisplit -> mrm[//constraint=false,
color="#228822"];
dvisplit -> mag2:dvi[color="#228822"];

per:vga -> vgasplit[label="Video Stimuli", color="#228822", fontcolor="#228822"];
vgasplit -> srm[color="#228822"];
vgasplit -> vid[color="#228822"];
vgasplit -> mag1:dvi[color="#228822",
];

per:aux -> auxsplit[label="Audio Stimuli", color="#228822", fontcolor="#228822"];
auxsplit -> hea[color="#228822"];
auxsplit -> mag1:aux[color="#228822"];

rec:usb -> per:usb[label="events\n(trigger pulse,\nresponses)"];
dat:eth -> rec:eth[label="NTP", color="#5588FF", fontcolor="#5588FF"];
rec:eth -> dat:eth[label="events", color="#5588FF", fontcolor="#5588FF"];
mri:optic -> rec:optictrig[label="trigger pulse" color="#FFC1C3" fontcolor="#FFC1C3"];
res:optic -> rec:opticresp[label="responses" color="#FFC1C3" fontcolor="#FFC1C3" dir=both, arrowtail=dot];
rec:ttl -> eve[label="events\n(trigger pulse,\nresponses)"];
eve:usb -> dat:usb;
mri:eth -> pac:w[color="#5588FF", fontcolor="#5588FF"];
pac:e -> bid:w[color="#5588FF", fontcolor="#5588FF"];
dat:eth -> bid[label="events,\nstimuli", color="#5588FF", fontcolor="#5588FF"];
mag2:usb -> dat:usb;
ntp -> dat:eth[label="NTP",
color="#5588FF", fontcolor="#5588FF"];
mag1:usb -> dat:usb;
dat:eth -> ale[//label="ReproMon alerts",
color="#5588FF", fontcolor="#5588FF"];
bid -> per:eth[label="BIDS Dataset", color="#5588FF", fontcolor="#5588FF"];
ntp -> per:eth[label="NTP",
color="#5588FF", fontcolor="#5588FF", style="dotted"];
//{ rank=same; op1; op2; }
{ rank=same; aud; rec; dis; pac; eve}
//{ rank=same; aud; rec; dis; pac; vid; hea; res }
//{ rank=same; aud; rec; dis; pac; hea; vid; res}
// { rank=same; mag1; rec; mag2; pac; eve}
//{ rank=same; mag1; rec; mag2; pac; vid; hea; res }
//{ rank=same; mag1; rec; mag2; pac; hea; vid; res}
//{ rank=same; mri; pac; }
{ rank=same; ntp; dat; bid; }
// { rank=same; ntp; dat; bid; }
{ rank=same; pac; ntp; bid; }
// { rank=same; eve; rec; }
{ rank=same; mag1; per; } // laptop and recording nearby
//{ rank=same; dvi; aux; vga; }
//{ rank=same; per; mri; mrm; vid; hea; res; }
//{ rank=same; cluster_subject; cluster_operator; }
Expand Down
Binary file removed docs/environment.png
View file
Open in desktop
Binary file not shown.
Loading
Loading