WebSVN – seema-scanner – Diff – /src/SMCaptureWorker.cpp



        camera1->trigger();
 
        // retrieve raw frames
        frame = camera0->getFrame();
        cv::Mat frameCV;
        frameCV  = cv::Mat(frame.height, frame.width, CV_8UC1, frame.memory);
        frameCV = frameCV.clone();
//        cvtools::rshift(frameCV, 8);
//        frameCV.convertTo(frameCV, CV_8UC1);
        emit newFrame(0, frameCV);
 
        frame = camera1->getFrame();
        frameCV  = cv::Mat(frame.height, frame.width, CV_8UC1, frame.memory);
        frameCV = frameCV.clone();
//        cvtools::rshift(frameCV, 8);
//        frameCV.convertTo(frameCV, CV_8UC1);
        emit newFrame(1, frameCV);
 
        //std::cout << "SMCaptureWorker idle " << time.restart() << "ms" << std::endl;
 
        // Process events e.g. perform a task

 
        // retrieve frames
        CameraFrame frame;
        frame = camera0->getFrame();
        cv::Mat frameCV;
        frameCV  = cv::Mat(frame.height, frame.width, CV_8UC1, frame.memory);
        frameCV = frameCV.clone();
        emit newFrame(0, frameCV);
        frame = camera1->getFrame();
        frameCV  = cv::Mat(frame.height, frame.width, CV_8UC1, frame.memory);
        frameCV = frameCV.clone();
        emit newFrame(1, frameCV);
    }
 
    emit rotatedTo(angle);

        camera1->trigger();
 
        // retrieve frames
        frame = camera0->getFrame();
        cv::Mat frameCV;
        frameCV  = cv::Mat(frame.height, frame.width, CV_8UC1, frame.memory);
        frameCV = frameCV.clone();
        cv::add(frameCV, frameCVStacked0, frameCVStacked0, cv::noArray(), CV_32SC1);
//cvtools::writeMat(frameCV, "frameCV.mat", "frameCV");
//cvtools::writeMat(frameCVStacked0, "frameCVStacked0.mat", "frameCVStacked0");
        emit newFrame(0, frameCV);
 
        frame = camera1->getFrame();
        frameCV  = cv::Mat(frame.height, frame.width, CV_8UC1, frame.memory);
        frameCV = frameCV.clone();
        cv::add(frameCV, frameCVStacked1, frameCVStacked1, cv::noArray(), CV_32SC1);
 
        emit newFrame(1, frameCV);
 
    }
 
    frameCVStacked0.convertTo(frameCVStacked0, CV_8UC1, 1.0/stacking);
cvtools::writeMat(frameCVStacked0, "frameCVStacked0a.mat", "frameCVStacked0a");
    frameCVStacked1.convertTo(frameCVStacked1, CV_8UC1, 1.0/stacking);
 
    calibrationSet.frame0 = frameCVStacked0;
    calibrationSet.frame1 = frameCVStacked1;
 
    calibrationSet.rotationAngle = rotationStage->getAngle();

            camera1->trigger();
 
            // retrieve frames
            frame = camera0->getFrame();
            cv::Mat frameCV;
            frameCV  = cv::Mat(frame.height, frame.width, CV_8UC1, frame.memory);
            frameCV = frameCV.clone();
            cv::add(frameCV, frameCVStacked0, frameCVStacked0, cv::noArray(), CV_32SC1);
 
            emit newFrame(0, frameCV);
 
            frame = camera1->getFrame();
            frameCV  = cv::Mat(frame.height, frame.width, CV_8UC1, frame.memory);
            frameCV = frameCV.clone();
            cv::add(frameCV, frameCVStacked1, frameCVStacked1, cv::noArray(), CV_32SC1);
 
            emit newFrame(1, frameCV);
 
        }
 
        frameCVStacked0.convertTo(frameCVStacked0, CV_8UC1, 1.0/stacking);
        frameCVStacked1.convertTo(frameCVStacked1, CV_8UC1, 1.0/stacking);
 
        frameSequence.frames0.push_back(frameCVStacked0);
        frameSequence.frames1.push_back(frameCVStacked1);
 
    }

Rev 120	Rev 121
Line 90...	Line 90...
90	`camera1->trigger();`	90	`camera1->trigger();`
91		91
92	`// retrieve raw frames`	92	`// retrieve raw frames`
93	`frame = camera0->getFrame();`	93	`frame = camera0->getFrame();`
94	`cv::Mat frameCV;`	94	`cv::Mat frameCV;`
95	`frameCV = cv::Mat(frame.height, frame.width, CV_16UC1, frame.memory);`	95	`frameCV = cv::Mat(frame.height, frame.width, CV_8UC1, frame.memory);`
96	`frameCV = frameCV.clone();`	96	`frameCV = frameCV.clone();`
97	`cvtools::rshift(frameCV, 8);`	97	`// cvtools::rshift(frameCV, 8);`
98	`frameCV.convertTo(frameCV, CV_8UC1);`	98	`// frameCV.convertTo(frameCV, CV_8UC1);`
99	`emit newFrame(0, frameCV);`	99	`emit newFrame(0, frameCV);`
100		100
101	`frame = camera1->getFrame();`	101	`frame = camera1->getFrame();`
102	`frameCV = cv::Mat(frame.height, frame.width, CV_16UC1, frame.memory);`	102	`frameCV = cv::Mat(frame.height, frame.width, CV_8UC1, frame.memory);`
103	`frameCV = frameCV.clone();`	103	`frameCV = frameCV.clone();`
104	`cvtools::rshift(frameCV, 8);`	104	`// cvtools::rshift(frameCV, 8);`
105	`frameCV.convertTo(frameCV, CV_8UC1);`	105	`// frameCV.convertTo(frameCV, CV_8UC1);`
106	`emit newFrame(1, frameCV);`	106	`emit newFrame(1, frameCV);`
107		107
108	`//std::cout << "SMCaptureWorker idle " << time.restart() << "ms" << std::endl;`	108	`//std::cout << "SMCaptureWorker idle " << time.restart() << "ms" << std::endl;`
109		109
110	`// Process events e.g. perform a task`	110	`// Process events e.g. perform a task`
Line 126...	Line 126...
126		126
127	`// retrieve frames`	127	`// retrieve frames`
128	`CameraFrame frame;`	128	`CameraFrame frame;`
129	`frame = camera0->getFrame();`	129	`frame = camera0->getFrame();`
130	`cv::Mat frameCV;`	130	`cv::Mat frameCV;`
131	`frameCV = cv::Mat(frame.height, frame.width, CV_16UC1, frame.memory);`	131	`frameCV = cv::Mat(frame.height, frame.width, CV_8UC1, frame.memory);`
132	`frameCV = frameCV.clone();`	132	`frameCV = frameCV.clone();`
133	`emit newFrame(0, frameCV);`	133	`emit newFrame(0, frameCV);`
134	`frame = camera1->getFrame();`	134	`frame = camera1->getFrame();`
135	`frameCV = cv::Mat(frame.height, frame.width, CV_16UC1, frame.memory);`	135	`frameCV = cv::Mat(frame.height, frame.width, CV_8UC1, frame.memory);`
136	`frameCV = frameCV.clone();`	136	`frameCV = frameCV.clone();`
137	`emit newFrame(1, frameCV);`	137	`emit newFrame(1, frameCV);`
138	`}`	138	`}`
139		139
140	`emit rotatedTo(angle);`	140	`emit rotatedTo(angle);`
Line 156...	Line 156...
156	`camera1->trigger();`	156	`camera1->trigger();`
157		157
158	`// retrieve frames`	158	`// retrieve frames`
159	`frame = camera0->getFrame();`	159	`frame = camera0->getFrame();`
160	`cv::Mat frameCV;`	160	`cv::Mat frameCV;`
161	`frameCV = cv::Mat(frame.height, frame.width, CV_16UC1, frame.memory);`	161	`frameCV = cv::Mat(frame.height, frame.width, CV_8UC1, frame.memory);`
162	`frameCV = frameCV.clone();`	162	`frameCV = frameCV.clone();`
163	`cv::add(frameCV, frameCVStacked0, frameCVStacked0, cv::noArray(), CV_32SC1);`	163	`cv::add(frameCV, frameCVStacked0, frameCVStacked0, cv::noArray(), CV_32SC1);`
164	`cvtools::writeMat(frameCV, "frameCV.mat", "frameCV");`	164	`//cvtools::writeMat(frameCV, "frameCV.mat", "frameCV");`
165	`cvtools::writeMat(frameCVStacked0, "frameCVStacked0.mat", "frameCVStacked0");`	165	`//cvtools::writeMat(frameCVStacked0, "frameCVStacked0.mat", "frameCVStacked0");`
166	`emit newFrame(0, frameCV);`	166	`emit newFrame(0, frameCV);`
167		167
168	`frame = camera1->getFrame();`	168	`frame = camera1->getFrame();`
169	`frameCV = cv::Mat(frame.height, frame.width, CV_16UC1, frame.memory);`	169	`frameCV = cv::Mat(frame.height, frame.width, CV_8UC1, frame.memory);`
170	`frameCV = frameCV.clone();`	170	`frameCV = frameCV.clone();`
171	`cv::add(frameCV, frameCVStacked1, frameCVStacked1, cv::noArray(), CV_32SC1);`	171	`cv::add(frameCV, frameCVStacked1, frameCVStacked1, cv::noArray(), CV_32SC1);`
172		172
173	`emit newFrame(1, frameCV);`	173	`emit newFrame(1, frameCV);`
174		174
175	`}`	175	`}`
176		176
177	`frameCVStacked0.convertTo(frameCVStacked0, CV_16UC1, 1.0/stacking);`	177	`frameCVStacked0.convertTo(frameCVStacked0, CV_8UC1, 1.0/stacking);`
178	`cvtools::writeMat(frameCVStacked0, "frameCVStacked0a.mat", "frameCVStacked0a");`	178	`cvtools::writeMat(frameCVStacked0, "frameCVStacked0a.mat", "frameCVStacked0a");`
179	`frameCVStacked1.convertTo(frameCVStacked1, CV_16UC1, 1.0/stacking);`	179	`frameCVStacked1.convertTo(frameCVStacked1, CV_8UC1, 1.0/stacking);`
180		180
181	`calibrationSet.frame0 = frameCVStacked0;`	181	`calibrationSet.frame0 = frameCVStacked0;`
182	`calibrationSet.frame1 = frameCVStacked1;`	182	`calibrationSet.frame1 = frameCVStacked1;`
183		183
184	`calibrationSet.rotationAngle = rotationStage->getAngle();`	184	`calibrationSet.rotationAngle = rotationStage->getAngle();`
Line 215...	Line 215...
215	`camera1->trigger();`	215	`camera1->trigger();`
216		216
217	`// retrieve frames`	217	`// retrieve frames`
218	`frame = camera0->getFrame();`	218	`frame = camera0->getFrame();`
219	`cv::Mat frameCV;`	219	`cv::Mat frameCV;`
220	`frameCV = cv::Mat(frame.height, frame.width, CV_16UC1, frame.memory);`	220	`frameCV = cv::Mat(frame.height, frame.width, CV_8UC1, frame.memory);`
221	`frameCV = frameCV.clone();`	221	`frameCV = frameCV.clone();`
222	`cv::add(frameCV, frameCVStacked0, frameCVStacked0, cv::noArray(), CV_32SC1);`	222	`cv::add(frameCV, frameCVStacked0, frameCVStacked0, cv::noArray(), CV_32SC1);`
223		223
224	`emit newFrame(0, frameCV);`	224	`emit newFrame(0, frameCV);`
225		225
226	`frame = camera1->getFrame();`	226	`frame = camera1->getFrame();`
227	`frameCV = cv::Mat(frame.height, frame.width, CV_16UC1, frame.memory);`	227	`frameCV = cv::Mat(frame.height, frame.width, CV_8UC1, frame.memory);`
228	`frameCV = frameCV.clone();`	228	`frameCV = frameCV.clone();`
229	`cv::add(frameCV, frameCVStacked1, frameCVStacked1, cv::noArray(), CV_32SC1);`	229	`cv::add(frameCV, frameCVStacked1, frameCVStacked1, cv::noArray(), CV_32SC1);`
230		230
231	`emit newFrame(1, frameCV);`	231	`emit newFrame(1, frameCV);`
232		232
233	`}`	233	`}`
234		234
235	`frameCVStacked0.convertTo(frameCVStacked0, CV_16UC1, 1.0/stacking);`	235	`frameCVStacked0.convertTo(frameCVStacked0, CV_8UC1, 1.0/stacking);`
236	`frameCVStacked1.convertTo(frameCVStacked1, CV_16UC1, 1.0/stacking);`	236	`frameCVStacked1.convertTo(frameCVStacked1, CV_8UC1, 1.0/stacking);`
237		237
238	`frameSequence.frames0.push_back(frameCVStacked0);`	238	`frameSequence.frames0.push_back(frameCVStacked0);`
239	`frameSequence.frames1.push_back(frameCVStacked1);`	239	`frameSequence.frames1.push_back(frameCVStacked1);`
240		240
241	`}`	241	`}`

Subversion Repositories seema-scanner

(root)/src/SMCaptureWorker.cpp @ 182 – Rev 120 → 121