Menu
▾
▴
kimageprocess-devel — General development discussion
You can subscribe to this list here.
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(28) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
(11) |
Feb
(51) |
Mar
(219) |
Apr
(63) |
May
(7) |
Jun
(91) |
Jul
(97) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(2) |
Nov
|
Dec
|
|
From: Gustavo P. B. <gb...@us...> - 2006-10-11 20:36:47
|
Update of /cvsroot/kimageprocess/kimageprocess/src/libkimageprocess In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv30951/src/libkimageprocess Modified Files: ktcalculation.cpp Log Message: Do not crash if there is no sample neither testing images Index: ktcalculation.cpp =================================================================== RCS file: /cvsroot/kimageprocess/kimageprocess/src/libkimageprocess/ktcalculation.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- ktcalculation.cpp 13 Jul 2005 03:31:13 -0000 1.16 +++ ktcalculation.cpp 11 Oct 2006 20:36:39 -0000 1.17 @@ -78,6 +78,9 @@ m_inputs = KTFeatureManager::self()->enabledFeaturesCount(m_method->methodName()); m_outputs = KTImageManager::self()->sampleCount(); + if (!m_outputs) + return; + m_data.clear(); m_min.resize(m_inputs, 0); m_max.resize(m_inputs, 0); |
|
From: Gustavo P. B. <gb...@us...> - 2006-10-11 20:36:47
|
Update of /cvsroot/kimageprocess/kimageprocess/src In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv30951/src Modified Files: kimageprocess.cpp Log Message: Do not crash if there is no sample neither testing images Index: kimageprocess.cpp =================================================================== RCS file: /cvsroot/kimageprocess/kimageprocess/src/kimageprocess.cpp,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- kimageprocess.cpp 7 Jul 2005 03:19:54 -0000 1.28 +++ kimageprocess.cpp 11 Oct 2006 20:36:39 -0000 1.29 @@ -399,6 +399,9 @@ void KImageProcess::projectCalculateSampleData() { + if (!KTImageManager::self()->sampleCount()) + return; + m_progressBar->startAction(3, i18n("Calculating sample data...")); m_progressBar->show(); @@ -407,6 +410,9 @@ void KImageProcess::projectCalculateTestData() { + if (!KTImageManager::self()->testingImages().count()) + return; + m_progressBar->startAction(KTImageManager::self()->testingImage()->width(), i18n("Calculating testing data...")); m_progressBar->show(); |
|
From: Tatiane S. <ste...@ya...> - 2005-07-13 13:07:07
|
Olá... Estou testando as novas características. A princípio utilizei apenas as 5 nas classificações que fiz e não sei se teremos muito tempo para variar estas novas com outras, acredito q esta variação só confundiria a análise dos resultados. Utilizando apenas as 5 e outros parâmetros que já tinha identificado como os melhores (tamanho da janela e maneira como a imagem é percorrida), obtive resultados bem bons, principalmente para mosaico de 2. Porém, identifiquei q estas estão relacionadas com a normalização, ou seja, se a normalização não é utilizada, as imagens não são classificadas. Preciso refinar mais os testes com as coloridas, mas pra imagens de satélite consegui resultados satisfatórios. Estou em busca de novas imagens. Até mais, Tatiane __________________________________________________ Converse com seus amigos em tempo real com o Yahoo! Messenger http://br.download.yahoo.com/messenger/ |
|
From: Gustavo P. B. <gb...@us...> - 2005-07-13 03:31:23
|
Update of /cvsroot/kimageprocess/kimageprocess/src/methods/hsvcm In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21028/src/methods/hsvcm Modified Files: hsvcm.cpp hsvcm.h Log Message: Re-enabled caching (but this time working) Index: hsvcm.cpp =================================================================== RCS file: /cvsroot/kimageprocess/kimageprocess/src/methods/hsvcm/hsvcm.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- hsvcm.cpp 28 Jun 2005 22:16:28 -0000 1.14 +++ hsvcm.cpp 13 Jul 2005 03:31:14 -0000 1.15 @@ -59,7 +59,7 @@ { } -void KTHSVCM::calculate(KTImage *img, int imgClass) +void KTHSVCM::_calculate(KTImage *img, int imgClass) { m_img = img; Index: hsvcm.h =================================================================== RCS file: /cvsroot/kimageprocess/kimageprocess/src/methods/hsvcm/hsvcm.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- hsvcm.h 23 Jun 2005 23:19:42 -0000 1.6 +++ hsvcm.h 13 Jul 2005 03:31:14 -0000 1.7 @@ -47,7 +47,7 @@ ~KTHSVCM(); - void calculate(KTImage *img, int imgClass = 0); + void _calculate(KTImage *img, int imgClass = 0); void *data(int direction) const; |
|
From: Gustavo P. B. <gb...@us...> - 2005-07-13 03:31:22
|
Update of /cvsroot/kimageprocess/kimageprocess/src/libkimageprocess In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21028/src/libkimageprocess Modified Files: ktcalculation.cpp ktfeature.cpp ktfeature.h ktfeaturemanager.cpp ktfeaturemanager.h ktmethod.cpp ktmethod.h Log Message: Re-enabled caching (but this time working) Index: ktfeature.h =================================================================== RCS file: /cvsroot/kimageprocess/kimageprocess/src/libkimageprocess/ktfeature.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- ktfeature.h 6 Jul 2005 01:34:43 -0000 1.6 +++ ktfeature.h 13 Jul 2005 03:31:13 -0000 1.7 @@ -53,6 +53,8 @@ bool enabled() { return m_enabled; } void setEnabled(bool enable) { m_enabled = enable; } + void clear(); + protected: QString m_featureName; QString m_longName; Index: ktfeature.cpp =================================================================== RCS file: /cvsroot/kimageprocess/kimageprocess/src/libkimageprocess/ktfeature.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- ktfeature.cpp 6 Jul 2005 01:34:43 -0000 1.9 +++ ktfeature.cpp 13 Jul 2005 03:31:13 -0000 1.10 @@ -54,20 +54,12 @@ float KTFeature::calculate( KTImage *img, int direction ) { - /*if (img == m_img) - { - Cache::iterator value = m_cacheValue.find(direction); - if (value != m_cacheValue.end()) - return value.data(); - } - else - { - m_img = img; - m_cacheValue.clear(); - } - */ + Cache::iterator value = m_cacheValue.find(direction); + if (value != m_cacheValue.end()) + return value.data(); + float result = _calculate(img, direction); - //m_cacheValue[direction] = result; + m_cacheValue[direction] = result; return result; } @@ -84,4 +76,9 @@ return KTFeatureManager::self(); } +void KTFeature::clear() +{ + m_cacheValue.clear(); +} + #include "ktfeature.moc" Index: ktmethod.h =================================================================== RCS file: /cvsroot/kimageprocess/kimageprocess/src/libkimageprocess/ktmethod.h,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- ktmethod.h 1 Jul 2005 00:37:19 -0000 1.10 +++ ktmethod.h 13 Jul 2005 03:31:13 -0000 1.11 @@ -42,8 +42,7 @@ KTMethod(); ~KTMethod(); - ///must be reimplemented by child classes - virtual void calculate(KTImage *img, int imgClass = 0); + void calculate(KTImage *img, int imgClass = 0); QString methodName(); QString longName(); @@ -59,6 +58,10 @@ QString m_longName; bool m_testingData; + + ///must be reimplemented by child classes + virtual void _calculate(KTImage *img, int imgClass = 0); + }; #endif Index: ktfeaturemanager.cpp =================================================================== RCS file: /cvsroot/kimageprocess/kimageprocess/src/libkimageprocess/ktfeaturemanager.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- ktfeaturemanager.cpp 7 Jul 2005 03:19:54 -0000 1.13 +++ ktfeaturemanager.cpp 13 Jul 2005 03:31:13 -0000 1.14 @@ -188,22 +188,34 @@ for (unsigned int i=0; i < groups.count(); ++i) { - if (groups.item(i).nodeName() == "FeatureGroup") + if (groups.item(i).nodeName() == "FeatureGroup") + { + QDomElement current = groups.item(i).toElement(); + QString groupName = current.attribute("Name"); + FeatureList *list = m_features[groupName]; + if (list) { - QDomElement current = groups.item(i).toElement(); - QString groupName = current.attribute("Name"); - FeatureList *list = m_features[groupName]; - if (list) - { - disableFeatures(groupName); - QStringList features = QStringList::split(',', current.attribute("EnabledFeatures")); - for (QStringList::Iterator it = features.begin(); it != features.end(); ++it ) - { - if ((*list)[*it]) - (*list)[*it]->setEnabled(true); - } - } + disableFeatures(groupName); + QStringList features = QStringList::split(',', current.attribute("EnabledFeatures")); + for (QStringList::Iterator it = features.begin(); it != features.end(); ++it ) + { + if ((*list)[*it]) + (*list)[*it]->setEnabled(true); + } } + } } } + +void KTFeatureManager::clearCache(const QString &group) +{ + FeatureList *features = m_features[group]; + if (!features) + return; + + QDictIterator<KTFeature> it(*features); + for (; it.current(); ++it) + it.current()->clear(); +} + #include "ktfeaturemanager.moc" Index: ktcalculation.cpp =================================================================== RCS file: /cvsroot/kimageprocess/kimageprocess/src/libkimageprocess/ktcalculation.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- ktcalculation.cpp 9 Jul 2005 16:16:23 -0000 1.15 +++ ktcalculation.cpp 13 Jul 2005 03:31:13 -0000 1.16 @@ -162,7 +162,6 @@ while ( (x + m_window_size.width <= width) && (y + m_window_size.height <= height) && (i < m_iterations || m_iterations == 0) ) { - kdDebug() << "SEQ: using x=" << x << " y=" << y << " w=" << m_window_size.width << " h=" << m_window_size.height << endl; tmpimg = img->returnWindow(x, y, m_window_size.width, m_window_size.height); m_method->calculate(tmpimg, imgClass); delete tmpimg; @@ -183,7 +182,6 @@ while ( (x + m_window_size.width <= width) && (y + m_window_size.height <= height) && (i < m_iterations || m_iterations == 0) ) { - kdDebug() << "CASC: using x=" << x << " y=" << y << " w=" << m_window_size.width << " h=" << m_window_size.height << endl; tmpimg = img->returnWindow(x, y, m_window_size.width, m_window_size.height); m_method->calculate(tmpimg, imgClass); delete tmpimg; Index: ktfeaturemanager.h =================================================================== RCS file: /cvsroot/kimageprocess/kimageprocess/src/libkimageprocess/ktfeaturemanager.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- ktfeaturemanager.h 7 Jul 2005 03:19:54 -0000 1.7 +++ ktfeaturemanager.h 13 Jul 2005 03:31:13 -0000 1.8 @@ -57,6 +57,8 @@ QDict<FeatureList> *allFeatures(); + void clearCache(const QString &group); + public slots: void slotSave(QDomDocument *doc, QDomElement *elem); void slotLoad(QDomElement *elem); Index: ktmethod.cpp =================================================================== RCS file: /cvsroot/kimageprocess/kimageprocess/src/libkimageprocess/ktmethod.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- ktmethod.cpp 23 Jun 2005 23:19:41 -0000 1.8 +++ ktmethod.cpp 13 Jul 2005 03:31:13 -0000 1.9 @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2004-2005 by * + * Copyright (C) 2004-2005 by * * Gustavo Pichorim Boiko <gus...@kd...> * * Herton Ronaldo Krzesinski <he...@my...> * * * @@ -22,6 +22,7 @@ #include "ktmethod.h" #include "ktimage.h" #include "ktclassifbackend.h" +#include "ktfeaturemanager.h" KTMethod::KTMethod() { @@ -35,8 +36,18 @@ void KTMethod::calculate(KTImage *img, int imgClass) { + //clear the cache + KTFeatureManager::self()->clearCache(m_methodName); + + _calculate(img, imgClass); +} + +void KTMethod::_calculate( KTImage * img, int imgClass ) +{ Q_UNUSED(img); Q_UNUSED(imgClass); + + //do nothing here } QString KTMethod::methodName() |
|
From: Gustavo P. B. <gb...@us...> - 2005-07-13 03:31:22
|
Update of /cvsroot/kimageprocess/kimageprocess/src/methods/glcm In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21028/src/methods/glcm Modified Files: glcm.cpp glcm.h Log Message: Re-enabled caching (but this time working) Index: glcm.cpp =================================================================== RCS file: /cvsroot/kimageprocess/kimageprocess/src/methods/glcm/glcm.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- glcm.cpp 1 Jul 2005 00:37:20 -0000 1.13 +++ glcm.cpp 13 Jul 2005 03:31:14 -0000 1.14 @@ -54,7 +54,7 @@ { } -void KTGLCM::calculate(KTImage *img, int imgClass) +void KTGLCM::_calculate(KTImage *img, int imgClass) { m_img = img; @@ -133,16 +133,16 @@ y = m_img->gray(col+d,row) / m_quantization; m_glcm[angle][x][y]++; m_glcm[angle][y][x]++; - } - else if (angle == 1 && row + d < rows) + } + else if (angle == 1 && row + d < rows && col - d >= 0) { - y = m_img->gray(col,row+d) / m_quantization; + y = m_img->gray(col-d, row+d) / m_quantization; m_glcm[angle][x][y]++; m_glcm[angle][y][x]++; - } - else if (angle == 2 && row + d < rows && col - d >= 0) + } + else if (angle == 2 && row + d < rows) { - y = m_img->gray(col-d, row+d) / m_quantization; + y = m_img->gray(col,row+d) / m_quantization; m_glcm[angle][x][y]++; m_glcm[angle][y][x]++; } Index: glcm.h =================================================================== RCS file: /cvsroot/kimageprocess/kimageprocess/src/methods/glcm/glcm.h,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- glcm.h 1 Jul 2005 00:37:20 -0000 1.8 +++ glcm.h 13 Jul 2005 03:31:14 -0000 1.9 @@ -38,7 +38,7 @@ ~KTGLCM(); - void calculate(KTImage *img, int imgClass = 0); + void _calculate(KTImage *img, int imgClass = 0); void *data(int direction) const; |
|
From: Herton R. K. <he...@us...> - 2005-07-13 02:48:44
|
Update of /cvsroot/kimageprocess/kimageprocess/src/methods/glcm/features/inertia In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27857/inertia Added Files: Makefile.am inertia.cpp inertia.h kimageprocess_glcm_inertia.desktop Log Message: - Added inertia texture feature to glcm method. --- NEW FILE: inertia.cpp --- /*************************************************************************** * Copyright (C) 2005 by * * Gustavo Pichorim Boiko <gus...@kd...> * * Herton Ronaldo Krzesinski <he...@my...> * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * * along with this program; if not, write to the * * Free Software Foundation, Inc., * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ #include "inertia.h" #include <kgenericfactory.h> #include <kaction.h> #include <klocale.h> #include <kdebug.h> #include <ktimage.h> #include <ktfeaturemanager.h> #include <ktmethod.h> K_EXPORT_COMPONENT_FACTORY( kimageprocess_glcm_inertia, KGenericFactory<KTGLCMinertia>( "kimageprocess_glcm_inertia" ) ) KTGLCMinertia::KTGLCMinertia(QObject *parent, const char* name, const QStringList&) : KTFeature("glcm") { Q_UNUSED(parent); Q_UNUSED(name); //check dependencies m_featureName = i18n("inertia"); m_longName = i18n("Inertia"); } KTGLCMinertia::~KTGLCMinertia() { } float KTGLCMinertia::_calculate(KTImage *img, int direction) { int glcmSize = method()->dataSize(); float **glcm = (float**) method()->data(direction); int i, j; float result = 0.0; for (i = 0; i < glcmSize; ++i) for (j = 0; j < glcmSize; ++j) result += (i - j) * (i - j) * glcm[i][j]; return result; } #include "inertia.moc" --- NEW FILE: inertia.h --- /*************************************************************************** * Copyright (C) 2005 by * * Gustavo Pichorim Boiko <gus...@kd...> * * Herton Ronaldo Krzesinski <he...@my...> * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * * along with this program; if not, write to the * * Free Software Foundation, Inc., * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ #ifndef KIMAGEPROCESS_GLCM_INERTIA_H #define KIMAGEPROCESS_GLCM_INERTIA_H #include <ktfeature.h> class KAction; class KTImage; /** * inertia calculation * @author Gustavo Pichorim Boiko * */ class KTGLCMinertia : public KTFeature { Q_OBJECT public: KTGLCMinertia(QObject *parent, const char *name, const QStringList&); ~KTGLCMinertia(); float _calculate(KTImage *img, int direction); }; #endif --- NEW FILE: Makefile.am --- INCLUDES = $(all_includes) -I$(srcdir)/../../../../libkimageprocess METASOURCES = AUTO kde_module_LTLIBRARIES = kimageprocess_glcm_inertia.la kimageprocess_glcm_inertia_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) noinst_HEADERS = inertia.h kimageprocess_glcm_inertia_la_SOURCES = inertia.cpp kde_services_DATA = kimageprocess_glcm_inertia.desktop kimageprocess_glcm_inertia_la_LIBADD = $(top_builddir)/src/libkimageprocess/libkimageprocess.la \ -lkdeui --- NEW FILE: kimageprocess_glcm_inertia.desktop --- [Desktop Entry] Name=inertia Comment=Inertia calculation over GLCM ServiceTypes=KImageProcess/Feature Type=Service X-KDE-Library=kimageprocess_glcm_inertia X-Category=glcm |
|
From: Herton R. K. <he...@us...> - 2005-07-13 02:48:44
|
Update of /cvsroot/kimageprocess/kimageprocess/src/methods/glcm/features In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27857 Modified Files: Makefile.am Log Message: - Added inertia texture feature to glcm method. Index: Makefile.am =================================================================== RCS file: /cvsroot/kimageprocess/kimageprocess/src/methods/glcm/features/Makefile.am,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- Makefile.am 13 Jul 2005 02:40:16 -0000 1.8 +++ Makefile.am 13 Jul 2005 02:48:36 -0000 1.9 @@ -1 +1 @@ -SUBDIRS = contrast dissimilarity invdiffmom angsecmom energy entropy sumentropy diffentropy mean variance deviation sumvariance diffvariance correlation imcorrelation sumaverage skewness maxprob kurtosis clustertendency +SUBDIRS = contrast dissimilarity invdiffmom angsecmom energy entropy sumentropy diffentropy mean variance deviation sumvariance diffvariance correlation imcorrelation sumaverage skewness maxprob kurtosis clustertendency inertia |
|
From: Herton R. K. <he...@us...> - 2005-07-13 02:47:57
|
Update of /cvsroot/kimageprocess/kimageprocess/src/methods/glcm/features/inertia In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27427/inertia Log Message: Directory /cvsroot/kimageprocess/kimageprocess/src/methods/glcm/features/inertia added to the repository |
|
From: Herton R. K. <he...@us...> - 2005-07-13 02:40:25
|
Update of /cvsroot/kimageprocess/kimageprocess/src/methods/glcm/features In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23316 Modified Files: Makefile.am Log Message: - Removing absolute from Makefile.am. Index: Makefile.am =================================================================== RCS file: /cvsroot/kimageprocess/kimageprocess/src/methods/glcm/features/Makefile.am,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- Makefile.am 13 Jul 2005 02:18:02 -0000 1.7 +++ Makefile.am 13 Jul 2005 02:40:16 -0000 1.8 @@ -1 +1 @@ -SUBDIRS = contrast dissimilarity invdiffmom angsecmom energy entropy sumentropy diffentropy mean variance deviation sumvariance diffvariance correlation imcorrelation sumaverage skewness maxprob kurtosis absolute clustertendency +SUBDIRS = contrast dissimilarity invdiffmom angsecmom energy entropy sumentropy diffentropy mean variance deviation sumvariance diffvariance correlation imcorrelation sumaverage skewness maxprob kurtosis clustertendency |
|
From: Herton R. K. <he...@us...> - 2005-07-13 02:28:58
|
Update of /cvsroot/kimageprocess/kimageprocess/src/methods/glcm/features/absolute In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16579 Removed Files: Makefile.am absolute.cpp absolute.h kimageprocess_glcm_absolute.desktop Log Message: - Removed absolute feature: it is the same as dissimilarity. --- kimageprocess_glcm_absolute.desktop DELETED --- --- absolute.h DELETED --- --- Makefile.am DELETED --- --- absolute.cpp DELETED --- |
|
From: Herton R. K. <he...@us...> - 2005-07-13 02:18:15
|
Update of /cvsroot/kimageprocess/kimageprocess/src/methods/glcm/features In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10676 Modified Files: Makefile.am Log Message: - Added cluster tendency feature to glcm method. Index: Makefile.am =================================================================== RCS file: /cvsroot/kimageprocess/kimageprocess/src/methods/glcm/features/Makefile.am,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- Makefile.am 13 Jul 2005 01:44:19 -0000 1.6 +++ Makefile.am 13 Jul 2005 02:18:02 -0000 1.7 @@ -1 +1 @@ -SUBDIRS = contrast dissimilarity invdiffmom angsecmom energy entropy sumentropy diffentropy mean variance deviation sumvariance diffvariance correlation imcorrelation sumaverage skewness maxprob kurtosis absolute +SUBDIRS = contrast dissimilarity invdiffmom angsecmom energy entropy sumentropy diffentropy mean variance deviation sumvariance diffvariance correlation imcorrelation sumaverage skewness maxprob kurtosis absolute clustertendency |
|
From: Herton R. K. <he...@us...> - 2005-07-13 02:18:15
|
Update of /cvsroot/kimageprocess/kimageprocess/src/methods/glcm/features/clustertendency In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10676/clustertendency Added Files: Makefile.am clustertendency.cpp clustertendency.h kimageprocess_glcm_clustertendency.desktop Log Message: - Added cluster tendency feature to glcm method. --- NEW FILE: kimageprocess_glcm_clustertendency.desktop --- [Desktop Entry] Name=clustertendency Comment=Cluster Tendency calculation over GLCM ServiceTypes=KImageProcess/Feature Type=Service X-KDE-Library=kimageprocess_glcm_clustertendency X-Category=glcm --- NEW FILE: clustertendency.cpp --- /*************************************************************************** * Copyright (C) 2005 by * * Gustavo Pichorim Boiko <gus...@kd...> * * Herton Ronaldo Krzesinski <he...@my...> * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * * along with this program; if not, write to the * * Free Software Foundation, Inc., * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ #include "clustertendency.h" #include <kgenericfactory.h> #include <kaction.h> #include <klocale.h> #include <kdebug.h> #include <ktimage.h> #include <ktfeaturemanager.h> #include <ktmethod.h> K_EXPORT_COMPONENT_FACTORY( kimageprocess_glcm_clustertendency, KGenericFactory<KTGLCMclustertendency>( "kimageprocess_glcm_clustertendency" ) ) KTGLCMclustertendency::KTGLCMclustertendency(QObject *parent, const char* name, const QStringList&) : KTFeature("glcm") { Q_UNUSED(parent); Q_UNUSED(name); //check dependencies m_featureName = i18n("clustertendency"); m_longName = i18n("Cluster Tendency"); } KTGLCMclustertendency::~KTGLCMclustertendency() { } float KTGLCMclustertendency::_calculate(KTImage *img, int direction) { int glcmSize = method()->dataSize(); float **glcm = (float**) method()->data(direction); float result = 0.0; float doublemean = 2 * m_mean->calculate(img, direction); int i, j; for (i = 0; i < glcmSize; ++i) for (j = 0; j < glcmSize; ++j) result += (i + j - doublemean) * glcm[i][j]; return result; } void KTGLCMclustertendency::resolveDeps() { m_mean = manager()->getFeature("glcm", "Mean"); } #include "clustertendency.moc" --- NEW FILE: clustertendency.h --- /*************************************************************************** * Copyright (C) 2005 by * * Gustavo Pichorim Boiko <gus...@kd...> * * Herton Ronaldo Krzesinski <he...@my...> * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * * along with this program; if not, write to the * * Free Software Foundation, Inc., * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ #ifndef KIMAGEPROCESS_GLCM_CLUSTERTENDENCY_H #define KIMAGEPROCESS_GLCM_CLUSTERTENDENCY_H #include <ktfeature.h> class KAction; class KTImage; /** * clustertendency calculation * @author Gustavo Pichorim Boiko * */ class KTGLCMclustertendency : public KTFeature { Q_OBJECT public: KTGLCMclustertendency(QObject *parent, const char *name, const QStringList&); ~KTGLCMclustertendency(); float _calculate(KTImage *img, int direction); void resolveDeps(); private: KTFeature *m_mean; }; #endif --- NEW FILE: Makefile.am --- INCLUDES = $(all_includes) -I$(srcdir)/../../../../libkimageprocess METASOURCES = AUTO kde_module_LTLIBRARIES = kimageprocess_glcm_clustertendency.la kimageprocess_glcm_clustertendency_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) noinst_HEADERS = clustertendency.h kimageprocess_glcm_clustertendency_la_SOURCES = clustertendency.cpp kde_services_DATA = kimageprocess_glcm_clustertendency.desktop kimageprocess_glcm_clustertendency_la_LIBADD = $(top_builddir)/src/libkimageprocess/libkimageprocess.la \ -lkdeui |
|
From: Herton R. K. <he...@us...> - 2005-07-13 02:17:25
|
Update of /cvsroot/kimageprocess/kimageprocess/src/methods/glcm/features/clustertendency In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10402/clustertendency Log Message: Directory /cvsroot/kimageprocess/kimageprocess/src/methods/glcm/features/clustertendency added to the repository |
|
From: Herton R. K. <he...@us...> - 2005-07-13 01:44:30
|
Update of /cvsroot/kimageprocess/kimageprocess/src/methods/glcm/features/absolute In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24048/absolute Added Files: Makefile.am absolute.cpp absolute.h kimageprocess_glcm_absolute.desktop Log Message: - Added absolute value glcm feature. --- NEW FILE: kimageprocess_glcm_absolute.desktop --- [Desktop Entry] Name=absolute Comment=Absolute Value calculation over GLCM ServiceTypes=KImageProcess/Feature Type=Service X-KDE-Library=kimageprocess_glcm_absolute X-Category=glcm --- NEW FILE: absolute.h --- /*************************************************************************** * Copyright (C) 2005 by * * Gustavo Pichorim Boiko <gus...@kd...> * * Herton Ronaldo Krzesinski <he...@my...> * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * * along with this program; if not, write to the * * Free Software Foundation, Inc., * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ #ifndef KIMAGEPROCESS_GLCM_ABSOLUTE_H #define KIMAGEPROCESS_GLCM_ABSOLUTE_H #include <ktfeature.h> class KAction; class KTImage; /** * absolute calculation * @author Gustavo Pichorim Boiko * */ class KTGLCMabsolute : public KTFeature { Q_OBJECT public: KTGLCMabsolute(QObject *parent, const char *name, const QStringList&); ~KTGLCMabsolute(); float _calculate(KTImage *img, int direction); }; #endif --- NEW FILE: Makefile.am --- INCLUDES = $(all_includes) -I$(srcdir)/../../../../libkimageprocess METASOURCES = AUTO kde_module_LTLIBRARIES = kimageprocess_glcm_absolute.la kimageprocess_glcm_absolute_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) noinst_HEADERS = absolute.h kimageprocess_glcm_absolute_la_SOURCES = absolute.cpp kde_services_DATA = kimageprocess_glcm_absolute.desktop kimageprocess_glcm_absolute_la_LIBADD = $(top_builddir)/src/libkimageprocess/libkimageprocess.la \ -lkdeui --- NEW FILE: absolute.cpp --- /*************************************************************************** * Copyright (C) 2005 by * * Gustavo Pichorim Boiko <gus...@kd...> * * Herton Ronaldo Krzesinski <he...@my...> * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * * along with this program; if not, write to the * * Free Software Foundation, Inc., * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ #include "absolute.h" #include <kgenericfactory.h> #include <kaction.h> #include <klocale.h> #include <kdebug.h> #include <ktimage.h> #include <ktfeaturemanager.h> #include <ktmethod.h> K_EXPORT_COMPONENT_FACTORY( kimageprocess_glcm_absolute, KGenericFactory<KTGLCMabsolute>( "kimageprocess_glcm_absolute" ) ) KTGLCMabsolute::KTGLCMabsolute(QObject *parent, const char* name, const QStringList&) : KTFeature("glcm") { Q_UNUSED(parent); Q_UNUSED(name); //check dependencies m_featureName = i18n("absolute"); m_longName = i18n("Absolute Value"); } KTGLCMabsolute::~KTGLCMabsolute() { } float KTGLCMabsolute::_calculate(KTImage *img, int direction) { int glcmSize = method()->dataSize(); float **glcm = (float**) method()->data(direction); int i, j; float result = 0.0; for (i = 0; i < glcmSize; ++i) for (j = 0; j < glcmSize; ++j) result += abs(i - j) * glcm[i][j]; return result; } #include "absolute.moc" |
|
From: Herton R. K. <he...@us...> - 2005-07-13 01:44:27
|
Update of /cvsroot/kimageprocess/kimageprocess/src/methods/glcm/features In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24048 Modified Files: Makefile.am Log Message: - Added absolute value glcm feature. Index: Makefile.am =================================================================== RCS file: /cvsroot/kimageprocess/kimageprocess/src/methods/glcm/features/Makefile.am,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- Makefile.am 13 Jul 2005 01:29:18 -0000 1.5 +++ Makefile.am 13 Jul 2005 01:44:19 -0000 1.6 @@ -1 +1 @@ -SUBDIRS = contrast dissimilarity invdiffmom angsecmom energy entropy sumentropy diffentropy mean variance deviation sumvariance diffvariance correlation imcorrelation sumaverage skewness maxprob kurtosis +SUBDIRS = contrast dissimilarity invdiffmom angsecmom energy entropy sumentropy diffentropy mean variance deviation sumvariance diffvariance correlation imcorrelation sumaverage skewness maxprob kurtosis absolute |
|
From: Herton R. K. <he...@us...> - 2005-07-13 01:43:12
|
Update of /cvsroot/kimageprocess/kimageprocess/src/methods/glcm/features/absolute In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23553/absolute Log Message: Directory /cvsroot/kimageprocess/kimageprocess/src/methods/glcm/features/absolute added to the repository |
|
From: Herton R. K. <he...@us...> - 2005-07-13 01:29:29
|
Update of /cvsroot/kimageprocess/kimageprocess/src/methods/glcm/features In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14026 Modified Files: Makefile.am Log Message: - Added kurtosis glcm texture feature. Index: Makefile.am =================================================================== RCS file: /cvsroot/kimageprocess/kimageprocess/src/methods/glcm/features/Makefile.am,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- Makefile.am 13 Jul 2005 00:37:32 -0000 1.4 +++ Makefile.am 13 Jul 2005 01:29:18 -0000 1.5 @@ -1 +1 @@ -SUBDIRS = contrast dissimilarity invdiffmom angsecmom energy entropy sumentropy diffentropy mean variance deviation sumvariance diffvariance correlation imcorrelation sumaverage skewness maxprob +SUBDIRS = contrast dissimilarity invdiffmom angsecmom energy entropy sumentropy diffentropy mean variance deviation sumvariance diffvariance correlation imcorrelation sumaverage skewness maxprob kurtosis |
|
From: Herton R. K. <he...@us...> - 2005-07-13 01:29:29
|
Update of /cvsroot/kimageprocess/kimageprocess/src/methods/glcm/features/kurtosis In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14026/kurtosis Added Files: Makefile.am kimageprocess_glcm_kurtosis.desktop kurtosis.cpp kurtosis.h Log Message: - Added kurtosis glcm texture feature. --- NEW FILE: kurtosis.cpp --- /*************************************************************************** * Copyright (C) 2005 by * * Gustavo Pichorim Boiko <gus...@kd...> * * Herton Ronaldo Krzesinski <he...@my...> * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * * along with this program; if not, write to the * * Free Software Foundation, Inc., * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ #include "kurtosis.h" #include <kgenericfactory.h> #include <kaction.h> #include <klocale.h> #include <kdebug.h> #include <ktimage.h> #include <ktfeaturemanager.h> #include <ktmethod.h> K_EXPORT_COMPONENT_FACTORY( kimageprocess_glcm_kurtosis, KGenericFactory<KTGLCMkurtosis>( "kimageprocess_glcm_kurtosis" ) ) KTGLCMkurtosis::KTGLCMkurtosis(QObject *parent, const char* name, const QStringList&) : KTFeature("glcm") { Q_UNUSED(parent); Q_UNUSED(name); //check dependencies m_featureName = i18n("kurtosis"); m_longName = i18n("Kurtosis"); } KTGLCMkurtosis::~KTGLCMkurtosis() { } float KTGLCMkurtosis::_calculate(KTImage *img, int direction) { int glcmSize = method()->dataSize(); float **glcm = (float**) method()->data(direction); float deviation = m_deviation->calculate(img, direction); float mean = m_mean->calculate(img, direction); float result = 0.0; int i, j; for (i = 0; i < glcmSize; ++i) for (j = 0; j < glcmSize; ++j) result += (i - mean) * (i - mean) * (i - mean) * (i - mean) * (glcm[i][j] - 3); result *= 1 / (deviation * deviation * deviation * deviation); return result; } void KTGLCMkurtosis::resolveDeps() { m_deviation = manager()->getFeature("glcm", "Deviation"); m_mean = manager()->getFeature("glcm", "Mean"); } #include "kurtosis.moc" --- NEW FILE: Makefile.am --- INCLUDES = $(all_includes) -I$(srcdir)/../../../../libkimageprocess METASOURCES = AUTO kde_module_LTLIBRARIES = kimageprocess_glcm_kurtosis.la kimageprocess_glcm_kurtosis_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) noinst_HEADERS = kurtosis.h kimageprocess_glcm_kurtosis_la_SOURCES = kurtosis.cpp kde_services_DATA = kimageprocess_glcm_kurtosis.desktop kimageprocess_glcm_kurtosis_la_LIBADD = $(top_builddir)/src/libkimageprocess/libkimageprocess.la \ -lkdeui --- NEW FILE: kurtosis.h --- /*************************************************************************** * Copyright (C) 2005 by * * Gustavo Pichorim Boiko <gus...@kd...> * * Herton Ronaldo Krzesinski <he...@my...> * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * * along with this program; if not, write to the * * Free Software Foundation, Inc., * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ #ifndef KIMAGEPROCESS_GLCM_KURTOSIS_H #define KIMAGEPROCESS_GLCM_KURTOSIS_H #include <ktfeature.h> class KAction; class KTImage; /** * kurtosis calculation * @author Gustavo Pichorim Boiko * */ class KTGLCMkurtosis : public KTFeature { Q_OBJECT public: KTGLCMkurtosis(QObject *parent, const char *name, const QStringList&); ~KTGLCMkurtosis(); float _calculate(KTImage *img, int direction); void resolveDeps(); private: KTFeature *m_deviation; KTFeature *m_mean; }; #endif --- NEW FILE: kimageprocess_glcm_kurtosis.desktop --- [Desktop Entry] Name=kurtosis Comment=Kurtosis calculation over GLCM ServiceTypes=KImageProcess/Feature Type=Service X-KDE-Library=kimageprocess_glcm_kurtosis X-Category=glcm |
|
From: Herton R. K. <he...@us...> - 2005-07-13 01:28:31
|
Update of /cvsroot/kimageprocess/kimageprocess/src/methods/glcm/features/kurtosis In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13427/kurtosis Log Message: Directory /cvsroot/kimageprocess/kimageprocess/src/methods/glcm/features/kurtosis added to the repository |
|
From: Gustavo P. B. <gb...@us...> - 2005-07-13 00:38:45
|
Update of /cvsroot/kimageprocess/kimageprocess/src/methods/glcm/features/contrast In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17890/contrast Modified Files: contrast.cpp Log Message: Added maxprob Index: contrast.cpp =================================================================== RCS file: /cvsroot/kimageprocess/kimageprocess/src/methods/glcm/features/contrast/contrast.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- contrast.cpp 23 Jun 2005 18:33:53 -0000 1.4 +++ contrast.cpp 13 Jul 2005 00:37:45 -0000 1.5 @@ -39,7 +39,7 @@ Q_UNUSED(name); //check dependencies - m_featureName = i18n("Contrast"); + m_featureName = i18n("Contrast (Haralick)"); m_longName = m_featureName; |
|
From: Gustavo P. B. <gb...@us...> - 2005-07-13 00:38:44
|
Update of /cvsroot/kimageprocess/kimageprocess/src/methods/glcm/features/angsecmom In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17890/angsecmom Modified Files: angsecmom.cpp Log Message: Added maxprob Index: angsecmom.cpp =================================================================== RCS file: /cvsroot/kimageprocess/kimageprocess/src/methods/glcm/features/angsecmom/angsecmom.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- angsecmom.cpp 23 Jun 2005 18:33:52 -0000 1.5 +++ angsecmom.cpp 13 Jul 2005 00:37:32 -0000 1.6 @@ -40,7 +40,7 @@ //check dependencies m_featureName = i18n("AngSecMom"); - m_longName = i18n("Angular Second Moment"); + m_longName = i18n("Angular Second Moment (Haralick)"); } |
|
From: Gustavo P. B. <gb...@us...> - 2005-07-13 00:38:15
|
Update of /cvsroot/kimageprocess/kimageprocess/src/methods/glcm/features In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17890 Modified Files: Makefile.am Log Message: Added maxprob Index: Makefile.am =================================================================== RCS file: /cvsroot/kimageprocess/kimageprocess/src/methods/glcm/features/Makefile.am,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- Makefile.am 13 Jul 2005 00:34:34 -0000 1.3 +++ Makefile.am 13 Jul 2005 00:37:32 -0000 1.4 @@ -1 +1 @@ -SUBDIRS = contrast dissimilarity invdiffmom angsecmom energy entropy sumentropy diffentropy mean variance deviation sumvariance diffvariance correlation imcorrelation sumaverage skewness +SUBDIRS = contrast dissimilarity invdiffmom angsecmom energy entropy sumentropy diffentropy mean variance deviation sumvariance diffvariance correlation imcorrelation sumaverage skewness maxprob |
|
From: Gustavo P. B. <gb...@us...> - 2005-07-13 00:38:07
|
Update of /cvsroot/kimageprocess/kimageprocess/src/methods/glcm/features/diffvariance In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17890/diffvariance Modified Files: diffvariance.cpp Log Message: Added maxprob Index: diffvariance.cpp =================================================================== RCS file: /cvsroot/kimageprocess/kimageprocess/src/methods/glcm/features/diffvariance/diffvariance.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- diffvariance.cpp 23 Jun 2005 18:33:55 -0000 1.4 +++ diffvariance.cpp 13 Jul 2005 00:37:46 -0000 1.5 @@ -40,7 +40,7 @@ //check dependencies m_featureName = i18n("DiffVariance"); - m_longName = i18n("Difference Variance"); + m_longName = i18n("Difference Variance (Haralick)"); } |
|
From: Gustavo P. B. <gb...@us...> - 2005-07-13 00:38:07
|
Update of /cvsroot/kimageprocess/kimageprocess/src/methods/glcm/features/diffentropy In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17890/diffentropy Modified Files: diffentropy.cpp Log Message: Added maxprob Index: diffentropy.cpp =================================================================== RCS file: /cvsroot/kimageprocess/kimageprocess/src/methods/glcm/features/diffentropy/diffentropy.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- diffentropy.cpp 23 Jun 2005 18:33:54 -0000 1.4 +++ diffentropy.cpp 13 Jul 2005 00:37:46 -0000 1.5 @@ -44,7 +44,7 @@ //check dependencies m_featureName = i18n("DiffEntropy"); - m_longName = i18n("Difference Entropy"); + m_longName = i18n("Difference Entropy (Haralick)"); } |
