[openrtm-commit:01133] r103 - in branches/newCMakeForVC2010/ImageProcessing/opencv/components/Histogram: include/Histogram src
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2013年 11月 14日 (木) 16:48:22 JST
Author: kawauchi
Date: 2013-11-14 16:48:22 +0900 (Thu, 14 Nov 2013)
New Revision: 103
Modified:
branches/newCMakeForVC2010/ImageProcessing/opencv/components/Histogram/include/Histogram/Histogram.h
branches/newCMakeForVC2010/ImageProcessing/opencv/components/Histogram/src/Histogram.cpp
Log:
Histogram component: Align the indentation, and converted to the UTF-8 character code. refs #2704
Modified: branches/newCMakeForVC2010/ImageProcessing/opencv/components/Histogram/include/Histogram/Histogram.h
===================================================================
--- branches/newCMakeForVC2010/ImageProcessing/opencv/components/Histogram/include/Histogram/Histogram.h 2013-10-11 08:40:29 UTC (rev 102)
+++ branches/newCMakeForVC2010/ImageProcessing/opencv/components/Histogram/include/Histogram/Histogram.h 2013-11-14 07:48:22 UTC (rev 103)
@@ -24,15 +24,15 @@
#include <cxcore.h>
#include <highgui.h>
-#define DIMENSIONS 1 // ƒqƒXƒgƒOƒ‰ƒ€‚ÌŽŸŒ³”
-#define UNIFORM 1 // ˆê—l«‚ÉŠÖ‚·‚éƒtƒ‰ƒO
-#define ACCUMULATE 0 // ŒvŽZƒtƒ‰ƒO
-#define TRACKBAR_MAX_VALUE 200 // ƒgƒ‰ƒbƒNƒo[‚ÌÅ‘å’l
+#define DIMENSIONS 1 // ヒストグラムã®æ¬¡å…ƒæ•°
+#define UNIFORM 1 // 一様性ã«é–¢ã™ã‚‹ãƒ•ãƒ©ã‚°
+#define ACCUMULATE 0 // 計算フラグ
+#define TRACKBAR_MAX_VALUE 200 // トラックãƒãƒ¼ã®æœ€å¤§å€¤
-#define SCALE_SHIFT 0 // ƒXƒP[ƒŠƒ“ƒO‚µ‚½“ü—Í”z—ñ‚Ì—v‘f‚ɉÁ‚¦‚é’l
-#define LINE_THICKNESS -1 // ü‚Ì‘¾‚³
-#define LINE_TYPE 1 // ü‚ÌŽí—Þ
-#define SHIFT 0 // À•W‚̬”“_ˆÈ‰º‚ÌŒ…‚ð•\‚·ƒrƒbƒg”
+#define SCALE_SHIFT 0 // スケーリングã—ãŸå…¥åŠ›é…列ã®è¦ç´ ã«åŠ ãˆã‚‹å€¤
+#define LINE_THICKNESS -1 // ç·šã®å¤ªã•
+#define LINE_TYPE 1 // ç·šã®ç¨®é¡ž
+#define SHIFT 0 // 座標ã®å°æ•°ç‚¹ä»¥ä¸‹ã®æ¡ã‚’表ã™ãƒ“ット数
// Service implementation headers
// <rtc-template block="service_impl_h">
@@ -299,14 +299,14 @@
// <rtc-template block="private_operation">
// </rtc-template>
- IplImage* imageBuff; // ƒJƒƒ‰‚̃Cƒ[ƒW
+ IplImage* imageBuff; // カメラã®ã‚¤ãƒ¡ãƒ¼ã‚¸
IplImage* grayImage;
IplImage* destinationImage;
IplImage* histogramImage;
IplImage* histogramBarImage;
CvHistogram *histogram;
- CvMat* lookUpTableMatrix; // ”Z“x‘Ήžs—ñ
+ CvMat* lookUpTableMatrix; // 濃度対応行列
int histogramSize;
int bin_w;
Modified: branches/newCMakeForVC2010/ImageProcessing/opencv/components/Histogram/src/Histogram.cpp
===================================================================
--- branches/newCMakeForVC2010/ImageProcessing/opencv/components/Histogram/src/Histogram.cpp 2013-10-11 08:40:29 UTC (rev 102)
+++ branches/newCMakeForVC2010/ImageProcessing/opencv/components/Histogram/src/Histogram.cpp 2013-11-14 07:48:22 UTC (rev 103)
@@ -115,35 +115,35 @@
RTC::ReturnCode_t Histogram::onActivated(RTC::UniqueId ec_id)
{
- // ƒCƒ[ƒW—pƒƒ‚ƒŠ‚̉Šú‰»
+ // イメージ用メモリã®åˆæœŸåŒ–
imageBuff = NULL;
grayImage = NULL;
destinationImage = NULL;
histogramImage = NULL;
histogramBarImage = NULL;
- // OutPort‰æ–ʃTƒCƒY‚̉Šú‰»
+ // OutPortç”»é¢ã‚µã‚¤ã‚ºã®åˆæœŸåŒ–
m_image_histogram.width = 0;
m_image_histogram.height = 0;
m_image_histogramImage.width = 0;
m_image_histogramImage.height = 0;
- // ƒqƒXƒgƒOƒ‰ƒ€‚É•`‰æ‚³‚ê‚éc–_‚Ì”
+ // ヒストグラムã«æç”»ã•ã‚Œã‚‹ç¸¦æ£’ã®æ•°
histogramSize = 128;
- // ƒqƒXƒgƒOƒ‰ƒ€‚͈̔Í
+ // ヒストグラムã®ç¯„囲
range_0[0] = 0;
range_0[1] = 256;
- // ƒqƒXƒgƒOƒ‰ƒ€ŠeŽŸŒ³‚Ì”ÍˆÍ‚ðŽ¦‚·”z—ñ‚̃|ƒCƒ“ƒ^
+ // ヒストグラムå„次元ã®ç¯„囲を示ã™é…列ã®ãƒã‚¤ãƒ³ã‚¿
ranges[0] = range_0 ;
- // ƒqƒXƒgƒOƒ‰ƒ€‚ð¶¬
+ // ヒストグラムを生æˆ
histogram = cvCreateHist( DIMENSIONS, &histogramSize, CV_HIST_ARRAY, ranges, UNIFORM );
- // s—ñ‚ð¶¬
+ // 行列を生æˆ
lookUpTableMatrix = cvCreateMatHeader( 1, 256, CV_8UC1 );
- // ”Z“x‘Ήžs—ñ‚É”Z“x‘Ήž•\‚ðƒZƒbƒg
+ // 濃度対応行列ã«æ¿ƒåº¦å¯¾å¿œè¡¨ã‚’セット
cvSetData( lookUpTableMatrix, lookUpTable, NULL );
return RTC::RTC_OK;
@@ -154,7 +154,7 @@
{
if( imageBuff != NULL )
{
- // ƒCƒ[ƒW—pƒƒ‚ƒŠ‚̉ð•ú
+ // イメージ用メモリã®è§£æ”¾
cvReleaseImage(&imageBuff);
cvReleaseImage(&grayImage);
cvReleaseImage(&destinationImage);
@@ -168,18 +168,18 @@
RTC::ReturnCode_t Histogram::onExecute(RTC::UniqueId ec_id)
{
- // V‚µ‚¢ƒf[ƒ^‚̃`ƒFƒbƒN
+ // æ–°ã—ã„データã®ãƒã‚§ãƒƒã‚¯
if(m_image_origIn.isNew()){
- // InPortƒf[ƒ^‚Ì“Ç‚Ýž‚Ý
+ // InPortデータã®èªã¿è¾¼ã¿
m_image_origIn.read();
- // InPort‚ÆOutPort‚̉æ–ʃTƒCƒYˆ—‚¨‚æ‚уCƒ[ƒW—pƒƒ‚ƒŠŠm•Û
+ // InPortã¨OutPortã®ç”»é¢ã‚µã‚¤ã‚ºå‡¦ç†ãŠã‚ˆã³ã‚¤ãƒ¡ãƒ¼ã‚¸ç”¨ãƒ¡ãƒ¢ãƒªç¢ºä¿
if(m_image_orig.width != m_image_histogram.width || m_image_orig.height != m_image_histogram.height)
{
m_image_histogram.width = m_image_histogramImage.width = m_image_orig.width;
m_image_histogram.height = m_image_histogramImage.height = m_image_orig.height;
- // InPort‚̃Cƒ[ƒWƒTƒCƒY‚ª•ÏX‚³‚ꂽê‡
+ // InPortã®ã‚¤ãƒ¡ãƒ¼ã‚¸ã‚µã‚¤ã‚ºãŒå¤‰æ›´ã•ã‚ŒãŸå ´åˆ
if( imageBuff != NULL )
{
cvReleaseImage(&imageBuff);
@@ -189,108 +189,108 @@
cvReleaseImage(&histogramBarImage);
}
- // ƒCƒ[ƒW—pƒƒ‚ƒŠ‚ÌŠm•Û
+ // イメージ用メモリã®ç¢ºä¿
imageBuff = cvCreateImage( cvSize(m_image_orig.width, m_image_orig.height), IPL_DEPTH_8U, 3 );
grayImage = cvCreateImage( cvSize(m_image_orig.width, m_image_orig.height), IPL_DEPTH_8U, 1 );
destinationImage = cvCreateImage( cvSize(m_image_orig.width, m_image_orig.height), IPL_DEPTH_8U, 1 );
histogramImage = cvCreateImage( cvSize(m_image_orig.width, m_image_orig.height), IPL_DEPTH_8U, 3 );
histogramBarImage = cvCreateImage( cvSize(m_image_orig.width, m_image_orig.height), IPL_DEPTH_8U, 3 );
- // ƒqƒXƒgƒOƒ‰ƒ€‚Ìc–_‚̉¡•‚ðŒvŽZ‚·‚é
+ // ヒストグラムã®ç¸¦æ£’ã®æ¨ªå¹…を計算ã™ã‚‹
bin_w = cvRound( ( double )histogramBarImage->width / histogramSize );
}
- // InPort‚̉æ–ʃf[ƒ^‚ðƒRƒs[
+ // InPortã®ç”»é¢ãƒ‡ãƒ¼ã‚¿ã‚’コピー
memcpy(imageBuff->imageData,(void *)&(m_image_orig.pixels[0]),m_image_orig.pixels.length());
- // RGB‚©‚çƒOƒŒ[ƒXƒP[ƒ‹‚É•ÏŠ·
+ // RGBã‹ã‚‰ã‚°ãƒ¬ãƒ¼ã‚¹ã‚±ãƒ¼ãƒ«ã«å¤‰æ›
cvCvtColor( imageBuff, grayImage, CV_RGB2GRAY);
- int brightness = m_brightness - TRACKBAR_MAX_VALUE / 2; // ‹P“x’l
- int contrast = m_contrast - TRACKBAR_MAX_VALUE / 2; // ƒRƒ“ƒgƒ‰ƒXƒg
+ int brightness = m_brightness - TRACKBAR_MAX_VALUE / 2; // è¼åº¦å€¤
+ int contrast = m_contrast - TRACKBAR_MAX_VALUE / 2; // コントラスト
if ( contrast > 0 ) {
- double delta = 127.0 * contrast / 100.0;
- double a = 255.0 / ( 255.0 - delta * 2 );
- double b = a * ( brightness - delta );
- for (int i = 0; i < 256; i++ ){
- // •ÏŠ·Œã‚ÌŠK’²‚ð‹‚ß‚é
- int v = cvRound( a * i + b );
- if( v < 0 ){
- v = 0;
- }
- if( v > 255 ){
- v = 255;
- }
- lookUpTable[i] = ( unsigned char )v;
+ double delta = 127.0 * contrast / 100.0;
+ double a = 255.0 / ( 255.0 - delta * 2 );
+ double b = a * ( brightness - delta );
+ for (int i = 0; i < 256; i++ ){
+ // 変æ›å¾Œã®éšŽèª¿ã‚’求ã‚ã‚‹
+ int v = cvRound( a * i + b );
+ if( v < 0 ){
+ v = 0;
}
- } else {
- double delta = -128.0 * contrast / 100.0;
- double a = (256.0 - delta * 2.0) / 255.0;
- double b = a * brightness + delta;
- for(int i = 0; i < 256; i++ ){
- int v = cvRound( a * i + b);
- if( v < 0 ){
- v = 0;
- }
- if( v > 255 ){
- v = 255;
- }
- lookUpTable[i] = ( unsigned char )v;
+ if( v > 255 ){
+ v = 255;
}
+ lookUpTable[i] = ( unsigned char )v;
}
+ } else {
+ double delta = -128.0 * contrast / 100.0;
+ double a = (256.0 - delta * 2.0) / 255.0;
+ double b = a * brightness + delta;
+ for(int i = 0; i < 256; i++ ){
+ int v = cvRound( a * i + b);
+ if( v < 0 ){
+ v = 0;
+ }
+ if( v > 255 ){
+ v = 255;
+ }
+ lookUpTable[i] = ( unsigned char )v;
+ }
+ }
- // ”Z“x‘Ήžs—ñ‚ð—p‚¢‚½”Z“xŠK’²•ÏŠ·‚ðs‚¤
+ // 濃度対応行列を用ã„ãŸæ¿ƒåº¦éšŽèª¿å¤‰æ›ã‚’è¡Œã†
cvLUT( grayImage, destinationImage, lookUpTableMatrix );
- // ƒOƒŒ[ƒXƒP[ƒ‹‚©‚çRGB‚É•ÏŠ·
+ // グレースケールã‹ã‚‰RGBã«å¤‰æ›
cvCvtColor( destinationImage, histogramImage, CV_GRAY2RGB );
- // ‰æ‘œƒf[ƒ^‚̃TƒCƒYŽæ“¾
+ // ç”»åƒãƒ‡ãƒ¼ã‚¿ã®ã‚µã‚¤ã‚ºå–å¾—
int len = histogramImage->nChannels * histogramImage->width * histogramImage->height;
m_image_histogramImage.pixels.length(len);
- // •Ï“]‚µ‚½‰æ‘œƒf[ƒ^‚ðOutPort‚ɃRƒs[
+ // 変転ã—ãŸç”»åƒãƒ‡ãƒ¼ã‚¿ã‚’OutPortã«ã‚³ãƒ”ー
memcpy((void *)&(m_image_histogramImage.pixels[0]), histogramImage->imageData,len);
- // •Ï“]‚µ‚½‰æ‘œƒf[ƒ^‚ðOutPort‚©‚ço—Í
+ // 変転ã—ãŸç”»åƒãƒ‡ãƒ¼ã‚¿ã‚’OutPortã‹ã‚‰å‡ºåŠ›
m_image_histogramImageOut.write();
- // ‰æ‘œ‚̃qƒXƒgƒOƒ‰ƒ€‚ðŒvŽZ‚·‚é
+ // ç”»åƒã®ãƒ’ストグラムを計算ã™ã‚‹
cvCalcHist( &destinationImage, histogram, ACCUMULATE, NULL );
float max_value = 0;
- // ƒqƒXƒgƒOƒ‰ƒ€’l‚ÌÅ‘å’l‚𓾂é
- cvGetMinMaxHistValue( histogram, NULL, &max_value, NULL, NULL );
+ // ヒストグラム値ã®æœ€å¤§å€¤ã‚’å¾—ã‚‹
+ cvGetMinMaxHistValue( histogram, NULL, &max_value, NULL, NULL );
- // ƒqƒXƒgƒOƒ‰ƒ€‚ðÅ‘å’l‚É‚æ‚Á‚ij‹K‰»‚·‚é
+ // ヒストグラムを最大値ã«ã‚ˆã£ã¦æ£è¦åŒ–ã™ã‚‹
cvConvertScale( histogram->bins, histogram->bins,
( ( double )histogramBarImage->height ) / max_value, SCALE_SHIFT );
- // ƒqƒXƒgƒOƒ‰ƒ€‰æ‘œ‚𔒂ʼnŠú‰»‚·‚é
+ // ヒストグラム画åƒã‚’白ã§åˆæœŸåŒ–ã™ã‚‹
cvSet( histogramBarImage, cvScalarAll( 255 ), NULL );
- // ƒqƒXƒgƒOƒ‰ƒ€‚Ìc–_‚ð•`‰æ‚·‚é
+ // ヒストグラムã®ç¸¦æ£’ã‚’æç”»ã™ã‚‹
for ( int i = 0; i < histogramSize; i++ ) {
- cvRectangle(
- histogramBarImage,
- cvPoint( i * bin_w, histogramBarImage->height ),
- cvPoint( ( i + 1 ) * bin_w,histogramBarImage->height - cvRound( cvGetReal1D( histogram->bins, i) ) ),
- cvScalarAll( 0 ),
- LINE_THICKNESS,
- LINE_TYPE,
- SHIFT
- );
+ cvRectangle(
+ histogramBarImage,
+ cvPoint( i * bin_w, histogramBarImage->height ),
+ cvPoint( ( i + 1 ) * bin_w,histogramBarImage->height - cvRound( cvGetReal1D( histogram->bins, i) ) ),
+ cvScalarAll( 0 ),
+ LINE_THICKNESS,
+ LINE_TYPE,
+ SHIFT
+ );
}
- // ‰æ‘œƒf[ƒ^‚̃TƒCƒYŽæ“¾
+ // ç”»åƒãƒ‡ãƒ¼ã‚¿ã®ã‚µã‚¤ã‚ºå–å¾—
len = histogramBarImage->nChannels * histogramBarImage->width * histogramBarImage->height;
m_image_histogram.pixels.length(len);
- // •Ï“]‚µ‚½‰æ‘œƒf[ƒ^‚ðOutPort‚ɃRƒs[
+ // 変転ã—ãŸç”»åƒãƒ‡ãƒ¼ã‚¿ã‚’OutPortã«ã‚³ãƒ”ー
memcpy((void *)&(m_image_histogram.pixels[0]), histogramBarImage->imageData,len);
- // •Ï“]‚µ‚½‰æ‘œƒf[ƒ^‚ðOutPort‚©‚ço—Í
+ // 変転ã—ãŸç”»åƒãƒ‡ãƒ¼ã‚¿ã‚’OutPortã‹ã‚‰å‡ºåŠ›
m_image_histogramOut.write();
}
More information about the openrtm-commit
mailing list