caperren/osurc_mars_rover_2017_2018
1
0
Fork 0
mirror of https://github.com/OSURoboticsClub/Rover_2017_2018.git synced 2025-11-08 18:21:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added UI design svg files

Browse Source
This commit is contained in:
Corwin Perren
2017-12-02 12:33:32 -08:00
parent d0d49b46d2
commit bb7f83463d
5 changed files with 386 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

159
design_reference/RightScreenUI.svg
View File

@@ -1,159 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="1920"
height="1080"
viewBox="0 0 1920 1080"
id="svg2"
version="1.1"
inkscape:version="0.91 r13725"
sodipodi:docname="RightScreenUI.svg">
<defs
id="defs4" />
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="0.7"
inkscape:cx="930.1131"
inkscape:cy="449.62677"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="false"
units="px"
inkscape:window-width="1865"
inkscape:window-height="1056"
inkscape:window-x="55"
inkscape:window-y="24"
inkscape:window-maximized="1" />
<metadata
id="metadata7">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(0,27.637839)">
<rect
style="fill:#d4aa00;fill-rule:evenodd;stroke:#000000;stroke-width:0.99891609px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
id="rect3336"
width="1279.0011"
height="719.0011"
x="640.49945"
y="-27.138403" />
<rect
style="fill:#aa0000"
id="rect3338"
width="640"
height="360"
x="1280"
y="692.36218" />
<rect
style="fill:#008080"
id="rect3338-3"
width="640"
height="360"
x="640"
y="692.36218"
inkscape:transform-center-x="2.8571429"
inkscape:transform-center-y="-60" />
<rect
style="fill:#008033"
id="rect3355"
width="640"
height="720"
x="0"
y="-27.637838" />
<rect
style="fill:#800066"
id="rect3338-3-6"
width="640"
height="360"
x="0"
y="692.36218"
inkscape:transform-center-x="2.8571429"
inkscape:transform-center-y="-60" />
<flowRoot
xml:space="preserve"
id="flowRoot3372"
style="font-style:normal;font-weight:normal;font-size:40px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
transform="translate(23.28418,563.43095)"><flowRegion
id="flowRegion3374"><rect
id="rect3376"
width="402.85715"
height="168.57143"
x="97.14286"
y="-294.28571" /></flowRegion><flowPara
id="flowPara3378"
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:50px;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold';text-align:center;text-anchor:middle">Arm</flowPara><flowPara
id="flowPara3380"
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:50px;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold';text-align:center;text-anchor:middle">Visualization</flowPara></flowRoot> <flowRoot
transform="translate(981.12354,595.44998)"
xml:space="preserve"
id="flowRoot3372-7"
style="font-style:normal;font-weight:normal;font-size:40px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"><flowRegion
id="flowRegion3374-5"><rect
id="rect3376-3"
width="402.85715"
height="168.57143"
x="97.14286"
y="-294.28571" /></flowRegion><flowPara
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:50px;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold';text-align:center;text-anchor:middle"
id="flowPara3453">Main Camera</flowPara></flowRoot> <flowRoot
transform="translate(659.63428,1104.2)"
xml:space="preserve"
id="flowRoot3372-2"
style="font-style:normal;font-weight:normal;font-size:40px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"><flowRegion
id="flowRegion3374-9"><rect
id="rect3376-1"
width="402.85715"
height="168.57143"
x="97.14286"
y="-294.28571" /></flowRegion><flowPara
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:50px;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold';text-align:center;text-anchor:middle"
id="flowPara3459">Secondary Camera</flowPara></flowRoot> <flowRoot
transform="translate(1301.3066,1104.2)"
xml:space="preserve"
id="flowRoot3372-0"
style="font-style:normal;font-weight:normal;font-size:40px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"><flowRegion
id="flowRegion3374-93"><rect
id="rect3376-6"
width="402.85715"
height="168.57143"
x="97.14286"
y="-294.28571" /></flowRegion><flowPara
id="flowPara3380-62"
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:50px;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold';text-align:center;text-anchor:middle">Tertiary Camera</flowPara></flowRoot> <flowRoot
transform="translate(-27.740723,1135.0106)"
xml:space="preserve"
id="flowRoot3372-6"
style="font-style:normal;font-weight:normal;font-size:40px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"><flowRegion
id="flowRegion3374-1"><rect
id="rect3376-8"
width="500"
height="305.71429"
x="97.14286"
y="-294.28571" /></flowRegion><flowPara
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:50px;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold';text-align:center;text-anchor:middle"
id="flowPara3475">Statuses</flowPara></flowRoot> </g>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 7.0 KiB

181
design_reference/UI Design/left_screen.svg Normal file
View File

@@ -0,0 +1,181 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="1920"
height="1080"
viewBox="0 0 1920 1080"
id="svg2"
version="1.1"
inkscape:version="0.91 r13725"
sodipodi:docname="left_screen.svg"
inkscape:export-filename="/home/caperren/caperren@gmail.com/_School/Capstone/1. Fall/left_screen.svg.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90">
<defs
id="defs4" />
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="0.5"
inkscape:cx="805.69335"
inkscape:cy="664.4128"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="false"
units="px"
inkscape:window-width="2560"
inkscape:window-height="1375"
inkscape:window-x="1920"
inkscape:window-y="1080"
inkscape:window-maximized="1" />
<metadata
id="metadata7">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(0,27.637808)">
<rect
style="fill:#ffb380;fill-rule:evenodd;stroke:none;stroke-width:1.28854847px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
id="rect3355"
width="1280"
height="720"
x="640"
y="-27.637808" />
<rect
style="fill:#8080ff;fill-rule:evenodd;stroke:none;stroke-width:1.05599153px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
id="rect3361"
width="640"
height="540"
x="0"
y="-27.637808" />
<rect
style="fill:#ffe680;fill-rule:evenodd;stroke:none;stroke-width:1.05599153px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
id="rect3361-0"
width="640"
height="540"
x="2"
y="512.36218" />
<rect
style="fill:#de8787;fill-rule:evenodd;stroke:none;stroke-width:1.05599153px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
id="rect3361-2"
width="320"
height="360"
x="1600"
y="692.36218" />
<rect
style="fill:#decd87;fill-rule:evenodd;stroke:none;stroke-width:1.05599153px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
id="rect3361-2-3"
width="320"
height="360"
x="1282"
y="692.36218" />
<rect
style="fill:#cd87de;fill-rule:evenodd;stroke:none;stroke-width:1.05599153px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
id="rect3361-2-5"
width="640"
height="360"
x="642"
y="692.36218" />
<flowRoot
xml:space="preserve"
id="flowRoot4195"
style="font-style:normal;font-weight:normal;font-size:90px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
transform="translate(-757.78662,446.94237)"><flowRegion
id="flowRegion4197"><rect
id="rect4199"
width="66.83252"
height="127.25128"
x="1044.4977"
y="-261.48257"
style="font-size:90px" /></flowRegion><flowPara
id="flowPara4201"
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:90px;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold'">1</flowPara></flowRoot> <flowRoot
xml:space="preserve"
id="flowRoot4195-9"
style="font-style:normal;font-weight:normal;font-size:90px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
transform="translate(204.54248,537.53563)"><flowRegion
id="flowRegion4197-2"><rect
id="rect4199-2"
width="66.83252"
height="127.25128"
x="1044.4977"
y="-261.48257"
style="font-size:90px" /></flowRegion><flowPara
id="flowPara4201-8"
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:90px;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold'">2</flowPara></flowRoot> <flowRoot
xml:space="preserve"
id="flowRoot4195-97"
style="font-style:normal;font-weight:normal;font-size:90px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
transform="translate(-753.23779,986.89841)"><flowRegion
id="flowRegion4197-3"><rect
id="rect4199-6"
width="66.83252"
height="127.25128"
x="1044.4977"
y="-261.48257"
style="font-size:90px" /></flowRegion><flowPara
id="flowPara4201-1"
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:90px;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold'">3</flowPara></flowRoot> <flowRoot
xml:space="preserve"
id="flowRoot4195-2"
style="font-style:normal;font-weight:normal;font-size:90px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
transform="translate(-113.76514,1076.9424)"><flowRegion
id="flowRegion4197-9"><rect
id="rect4199-3"
width="66.83252"
height="127.25128"
x="1044.4977"
y="-261.48257"
style="font-size:90px" /></flowRegion><flowPara
id="flowPara4201-19"
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:90px;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold'">4</flowPara></flowRoot> <flowRoot
xml:space="preserve"
id="flowRoot4195-4"
style="font-style:normal;font-weight:normal;font-size:90px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
transform="translate(365.86133,1076.3051)"><flowRegion
id="flowRegion4197-7"><rect
id="rect4199-8"
width="66.83252"
height="127.25128"
x="1044.4977"
y="-261.48257"
style="font-size:90px" /></flowRegion><flowPara
id="flowPara4201-4"
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:90px;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold'">5</flowPara></flowRoot> <flowRoot
xml:space="preserve"
id="flowRoot4195-5"
style="font-style:normal;font-weight:normal;font-size:90px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
transform="translate(683.81738,1076.8545)"><flowRegion
id="flowRegion4197-0"><rect
id="rect4199-36"
width="66.83252"
height="127.25128"
x="1044.4977"
y="-261.48257"
style="font-size:90px" /></flowRegion><flowPara
id="flowPara4201-10"
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:90px;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold'">6</flowPara></flowRoot> </g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 8.2 KiB

178
design_reference/UI Design/right_screen.svg Normal file
View File

@@ -0,0 +1,178 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="1920"
height="1080"
viewBox="0 0 1920 1080"
id="svg2"
version="1.1"
inkscape:version="0.91 r13725"
sodipodi:docname="right_screen.svg">
<defs
id="defs4" />
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="0.5"
inkscape:cx="856.69335"
inkscape:cy="744.4128"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="false"
units="px"
inkscape:window-width="2560"
inkscape:window-height="1375"
inkscape:window-x="1920"
inkscape:window-y="1080"
inkscape:window-maximized="1" />
<metadata
id="metadata7">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(0,27.637808)">
<rect
style="fill:#ffb380;fill-rule:evenodd;stroke:none;stroke-width:1.28854847px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
id="rect3355"
width="1280"
height="720"
x="640"
y="-27.637808" />
<rect
style="fill:#cdde87;fill-rule:evenodd;stroke:none;stroke-width:0.92212087px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
id="rect3357"
width="640"
height="360"
x="1280"
y="692.36218" />
<rect
style="fill:#ffe680;fill-rule:evenodd;stroke:none;stroke-width:0.6692487px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
id="rect3359"
width="640"
height="360"
x="640"
y="692.36218" />
<rect
style="fill:#de8787;fill-rule:evenodd;stroke:none;stroke-width:1.05599153px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
id="rect3361"
width="640"
height="720"
x="0"
y="-27.637808" />
<rect
style="fill:#aa87de;fill-rule:evenodd;stroke:none;stroke-width:0.47325671px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
id="rect3359-3"
width="320"
height="360"
x="0"
y="692.36218" />
<rect
style="fill:#8080ff;fill-rule:evenodd;stroke:none;stroke-width:0.47325671px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
id="rect3359-3-6"
width="320"
height="360"
x="320"
y="692.36218" />
<flowRoot
xml:space="preserve"
id="flowRoot4195"
style="font-style:normal;font-weight:normal;font-size:90px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
transform="translate(-757.78662,536.94237)"><flowRegion
id="flowRegion4197"><rect
id="rect4199"
width="66.83252"
height="127.25128"
x="1044.4977"
y="-261.48257"
style="font-size:90px" /></flowRegion><flowPara
id="flowPara4201"
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:90px;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold'">1</flowPara></flowRoot> <flowRoot
xml:space="preserve"
id="flowRoot4195-7"
style="font-style:normal;font-weight:normal;font-size:90px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
transform="translate(204.54248,537.53563)"><flowRegion
id="flowRegion4197-5"><rect
id="rect4199-3"
width="72.83252"
height="127.25128"
x="1044.4977"
y="-261.48257"
style="font-size:90px" /></flowRegion><flowPara
id="flowPara4201-5"
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:90px;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold'">2</flowPara></flowRoot> <flowRoot
xml:space="preserve"
id="flowRoot4195-6"
style="font-style:normal;font-weight:normal;font-size:90px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
transform="translate(-915.23779,1076.8984)"><flowRegion
id="flowRegion4197-2"><rect
id="rect4199-9"
width="66.83252"
height="127.25128"
x="1044.4977"
y="-261.48257"
style="font-size:90px" /></flowRegion><flowPara
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:90px;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold'"
id="flowPara4275">3</flowPara></flowRoot> <flowRoot
xml:space="preserve"
id="flowRoot4195-2"
style="font-style:normal;font-weight:normal;font-size:90px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
transform="translate(-595.76514,1076.9424)"><flowRegion
id="flowRegion4197-7"><rect
id="rect4199-0"
width="66.83252"
height="127.25128"
x="1044.4977"
y="-261.48257"
style="font-size:90px" /></flowRegion><flowPara
id="flowPara4201-9"
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:90px;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold'">4</flowPara></flowRoot> <flowRoot
xml:space="preserve"
id="flowRoot4195-3"
style="font-style:normal;font-weight:normal;font-size:90px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
transform="translate(-116.13867,1076.3051)"><flowRegion
id="flowRegion4197-6"><rect
id="rect4199-06"
width="66.83252"
height="127.25128"
x="1044.4977"
y="-261.48257"
style="font-size:90px" /></flowRegion><flowPara
id="flowPara4201-2"
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:90px;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold'">5</flowPara></flowRoot> <flowRoot
xml:space="preserve"
id="flowRoot4195-61"
style="font-style:normal;font-weight:normal;font-size:90px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
transform="translate(523.81738,1076.8545)"><flowRegion
id="flowRegion4197-8"><rect
id="rect4199-7"
width="66.83252"
height="127.25128"
x="1044.4977"
y="-261.48257"
style="font-size:90px" /></flowRegion><flowPara
id="flowPara4201-92"
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:90px;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold'">6</flowPara></flowRoot> </g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 8.1 KiB

57
ground_station/.idea/workspace.xml generated
View File

@@ -21,8 +21,8 @@
<file leaf-file-name="RoverGroundStation.py" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/RoverGroundStation.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="408">
<caret line="183" column="25" lean-forward="true" selection-start-line="183" selection-start-column="25" selection-end-line="183" selection-end-column="25" />
<state relative-caret-position="357">
<caret line="84" column="25" lean-forward="false" selection-start-line="84" selection-start-column="25" selection-end-line="84" selection-end-column="25" />
<folding>
<element signature="e#260#270#0" expanded="true" />
</folding>
@@ -47,12 +47,12 @@
</component>
<component name="ProjectFrameBounds">
<option name="x" value="55" />
<option name="y" value="24" />
<option name="width" value="1865" />
<option name="height" value="1056" />
<option name="y" value="52" />
<option name="width" value="1360" />
<option name="height" value="1028" />
</component>
<component name="ProjectView">
<navigator currentView="ProjectPane" proportions="" version="1">
<navigator proportions="" version="1">
<flattenPackages />
<showMembers />
<showModules />
@@ -65,24 +65,7 @@
<manualOrder />
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="ground_station" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="ground_station" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
</subPane>
</pane>
<pane id="Scratches" />
</panes>
<panes />
</component>
<component name="PropertiesComponent">
<property name="WebServerToolWindowFactoryState" value="false" />
@@ -323,28 +306,28 @@
<servers />
</component>
<component name="ToolWindowManager">
<frame x="55" y="24" width="1865" height="1056" extended-state="6" />
<frame x="55" y="52" width="1360" height="1028" extended-state="4" />
<editor active="false" />
<layout>
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.13468939" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.13468939" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32916668" sideWeight="0.50192416" order="7" side_tool="true" content_ui="tabs" />
<window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="File Transfer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32916668" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Python Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32960325" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.41145834" sideWeight="0.49807587" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.18347639" sideWeight="0.49807587" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="File Transfer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32916668" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32960325" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
</layout>
<layout-to-restore>
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
@@ -379,6 +362,16 @@
<watches-manager />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/RoverGroundStation.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding>
<element signature="e#260#270#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$USER_HOME$/.PyCharm2016.3/system/remote_sources/-1418177152/1376253408/cv_bridge/core.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="471">
@@ -396,8 +389,8 @@
</entry>
<entry file="file://$PROJECT_DIR$/RoverGroundStation.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="408">
<caret line="183" column="25" lean-forward="true" selection-start-line="183" selection-start-column="25" selection-end-line="183" selection-end-column="25" />
<state relative-caret-position="357">
<caret line="84" column="25" lean-forward="false" selection-start-line="84" selection-start-column="25" selection-end-line="84" selection-end-column="25" />
<folding>
<element signature="e#260#270#0" expanded="true" />
</folding>

4
ground_station/RoverGroundStation.py
View File

@@ -82,7 +82,7 @@ class VideoTest(QtCore.QThread):
self.pixmap = QtGui.QPixmap.fromImage(qimage2ndarray.array2qimage(self.cv_image))
self.image_ready_signal.emit()
#print "doin stuff"
self.msleep(10)
self.msleep(20)
# TODO: Thread ending message here
def __on_image_update_ready(self):
@@ -176,7 +176,7 @@ class GroundStation(QtCore.QObject):
# Start ROSCORE
self.video_test = VideoTest(self.right_screen.primary_video_label, sub_path="/cam1/usb_cam1/image_raw/compressed")
self.video_test_1 = VideoTest(self.right_screen.secondary_video_label, (640, 360), sub_path="/cam2/usb_cam2/image_raw//compressed")
self.video_test_1 = VideoTest(self.right_screen.secondary_video_label, (640, 360), sub_path="/cam2/usb_cam2/image_raw/compressed")
self.video_test_2 = VideoTest(self.right_screen.tertiary_video_label, (640, 360), sub_path="/zed/right/image_raw_color/compressed")
self.drive_test = DriveTest()