Skip to content
Snippets Groups Projects
Commit 913d8266 authored by Louis James's avatar Louis James
Browse files

starting exposure

parent 5935d575
Branches
No related merge requests found
Hide whitespace changes
Inline Side-by-side
bin/data/settings.xml
+ 19
− 19
View file @ 913d8266
......@@ -6,11 +6,11 @@
<maxAreaRadius>16</maxAreaRadius>
<trackHue>0</trackHue>
<threshold>
<r>34</r>
<g>83</g>
<b>73</b>
<r>50</r>
<g>101</g>
<b>91</b>
</threshold>
<thresh>36.000000000</thresh>
<thresh>29.923469543</thresh>
</contourFinder>
<contourFinder>
<minArea>0</minArea>
......@@ -19,11 +19,11 @@
<maxAreaRadius>20</maxAreaRadius>
<trackHue>0</trackHue>
<threshold>
<r>8</r>
<g>78</g>
<b>137</b>
<r>14</r>
<g>103</g>
<b>157</b>
</threshold>
<thresh>35.000000000</thresh>
<thresh>18.214286804</thresh>
</contourFinder>
<contourFinder>
<minArea>0</minArea>
......@@ -32,11 +32,11 @@
<maxAreaRadius>21</maxAreaRadius>
<trackHue>0</trackHue>
<threshold>
<r>242</r>
<g>19</g>
<b>73</b>
<r>200</r>
<g>5</g>
<b>27</b>
</threshold>
<thresh>52.000000000</thresh>
<thresh>16.000000000</thresh>
</contourFinder>
<contourFinder>
<minArea>0</minArea>
......@@ -45,11 +45,11 @@
<maxAreaRadius>17</maxAreaRadius>
<trackHue>0</trackHue>
<threshold>
<r>205</r>
<g>172</g>
<b>105</b>
<r>234</r>
<g>205</g>
<b>159</b>
</threshold>
<thresh>40.000000000</thresh>
<thresh>23.418367386</thresh>
</contourFinder>
<contourFinder>
<minArea>0</minArea>
......@@ -58,9 +58,9 @@
<maxAreaRadius>17</maxAreaRadius>
<trackHue>0</trackHue>
<threshold>
<r>159</r>
<g>4</g>
<b>19</b>
<r>20</r>
<g>11</g>
<b>23</b>
</threshold>
<thresh>255.000000000</thresh>
</contourFinder>
......
src/Projector.cpp
+ 31
− 34
View file @ 913d8266
......@@ -27,8 +27,7 @@ void Projector::draw(){
ofBackground(0);
// Keep track of each blob for each color
// vector<vector<cv::Point2f>> ss->blobs;
// vector<cv::Point3f> ss->blobs;
vector<cv::Point3f> blobs;
// Loop over each colour
for (int i = 0; i < ss->num_colours; i++) {
// ss->contourFinders[i].draw();
......@@ -46,7 +45,7 @@ void Projector::draw(){
p__.x = ofMap(p_.x, 0, ss->width_height.x, 0, 1920);
p__.y = ofMap(p_.y, 0, ss->width_height.y, 0, 1080);
p__.z=i;
ss->blobs.push_back(p__);
blobs.push_back(p__);
// p_.x+=ss->rectPos.x;
// p_.y+=ss->rectPos.y;
ofSetLineWidth(3);
......@@ -67,39 +66,37 @@ void Projector::draw(){
// Find blob pairs
// vector<vector<int>> pairs = findPairs(ss->blobs);
// vector<vector<int>> pairs;
// for (int i = 0; i < ss->blobs.size(); i++) {
// for (int j = 0; j < ss->blobs.size(); j++) {
// if (i != j) {
// float dist = ofDist(ss->blobs[i].x, ss->blobs[i].y, ss->blobs[j].x, ss->blobs[j].y);
// if (dist < 400) {
// // Loop over pairs
// bool _found = false;
// for (int k = 0; k < pairs.size(); k++) {
// vector<int>::iterator iti, itj;
// iti = find(pairs[k].begin(), pairs[k].end(), i);
// itj = find(pairs[k].begin(), pairs[k].end(), j);
// // Check pair has already been found
// if (iti != pairs[k].end() && itj != pairs[k].end()) {
// // Push pair to pairs
// // pairs.push_back({i, j});
// _found = true;
// }
// }
// if (!_found)
// pairs.push_back({i, j});
// }
// }
// }
// }
vector<vector<int>> pairs;
for (int i = 0; i < blobs.size(); i++) {
for (int j = 0; j < blobs.size(); j++) {
if (i != j) {
float dist = ofDist(blobs[i].x, blobs[i].y, blobs[j].x, blobs[j].y);
if (dist < 400) {
// Loop over pairs
bool _found = false;
for (int k = 0; k < pairs.size(); k++) {
vector<int>::iterator iti, itj;
iti = find(pairs[k].begin(), pairs[k].end(), i);
itj = find(pairs[k].begin(), pairs[k].end(), j);
// Check pair has already been found
if (iti != pairs[k].end() && itj != pairs[k].end()) {
// Push pair to pairs
// pairs.push_back({i, j});
_found = true;
}
}
if (!_found)
pairs.push_back({i, j});
}
}
}
}
// Draw line between them
// for(int i = 0; i < pairs.size(); i++){
// ofDrawLine(ss->blobs[pairs[i][0]].x, ss->blobs[pairs[i][0]].y,
// ss->blobs[pairs[i][1]].x, ss->blobs[pairs[i][1]].y);
// }
for(int i = 0; i < pairs.size(); i++){
ofDrawLine(blobs[pairs[i][0]].x,blobs[pairs[i][0]].y,
blobs[pairs[i][1]].x, blobs[pairs[i][1]].y);
}
// Draw chequerboard if on
ofFill();
......
src/ofApp.cpp
+ 1
− 1
View file @ 913d8266
......@@ -389,7 +389,7 @@ void ofApp::run_v4l2_commands(){
string cm2 = "v4l2-ctl -d2 -c focus_absolute=0";
string cm3 = "v4l2-ctl -d2 -c exposure_auto=1";
string cm4 = "v4l2-ctl -d2 -c white_balance_temperature_auto=0";
string cm5 = "v4l2-ctl -d2 -c exposure_absolute=624";
string cm5 = "v4l2-ctl -d2 -c exposure_absolute=1024";
string cm6 = "v4l2-ctl -d2 -c exposure_auto_priority=0";
string cm7 = "v4l2-ctl -d2 -c white_balance_temperature=3755";
vector<string> commands = {cm1, cm2, cm3, cm4, cm5, cm6, cm7};
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment