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...> - 2005-06-23 18:34:44
|
Update of /cvsroot/kimageprocess/kimageprocess/src/methods/glcm/features/maxcorrelationcoef In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19081/src/methods/glcm/features/maxcorrelationcoef Modified Files: maxcorrelationcoef.cpp maxcorrelationcoef.h Log Message: Copyright update Index: maxcorrelationcoef.cpp =================================================================== RCS file: /cvsroot/kimageprocess/kimageprocess/src/methods/glcm/features/maxcorrelationcoef/maxcorrelationcoef.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- maxcorrelationcoef.cpp 24 Mar 2005 03:06:06 -0000 1.2 +++ maxcorrelationcoef.cpp 23 Jun 2005 18:34:03 -0000 1.3 @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2004 by * + * Copyright (C) 2004-2005 by * * Gustavo Pichorim Boiko <gus...@kd...> * * Herton Ronaldo Krzesinski <he...@my...> * * * Index: maxcorrelationcoef.h =================================================================== RCS file: /cvsroot/kimageprocess/kimageprocess/src/methods/glcm/features/maxcorrelationcoef/maxcorrelationcoef.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- maxcorrelationcoef.h 24 Mar 2005 03:06:06 -0000 1.2 +++ maxcorrelationcoef.h 23 Jun 2005 18:34:03 -0000 1.3 @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2004 by * + * Copyright (C) 2004-2005 by * * Gustavo Pichorim Boiko <gus...@kd...> * * Herton Ronaldo Krzesinski <he...@my...> * * * |
|
From: Gustavo P. B. <gb...@us...> - 2005-06-23 18:34:43
|
Update of /cvsroot/kimageprocess/kimageprocess/src/methods/glcm/features/diffvariance In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19081/src/methods/glcm/features/diffvariance Modified Files: diffvariance.cpp diffvariance.h Log Message: Copyright update Index: diffvariance.cpp =================================================================== RCS file: /cvsroot/kimageprocess/kimageprocess/src/methods/glcm/features/diffvariance/diffvariance.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- diffvariance.cpp 2 Apr 2005 20:10:21 -0000 1.3 +++ diffvariance.cpp 23 Jun 2005 18:33:55 -0000 1.4 @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2004 by * + * Copyright (C) 2004-2005 by * * Gustavo Pichorim Boiko <gus...@kd...> * * Herton Ronaldo Krzesinski <he...@my...> * * * Index: diffvariance.h =================================================================== RCS file: /cvsroot/kimageprocess/kimageprocess/src/methods/glcm/features/diffvariance/diffvariance.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- diffvariance.h 24 Mar 2005 03:06:04 -0000 1.2 +++ diffvariance.h 23 Jun 2005 18:34:00 -0000 1.3 @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2004 by * + * Copyright (C) 2004-2005 by * * Gustavo Pichorim Boiko <gus...@kd...> * * Herton Ronaldo Krzesinski <he...@my...> * * * |
|
From: Gustavo P. B. <gb...@us...> - 2005-06-23 18:34:43
|
Update of /cvsroot/kimageprocess/kimageprocess/src/methods/glcm/features/contrast In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19081/src/methods/glcm/features/contrast Modified Files: contrast.cpp contrast.h Log Message: Copyright update Index: contrast.cpp =================================================================== RCS file: /cvsroot/kimageprocess/kimageprocess/src/methods/glcm/features/contrast/contrast.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- contrast.cpp 2 Apr 2005 20:10:07 -0000 1.3 +++ contrast.cpp 23 Jun 2005 18:33:53 -0000 1.4 @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2004 by * + * Copyright (C) 2004-2005 by * * Gustavo Pichorim Boiko <gus...@kd...> * * Herton Ronaldo Krzesinski <he...@my...> * * * Index: contrast.h =================================================================== RCS file: /cvsroot/kimageprocess/kimageprocess/src/methods/glcm/features/contrast/contrast.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- contrast.h 24 Mar 2005 03:05:47 -0000 1.2 +++ contrast.h 23 Jun 2005 18:33:53 -0000 1.3 @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2004 by * + * Copyright (C) 2004-2005 by * * Gustavo Pichorim Boiko <gus...@kd...> * * Herton Ronaldo Krzesinski <he...@my...> * * * |
|
From: Gustavo P. B. <gb...@us...> - 2005-06-23 18:34:43
|
Update of /cvsroot/kimageprocess/kimageprocess/src/methods/glcm/features/correlation In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19081/src/methods/glcm/features/correlation Modified Files: correlation.cpp correlation.h Log Message: Copyright update Index: correlation.cpp =================================================================== RCS file: /cvsroot/kimageprocess/kimageprocess/src/methods/glcm/features/correlation/correlation.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- correlation.cpp 2 Apr 2005 20:10:07 -0000 1.3 +++ correlation.cpp 23 Jun 2005 18:33:53 -0000 1.4 @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2004 by * + * Copyright (C) 2004-2005 by * * Gustavo Pichorim Boiko <gus...@kd...> * * Herton Ronaldo Krzesinski <he...@my...> * * * Index: correlation.h =================================================================== RCS file: /cvsroot/kimageprocess/kimageprocess/src/methods/glcm/features/correlation/correlation.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- correlation.h 24 Mar 2005 03:05:47 -0000 1.2 +++ correlation.h 23 Jun 2005 18:33:53 -0000 1.3 @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2004 by * + * Copyright (C) 2004-2005 by * * Gustavo Pichorim Boiko <gus...@kd...> * * Herton Ronaldo Krzesinski <he...@my...> * * * |
|
From: Gustavo P. B. <gb...@us...> - 2005-06-23 18:34:43
|
Update of /cvsroot/kimageprocess/kimageprocess/src/methods/glcm/features/invdiffmom In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19081/src/methods/glcm/features/invdiffmom Modified Files: invdiffmom.cpp invdiffmom.h Log Message: Copyright update Index: invdiffmom.cpp =================================================================== RCS file: /cvsroot/kimageprocess/kimageprocess/src/methods/glcm/features/invdiffmom/invdiffmom.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- invdiffmom.cpp 2 Apr 2005 20:10:23 -0000 1.3 +++ invdiffmom.cpp 23 Jun 2005 18:34:02 -0000 1.4 @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2004 by * + * Copyright (C) 2004-2005 by * * Gustavo Pichorim Boiko <gus...@kd...> * * Herton Ronaldo Krzesinski <he...@my...> * * * Index: invdiffmom.h =================================================================== RCS file: /cvsroot/kimageprocess/kimageprocess/src/methods/glcm/features/invdiffmom/invdiffmom.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- invdiffmom.h 24 Mar 2005 03:06:06 -0000 1.2 +++ invdiffmom.h 23 Jun 2005 18:34:02 -0000 1.3 @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2004 by * + * Copyright (C) 2004-2005 by * * Gustavo Pichorim Boiko <gus...@kd...> * * Herton Ronaldo Krzesinski <he...@my...> * * * |
|
From: Gustavo P. B. <gb...@us...> - 2005-06-23 18:34:40
|
Update of /cvsroot/kimageprocess/kimageprocess/src/libktimgview In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19081/src/libktimgview Modified Files: ktimageview.cpp ktimageview.h ktimagewidget.cpp ktimagewidget.h Log Message: Copyright update Index: ktimagewidget.cpp =================================================================== RCS file: /cvsroot/kimageprocess/kimageprocess/src/libktimgview/ktimagewidget.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- ktimagewidget.cpp 31 Mar 2005 02:55:53 -0000 1.2 +++ ktimagewidget.cpp 23 Jun 2005 18:33:52 -0000 1.3 @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2004 by * + * Copyright (C) 2004-2005 by * * Gustavo Pichorim Boiko <gus...@kd...> * * Herton Ronaldo Krzesinski <he...@my...> * * * Index: ktimageview.h =================================================================== RCS file: /cvsroot/kimageprocess/kimageprocess/src/libktimgview/ktimageview.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- ktimageview.h 10 Dec 2004 23:30:52 -0000 1.1.1.1 +++ ktimageview.h 23 Jun 2005 18:33:52 -0000 1.2 @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2004 by * + * Copyright (C) 2004-2005 by * * Gustavo Pichorim Boiko <gus...@kd...> * * Herton Ronaldo Krzesinski <he...@my...> * * * Index: ktimagewidget.h =================================================================== RCS file: /cvsroot/kimageprocess/kimageprocess/src/libktimgview/ktimagewidget.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- ktimagewidget.h 10 Dec 2004 23:30:52 -0000 1.1.1.1 +++ ktimagewidget.h 23 Jun 2005 18:33:52 -0000 1.2 @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2004 by * + * Copyright (C) 2004-2005 by * * Gustavo Pichorim Boiko <gus...@kd...> * * Herton Ronaldo Krzesinski <he...@my...> * * * Index: ktimageview.cpp =================================================================== RCS file: /cvsroot/kimageprocess/kimageprocess/src/libktimgview/ktimageview.cpp,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- ktimageview.cpp 10 Dec 2004 23:30:52 -0000 1.1.1.1 +++ ktimageview.cpp 23 Jun 2005 18:33:51 -0000 1.2 @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2004 by * + * Copyright (C) 2004-2005 by * * Gustavo Pichorim Boiko <gus...@kd...> * * Herton Ronaldo Krzesinski <he...@my...> * * * |
|
From: Gustavo P. B. <gb...@us...> - 2005-06-23 18:34:40
|
Update of /cvsroot/kimageprocess/kimageprocess/src/methods/glcm/features/deviation In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19081/src/methods/glcm/features/deviation Modified Files: deviation.cpp deviation.h Log Message: Copyright update Index: deviation.cpp =================================================================== RCS file: /cvsroot/kimageprocess/kimageprocess/src/methods/glcm/features/deviation/deviation.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- deviation.cpp 24 Mar 2005 03:05:47 -0000 1.2 +++ deviation.cpp 23 Jun 2005 18:33:54 -0000 1.3 @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2004 by * + * Copyright (C) 2004-2005 by * * Gustavo Pichorim Boiko <gus...@kd...> * * Herton Ronaldo Krzesinski <he...@my...> * * * Index: deviation.h =================================================================== RCS file: /cvsroot/kimageprocess/kimageprocess/src/methods/glcm/features/deviation/deviation.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- deviation.h 24 Mar 2005 03:05:48 -0000 1.2 +++ deviation.h 23 Jun 2005 18:33:54 -0000 1.3 @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2004 by * + * Copyright (C) 2004-2005 by * * Gustavo Pichorim Boiko <gus...@kd...> * * Herton Ronaldo Krzesinski <he...@my...> * * * |
|
From: Gustavo P. B. <gb...@us...> - 2005-06-23 18:34:37
|
Update of /cvsroot/kimageprocess/kimageprocess/src/methods/glcm/features/diffentropy In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19081/src/methods/glcm/features/diffentropy Modified Files: diffentropy.cpp diffentropy.h Log Message: Copyright update Index: diffentropy.cpp =================================================================== RCS file: /cvsroot/kimageprocess/kimageprocess/src/methods/glcm/features/diffentropy/diffentropy.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- diffentropy.cpp 2 Apr 2005 20:10:20 -0000 1.3 +++ diffentropy.cpp 23 Jun 2005 18:33:54 -0000 1.4 @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2004 by * + * Copyright (C) 2004-2005 by * * Gustavo Pichorim Boiko <gus...@kd...> * * Herton Ronaldo Krzesinski <he...@my...> * * * Index: diffentropy.h =================================================================== RCS file: /cvsroot/kimageprocess/kimageprocess/src/methods/glcm/features/diffentropy/diffentropy.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- diffentropy.h 24 Mar 2005 03:05:48 -0000 1.2 +++ diffentropy.h 23 Jun 2005 18:33:54 -0000 1.3 @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2004 by * + * Copyright (C) 2004-2005 by * * Gustavo Pichorim Boiko <gus...@kd...> * * Herton Ronaldo Krzesinski <he...@my...> * * * |
|
From: Gustavo P. B. <gb...@us...> - 2005-06-23 18:34:37
|
Update of /cvsroot/kimageprocess/kimageprocess/src/methods/glcm In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19081/src/methods/glcm Modified Files: glcm.cpp glcm.h Log Message: Copyright update Index: glcm.cpp =================================================================== RCS file: /cvsroot/kimageprocess/kimageprocess/src/methods/glcm/glcm.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- glcm.cpp 23 Jun 2005 03:18:47 -0000 1.8 +++ glcm.cpp 23 Jun 2005 18:33:52 -0000 1.9 @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2004 by * + * Copyright (C) 2004-2005 by * * Gustavo Pichorim Boiko <gus...@kd...> * * Herton Ronaldo Krzesinski <he...@my...> * * * Index: glcm.h =================================================================== RCS file: /cvsroot/kimageprocess/kimageprocess/src/methods/glcm/glcm.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- glcm.h 5 Apr 2005 22:49:08 -0000 1.5 +++ glcm.h 23 Jun 2005 18:33:52 -0000 1.6 @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2004 by * + * Copyright (C) 2004-2005 by * * Gustavo Pichorim Boiko <gus...@kd...> * * Herton Ronaldo Krzesinski <he...@my...> * * * |
|
From: Gustavo P. B. <gb...@us...> - 2005-06-23 18:34:37
|
Update of /cvsroot/kimageprocess/kimageprocess/src/methods/glcm/features/angsecmom In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19081/src/methods/glcm/features/angsecmom Modified Files: angsecmom.cpp angsecmom.h Log Message: Copyright update Index: angsecmom.h =================================================================== RCS file: /cvsroot/kimageprocess/kimageprocess/src/methods/glcm/features/angsecmom/angsecmom.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- angsecmom.h 24 Mar 2005 03:05:46 -0000 1.2 +++ angsecmom.h 23 Jun 2005 18:33:53 -0000 1.3 @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2004 by * + * Copyright (C) 2004-2005 by * * Gustavo Pichorim Boiko <gus...@kd...> * * Herton Ronaldo Krzesinski <he...@my...> * * * Index: angsecmom.cpp =================================================================== RCS file: /cvsroot/kimageprocess/kimageprocess/src/methods/glcm/features/angsecmom/angsecmom.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- angsecmom.cpp 2 Apr 2005 20:10:06 -0000 1.4 +++ angsecmom.cpp 23 Jun 2005 18:33:52 -0000 1.5 @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2004 by * + * Copyright (C) 2004-2005 by * * Gustavo Pichorim Boiko <gus...@kd...> * * Herton Ronaldo Krzesinski <he...@my...> * * * |
|
From: Gustavo P. B. <gb...@us...> - 2005-06-23 18:34:35
|
Update of /cvsroot/kimageprocess/kimageprocess/doc/en In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19081/doc/en Modified Files: index.docbook Log Message: Copyright update Index: index.docbook =================================================================== RCS file: /cvsroot/kimageprocess/kimageprocess/doc/en/index.docbook,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- index.docbook 4 Jan 2005 22:15:30 -0000 1.6 +++ index.docbook 23 Jun 2005 18:33:48 -0000 1.7 @@ -68,7 +68,7 @@ <!-- TRANS:ROLES_OF_TRANSLATORS --> <copyright> -<year>2004</year> +<year>2004-2005</year> <holder>Gustavo Pichorim Boiko</holder> <holder>Herton Ronaldo Krzesinski</holder> </copyright> @@ -543,8 +543,8 @@ <para> Copyright: <itemizedlist> -<listitem><para>2004 Gustavo Pichorim Boiko <email>gus...@kd...</email></para></listitem> -<listitem><para>2004 Herton Ronaldo Krzesinski <email>he...@my...</email></para></listitem> +<listitem><para>2004-2005 Gustavo Pichorim Boiko <email>gus...@kd...</email></para></listitem> +<listitem><para>2004-2005 Herton Ronaldo Krzesinski <email>he...@my...</email></para></listitem> </itemizedlist> </para> <para> |
|
From: Gustavo P. B. <gb...@us...> - 2005-06-23 18:34:16
|
Update of /cvsroot/kimageprocess/kimageprocess/src/methods/hsvcm/features/entropy In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19081/src/methods/hsvcm/features/entropy Modified Files: entropy.cpp entropy.h Log Message: Copyright update Index: entropy.h =================================================================== RCS file: /cvsroot/kimageprocess/kimageprocess/src/methods/hsvcm/features/entropy/entropy.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- entropy.h 6 Apr 2005 04:12:54 -0000 1.2 +++ entropy.h 23 Jun 2005 18:34:06 -0000 1.3 @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2004 by * + * Copyright (C) 2004-2005 by * * Gustavo Pichorim Boiko <gus...@kd...> * * Herton Ronaldo Krzesinski <he...@my...> * * * Index: entropy.cpp =================================================================== RCS file: /cvsroot/kimageprocess/kimageprocess/src/methods/hsvcm/features/entropy/entropy.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- entropy.cpp 2 Jun 2005 02:11:39 -0000 1.5 +++ entropy.cpp 23 Jun 2005 18:34:06 -0000 1.6 @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2004 by * + * Copyright (C) 2004-2005 by * * Gustavo Pichorim Boiko <gus...@kd...> * * Herton Ronaldo Krzesinski <he...@my...> * * * |
|
From: Gustavo P. B. <gb...@us...> - 2005-06-23 18:34:16
|
Update of /cvsroot/kimageprocess/kimageprocess/src/methods/hsvcm/features/contrast In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19081/src/methods/hsvcm/features/contrast Modified Files: contrast.cpp contrast.h Log Message: Copyright update Index: contrast.cpp =================================================================== RCS file: /cvsroot/kimageprocess/kimageprocess/src/methods/hsvcm/features/contrast/contrast.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- contrast.cpp 2 Jun 2005 02:11:39 -0000 1.6 +++ contrast.cpp 23 Jun 2005 18:34:06 -0000 1.7 @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2004 by * + * Copyright (C) 2004-2005 by * * Gustavo Pichorim Boiko <gus...@kd...> * * Herton Ronaldo Krzesinski <he...@my...> * * * Index: contrast.h =================================================================== RCS file: /cvsroot/kimageprocess/kimageprocess/src/methods/hsvcm/features/contrast/contrast.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- contrast.h 6 Apr 2005 04:12:53 -0000 1.2 +++ contrast.h 23 Jun 2005 18:34:06 -0000 1.3 @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2004 by * + * Copyright (C) 2004-2005 by * * Gustavo Pichorim Boiko <gus...@kd...> * * Herton Ronaldo Krzesinski <he...@my...> * * * |
|
From: Gustavo P. B. <gb...@us...> - 2005-06-23 18:34:15
|
Update of /cvsroot/kimageprocess/kimageprocess/src/methods/hsvcm/features/correlation In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19081/src/methods/hsvcm/features/correlation Modified Files: correlation.cpp correlation.h Log Message: Copyright update Index: correlation.cpp =================================================================== RCS file: /cvsroot/kimageprocess/kimageprocess/src/methods/hsvcm/features/correlation/correlation.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- correlation.cpp 2 Jun 2005 02:11:39 -0000 1.7 +++ correlation.cpp 23 Jun 2005 18:34:06 -0000 1.8 @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2004 by * + * Copyright (C) 2004-2005 by * * Gustavo Pichorim Boiko <gus...@kd...> * * Herton Ronaldo Krzesinski <he...@my...> * * * Index: correlation.h =================================================================== RCS file: /cvsroot/kimageprocess/kimageprocess/src/methods/hsvcm/features/correlation/correlation.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- correlation.h 6 Apr 2005 04:12:54 -0000 1.2 +++ correlation.h 23 Jun 2005 18:34:06 -0000 1.3 @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2004 by * + * Copyright (C) 2004-2005 by * * Gustavo Pichorim Boiko <gus...@kd...> * * Herton Ronaldo Krzesinski <he...@my...> * * * |
|
From: Gustavo P. B. <gb...@us...> - 2005-06-23 18:34:15
|
Update of /cvsroot/kimageprocess/kimageprocess/src/methods/hsvcm/features/angsecmom In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19081/src/methods/hsvcm/features/angsecmom Modified Files: angsecmom.cpp angsecmom.h Log Message: Copyright update Index: angsecmom.h =================================================================== RCS file: /cvsroot/kimageprocess/kimageprocess/src/methods/hsvcm/features/angsecmom/angsecmom.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- angsecmom.h 6 Apr 2005 04:12:53 -0000 1.2 +++ angsecmom.h 23 Jun 2005 18:34:06 -0000 1.3 @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2004 by * + * Copyright (C) 2004-2005 by * * Gustavo Pichorim Boiko <gus...@kd...> * * Herton Ronaldo Krzesinski <he...@my...> * * * Index: angsecmom.cpp =================================================================== RCS file: /cvsroot/kimageprocess/kimageprocess/src/methods/hsvcm/features/angsecmom/angsecmom.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- angsecmom.cpp 2 Jun 2005 02:07:21 -0000 1.5 +++ angsecmom.cpp 23 Jun 2005 18:34:05 -0000 1.6 @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2004 by * + * Copyright (C) 2004-2005 by * * Gustavo Pichorim Boiko <gus...@kd...> * * Herton Ronaldo Krzesinski <he...@my...> * * * |
|
From: Gustavo P. B. <gb...@us...> - 2005-06-23 18:34:14
|
Update of /cvsroot/kimageprocess/kimageprocess/src/methods/glcm/features/variance In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19081/src/methods/glcm/features/variance Modified Files: variance.cpp variance.h Log Message: Copyright update Index: variance.cpp =================================================================== RCS file: /cvsroot/kimageprocess/kimageprocess/src/methods/glcm/features/variance/variance.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- variance.cpp 24 Mar 2005 03:06:08 -0000 1.2 +++ variance.cpp 23 Jun 2005 18:34:04 -0000 1.3 @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2004 by * + * Copyright (C) 2004-2005 by * * Gustavo Pichorim Boiko <gus...@kd...> * * Herton Ronaldo Krzesinski <he...@my...> * * * Index: variance.h =================================================================== RCS file: /cvsroot/kimageprocess/kimageprocess/src/methods/glcm/features/variance/variance.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- variance.h 24 Mar 2005 03:06:08 -0000 1.2 +++ variance.h 23 Jun 2005 18:34:05 -0000 1.3 @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2004 by * + * Copyright (C) 2004-2005 by * * Gustavo Pichorim Boiko <gus...@kd...> * * Herton Ronaldo Krzesinski <he...@my...> * * * |
|
From: Gustavo P. B. <gb...@us...> - 2005-06-23 18:34:14
|
Update of /cvsroot/kimageprocess/kimageprocess/src/methods/hsvcm In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19081/src/methods/hsvcm Modified Files: hsvcm.cpp hsvcm.h Log Message: Copyright update Index: hsvcm.cpp =================================================================== RCS file: /cvsroot/kimageprocess/kimageprocess/src/methods/hsvcm/hsvcm.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- hsvcm.cpp 23 Jun 2005 03:18:47 -0000 1.11 +++ hsvcm.cpp 23 Jun 2005 18:34:05 -0000 1.12 @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2004 by * + * Copyright (C) 2004-2005 by * * Gustavo Pichorim Boiko <gus...@kd...> * * Herton Ronaldo Krzesinski <he...@my...> * * * Index: hsvcm.h =================================================================== RCS file: /cvsroot/kimageprocess/kimageprocess/src/methods/hsvcm/hsvcm.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- hsvcm.h 5 Apr 2005 22:49:08 -0000 1.4 +++ hsvcm.h 23 Jun 2005 18:34:05 -0000 1.5 @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2004 by * + * Copyright (C) 2004-2005 by * * Gustavo Pichorim Boiko <gus...@kd...> * * Herton Ronaldo Krzesinski <he...@my...> * * * |
|
From: Gustavo P. B. <gb...@us...> - 2005-06-23 18:32:34
|
Update of /cvsroot/kimageprocess/kimageprocess/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18384 Modified Files: kimageprocess.cpp kimageprocess.h kimageprocessui.rc Log Message: - Copyright fix - Added two actions for data extraction Index: kimageprocess.h =================================================================== RCS file: /cvsroot/kimageprocess/kimageprocess/src/kimageprocess.h,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- kimageprocess.h 23 Jun 2005 03:18:47 -0000 1.9 +++ kimageprocess.h 23 Jun 2005 18:32:24 -0000 1.10 @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2004 by * + * Copyright (C) 2004-2005 by * * Gustavo Pichorim Boiko <gus...@kd...> * * Herton Ronaldo Krzesinski <he...@my...> * * * @@ -109,6 +109,8 @@ void projectDelSample(); void projectAddImage(); void projectDelImage(); + void projectCalculateSampleData(); + void projectCalculateTestData(); void changeStatusbar(const QString& text); void changeCaption(const QString& text); @@ -132,6 +134,8 @@ KAction *m_projectDelImageAction; KAction *m_projectGenerateTestPattern; KAction *m_projectGeneratePatternsAction; + KAction *m_projectCalculateSampleData; + KAction *m_projectCalculateTestData; KRecentFilesAction *m_recentFiles; }; Index: kimageprocessui.rc =================================================================== RCS file: /cvsroot/kimageprocess/kimageprocess/src/kimageprocessui.rc,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- kimageprocessui.rc 15 Mar 2005 23:02:04 -0000 1.6 +++ kimageprocessui.rc 23 Jun 2005 18:32:24 -0000 1.7 @@ -13,12 +13,12 @@ <Separator lineSeparator="true"/> <Action name="project_add_sample" /> <Action name="project_add_image" /> - <Action name="project_open_res" /> + <Separator lineSeparator="true"/> + <Action name="project_calc_sample_data"/> + <Action name="project_calc_test_data"/> + <Separator lineSeparator="true"/> <Action name="project_quit" /> </Menu> - <Menu name="plugins"><text>Plugins</text> - <DefineGroup name="plugin_menu" /> - </Menu> </MenuBar> <ToolBar fullWidth="true" name="mainToolBar"> <Action name="project_new"/> @@ -31,6 +31,8 @@ <Action name="project_del_sample"/> <Action name="project_add_image"/> <Action name="project_del_image"/> - <Action name="project_open_res"/> + <Separator lineSeparator="true"/> + <Action name="project_calc_sample_data"/> + <Action name="project_calc_test_data"/> </ToolBar> </kpartgui> Index: kimageprocess.cpp =================================================================== RCS file: /cvsroot/kimageprocess/kimageprocess/src/kimageprocess.cpp,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- kimageprocess.cpp 23 Jun 2005 03:18:47 -0000 1.21 +++ kimageprocess.cpp 23 Jun 2005 18:32:24 -0000 1.22 @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2004 by * + * Copyright (C) 2004-2005 by * * Gustavo Pichorim Boiko <gus...@kd...> * * Herton Ronaldo Krzesinski <he...@my...> * * * @@ -190,6 +190,14 @@ m_projectDelImageAction = new KAction(i18n("Remove T&esting Image"), 0, this, SLOT(projectDelImage()), actionCollection(), "project_del_image"); + + m_projectCalculateSampleData = new KAction(i18n("Calculate &Sample Data"), 0, + this, SLOT(projectCalculateSampleData()), + actionCollection(), "project_calc_sample_data"); + + m_projectCalculateTestData = new KAction(i18n("Calculate Testing &Data"), 0, + this, SLOT(projectCalculateTestData()), + actionCollection(), "project_calc_test_data"); createGUI(); } @@ -405,6 +413,14 @@ KTProject::self()->removeTestingImage(itm->img()); } +void KImageProcess::projectCalculateSampleData() +{ +} + +void KImageProcess::projectCalculateTestData() +{ +} + void KImageProcess::changeStatusbar(const QString& text) { // display the text on the statusbar @@ -421,4 +437,5 @@ { load(url); } + #include "kimageprocess.moc" |
|
From: Gustavo P. B. <gb...@us...> - 2005-06-23 18:30:20
|
Update of /cvsroot/kimageprocess/kimageprocess/src/plugins/lwnn In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17144/lwnn Modified Files: Makefile.am klwnnconfig.cpp klwnnconfig.h lwnn.cpp lwnn.h Removed Files: kimageprocess_lwnn.rc Log Message: - Removed rc files for plugins (won't be needed anymore) - Changed copyright Index: lwnn.h =================================================================== RCS file: /cvsroot/kimageprocess/kimageprocess/src/plugins/lwnn/lwnn.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- lwnn.h 27 Feb 2005 20:52:39 -0000 1.3 +++ lwnn.h 23 Jun 2005 18:30:07 -0000 1.4 @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2004 by * + * Copyright (C) 2004-2005 by * * Gustavo Pichorim Boiko <gus...@kd...> * * Herton Ronaldo Krzesinski <he...@my...> * * * Index: lwnn.cpp =================================================================== RCS file: /cvsroot/kimageprocess/kimageprocess/src/plugins/lwnn/lwnn.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- lwnn.cpp 23 Jun 2005 03:18:48 -0000 1.4 +++ lwnn.cpp 23 Jun 2005 18:30:07 -0000 1.5 @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2004 by * + * Copyright (C) 2004-2005 by * * Gustavo Pichorim Boiko <gus...@kd...> * * Herton Ronaldo Krzesinski <he...@my...> * * * --- kimageprocess_lwnn.rc DELETED --- Index: klwnnconfig.cpp =================================================================== RCS file: /cvsroot/kimageprocess/kimageprocess/src/plugins/lwnn/klwnnconfig.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- klwnnconfig.cpp 27 Feb 2005 20:52:38 -0000 1.2 +++ klwnnconfig.cpp 23 Jun 2005 18:30:07 -0000 1.3 @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2004 by * + * Copyright (C) 2004-2005 by * * Gustavo Pichorim Boiko <gus...@kd...> * * Herton Ronaldo Krzesinski <he...@my...> * * * Index: klwnnconfig.h =================================================================== RCS file: /cvsroot/kimageprocess/kimageprocess/src/plugins/lwnn/klwnnconfig.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- klwnnconfig.h 27 Feb 2005 17:55:57 -0000 1.1 +++ klwnnconfig.h 23 Jun 2005 18:30:07 -0000 1.2 @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2004 by * + * Copyright (C) 2004-2005 by * * Gustavo Pichorim Boiko <gus...@kd...> * * Herton Ronaldo Krzesinski <he...@my...> * * * Index: Makefile.am =================================================================== RCS file: /cvsroot/kimageprocess/kimageprocess/src/plugins/lwnn/Makefile.am,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- Makefile.am 27 Feb 2005 17:55:56 -0000 1.2 +++ Makefile.am 23 Jun 2005 18:30:07 -0000 1.3 @@ -12,5 +12,3 @@ $(top_builddir)/src/plugins/lwnn/lwneuralnet/liblwneuralnet.a \ -lkdeui $(LIB_KIO) -pluginsdir = $(kde_datadir)/kimageprocess_lwnn -plugins_DATA = kimageprocess_lwnn.rc |
|
From: Gustavo P. B. <gb...@us...> - 2005-06-23 18:30:17
|
Update of /cvsroot/kimageprocess/kimageprocess/src/plugins/fann In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17144/fann Modified Files: Makefile.am fann.cpp fann.h Removed Files: kimageprocess_fann.rc Log Message: - Removed rc files for plugins (won't be needed anymore) - Changed copyright Index: fann.h =================================================================== RCS file: /cvsroot/kimageprocess/kimageprocess/src/plugins/fann/fann.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- fann.h 23 Jun 2005 03:18:48 -0000 1.3 +++ fann.h 23 Jun 2005 18:30:06 -0000 1.4 @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2004 by * + * Copyright (C) 2004-2005 by * * Gustavo Pichorim Boiko <gus...@kd...> * * Herton Ronaldo Krzesinski <he...@my...> * * * Index: Makefile.am =================================================================== RCS file: /cvsroot/kimageprocess/kimageprocess/src/plugins/fann/Makefile.am,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Makefile.am 5 Mar 2005 21:14:05 -0000 1.1 +++ Makefile.am 23 Jun 2005 18:30:06 -0000 1.2 @@ -13,5 +13,3 @@ $(top_builddir)/src/plugins/fann/libfann/libfloatfann.a \ -lkdeui $(LIB_KIO) -pluginsdir = $(kde_datadir)/kimageprocess_fann -plugins_DATA = kimageprocess_fann.rc Index: fann.cpp =================================================================== RCS file: /cvsroot/kimageprocess/kimageprocess/src/plugins/fann/fann.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- fann.cpp 23 Jun 2005 03:18:48 -0000 1.4 +++ fann.cpp 23 Jun 2005 18:30:06 -0000 1.5 @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2004 by * + * Copyright (C) 2004-2005 by * * Gustavo Pichorim Boiko <gus...@kd...> * * Herton Ronaldo Krzesinski <he...@my...> * * * --- kimageprocess_fann.rc DELETED --- |
|
From: Gustavo P. B. <gb...@us...> - 2005-06-23 18:30:17
|
Update of /cvsroot/kimageprocess/kimageprocess/src/plugins/snns In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17144/snns Modified Files: Makefile.am snns.cpp snns.h Removed Files: kimageprocess_snns.rc Log Message: - Removed rc files for plugins (won't be needed anymore) - Changed copyright Index: snns.cpp =================================================================== RCS file: /cvsroot/kimageprocess/kimageprocess/src/plugins/snns/snns.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- snns.cpp 23 Jun 2005 03:18:49 -0000 1.5 +++ snns.cpp 23 Jun 2005 18:30:07 -0000 1.6 @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2004 by * + * Copyright (C) 2004-2005 by * * Gustavo Pichorim Boiko <gus...@kd...> * * Herton Ronaldo Krzesinski <he...@my...> * * * --- kimageprocess_snns.rc DELETED --- Index: Makefile.am =================================================================== RCS file: /cvsroot/kimageprocess/kimageprocess/src/plugins/snns/Makefile.am,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- Makefile.am 26 Feb 2005 20:37:42 -0000 1.2 +++ Makefile.am 23 Jun 2005 18:30:07 -0000 1.3 @@ -8,6 +8,4 @@ kde_services_DATA = kimageprocess_snns.desktop kimageprocess_snns_la_LIBADD = $(top_builddir)/src/libkimageprocess/libkimageprocess.la \ -lkdeui $(LIB_KIO) - -pluginsdir = $(kde_datadir)/kimageprocess_snns -plugins_DATA = kimageprocess_snns.rc + Index: snns.h =================================================================== RCS file: /cvsroot/kimageprocess/kimageprocess/src/plugins/snns/snns.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- snns.h 19 Jun 2005 02:03:56 -0000 1.5 +++ snns.h 23 Jun 2005 18:30:07 -0000 1.6 @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2004 by * + * Copyright (C) 2004-2005 by * * Gustavo Pichorim Boiko <gus...@kd...> * * Herton Ronaldo Krzesinski <he...@my...> * * * |
|
From: Herton R. K. <he...@us...> - 2005-06-23 04:26:54
|
Update of /cvsroot/kimageprocess/kimageprocess/src/libkimageprocess In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19032/libkimageprocess Modified Files: ktclassifbackend.cpp ktfeature.cpp ktfeaturemanager.cpp ktimage.h ktmethod.cpp ktmethod.h ktmethodmanager.cpp Log Message: - Added progress bar classes and QWidget, with may be useful slots. - Cosmetics. Index: ktmethod.cpp =================================================================== RCS file: /cvsroot/kimageprocess/kimageprocess/src/libkimageprocess/ktmethod.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- ktmethod.cpp 23 Jun 2005 03:18:47 -0000 1.5 +++ ktmethod.cpp 23 Jun 2005 04:26:46 -0000 1.6 @@ -1,5 +1,3 @@ - - /*************************************************************************** * Copyright (C) 2004 by * * Gustavo Pichorim Boiko <gus...@kd...> * Index: ktmethodmanager.cpp =================================================================== RCS file: /cvsroot/kimageprocess/kimageprocess/src/libkimageprocess/ktmethodmanager.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- ktmethodmanager.cpp 23 Jun 2005 03:18:47 -0000 1.8 +++ ktmethodmanager.cpp 23 Jun 2005 04:26:46 -0000 1.9 @@ -1,5 +1,3 @@ - - /*************************************************************************** * Copyright (C) 2004 by * * Gustavo Pichorim Boiko <gus...@kd...> * @@ -35,7 +33,6 @@ { } - KTMethodManager::~KTMethodManager() { } Index: ktclassifbackend.cpp =================================================================== RCS file: /cvsroot/kimageprocess/kimageprocess/src/libkimageprocess/ktclassifbackend.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- ktclassifbackend.cpp 13 Mar 2005 00:15:11 -0000 1.3 +++ ktclassifbackend.cpp 23 Jun 2005 04:26:46 -0000 1.4 @@ -1,5 +1,3 @@ - - /*************************************************************************** * Copyright (C) 2004 by * * Gustavo Pichorim Boiko <gus...@kd...> * @@ -27,7 +25,6 @@ { } - KTClassifBackend::~KTClassifBackend() { } Index: ktfeature.cpp =================================================================== RCS file: /cvsroot/kimageprocess/kimageprocess/src/libkimageprocess/ktfeature.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- ktfeature.cpp 24 Mar 2005 03:05:45 -0000 1.5 +++ ktfeature.cpp 23 Jun 2005 04:26:46 -0000 1.6 @@ -1,5 +1,3 @@ - - /*************************************************************************** * Copyright (C) 2004 by * * Gustavo Pichorim Boiko <gus...@kd...> * Index: ktmethod.h =================================================================== RCS file: /cvsroot/kimageprocess/kimageprocess/src/libkimageprocess/ktmethod.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- ktmethod.h 23 Jun 2005 03:18:47 -0000 1.6 +++ ktmethod.h 23 Jun 2005 04:26:46 -0000 1.7 @@ -61,5 +61,4 @@ }; - #endif Index: ktfeaturemanager.cpp =================================================================== RCS file: /cvsroot/kimageprocess/kimageprocess/src/libkimageprocess/ktfeaturemanager.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- ktfeaturemanager.cpp 2 Apr 2005 20:14:52 -0000 1.8 +++ ktfeaturemanager.cpp 23 Jun 2005 04:26:46 -0000 1.9 @@ -32,7 +32,6 @@ { } - KTFeatureManager::~KTFeatureManager() { } @@ -208,7 +207,5 @@ } } - - } #include "ktfeaturemanager.moc" Index: ktimage.h =================================================================== RCS file: /cvsroot/kimageprocess/kimageprocess/src/libkimageprocess/ktimage.h,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- ktimage.h 2 Apr 2005 18:12:41 -0000 1.9 +++ ktimage.h 23 Jun 2005 04:26:46 -0000 1.10 @@ -40,7 +40,6 @@ #define METHOD_ANGLE90_ONLY 3 #define METHOD_ANGLE135_ONLY 4 #define METHOD_MEAN 5 - /** This class extends the standard QImage class adding functions to interact with libtexture. |
|
From: Herton R. K. <he...@us...> - 2005-06-23 04:26:54
|
Update of /cvsroot/kimageprocess/kimageprocess/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19032 Modified Files: Makefile.am Added Files: ktprogressbar.cpp ktprogressbar.h ktprogressbar_ui.ui Log Message: - Added progress bar classes and QWidget, with may be useful slots. - Cosmetics. --- NEW FILE: ktprogressbar.cpp --- /*************************************************************************** * Copyright (C) 2004 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 <kactivelabel.h> #include <klocale.h> #include <kprogress.h> #include <kpushbutton.h> #include "ktprogressbar.h" KTProgressBar::KTProgressBar(QWidget *parent, const char *name) : QFrame(parent, name) { m_ui = new ProgressBarUI(this); } void KTProgressBar::startAction(int progressSteps, const QString& initialText) { m_ui->kalStatus->setText(initialText); m_ui->kpStatus->reset(); m_ui->kpStatus->setTotalSteps(progressSteps); } void KTProgressBar::finishAction() { m_ui->kalStatus->setText(i18n("Finished.")); m_ui->kpStatus->setProgress(m_ui->kpStatus->totalSteps()); } void KTProgressBar::updateText(const QString& text) { m_ui->kalStatus->setText(text); } void KTProgressBar::advanceProgress() { int p = m_ui->kpStatus->progress(); m_ui->kpStatus->setProgress(++p); } #include "ktprogressbar.moc" Index: Makefile.am =================================================================== RCS file: /cvsroot/kimageprocess/kimageprocess/src/Makefile.am,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- Makefile.am 23 Mar 2005 20:47:54 -0000 1.6 +++ Makefile.am 23 Jun 2005 04:26:46 -0000 1.7 @@ -15,13 +15,14 @@ libktimgview/libktimgview.la $(LIB_KFILE) $(LIB_KDEPRINT) # which sources should be compiled for kimageprocess -kimageprocess_SOURCES = main.cpp kimageprocess.cpp kimageprocessview.cpp pref.cpp \ - kimageprocessiface.skel ktfeaturechooser.cpp ktfeaturechooser_ui.ui kimageprocessoptions_ui.ui \ - kttextureoptions.cpp ktsidebar.cpp \ - ktlistview.cpp +kimageprocess_SOURCES = main.cpp kimageprocess.cpp kimageprocessview.cpp \ + pref.cpp kimageprocessiface.skel ktfeaturechooser.cpp ktfeaturechooser_ui.ui \ + kimageprocessoptions_ui.ui kttextureoptions.cpp ktsidebar.cpp ktlistview.cpp \ + ktprogressbar_ui.ui ktprogressbar.cpp # these are the headers for your project -noinst_HEADERS = kimageprocess.h kimageprocessview.h pref.h ktlistview.h +noinst_HEADERS = kimageprocess.h kimageprocessview.h pref.h ktlistview.h \ + ktprogressbar.h # let automoc handle all of the meta source files (moc) --- NEW FILE: ktprogressbar.h --- /*************************************************************************** * Copyright (C) 2004 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 KTPROGRESSBAR_H #define KTPROGRESSBAR_H #include <ktprogressbar_ui.h> class KTProgressBar : public QFrame { Q_OBJECT public: KTProgressBar(QWidget *parent = 0, const char *name = 0); private: ProgressBarUI *m_ui; public slots: void startAction(int progressSteps, const QString& initialText); void finishAction(); void updateText(const QString& text); void advanceProgress(); }; #endif --- NEW FILE: ktprogressbar_ui.ui --- <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>ProgressBarUI</class> <widget class="QDialog"> <property name="name"> <cstring>ProgressBarUI</cstring> </property> <property name="geometry"> <rect> <x>0</x> <y>0</y> <width>332</width> <height>112</height> </rect> </property> <property name="sizePolicy"> <sizepolicy> <hsizetype>5</hsizetype> <vsizetype>5</vsizetype> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> <property name="caption"> <string>Status</string> </property> <property name="sizeGripEnabled"> <bool>true</bool> </property> <widget class="KActiveLabel"> <property name="name"> <cstring>kalStatus</cstring> </property> <property name="geometry"> <rect> <x>10</x> <y>10</y> <width>310</width> <height>21</height> </rect> </property> <property name="text"> <string>Text status</string> </property> </widget> <widget class="KProgress"> <property name="name"> <cstring>kpStatus</cstring> </property> <property name="geometry"> <rect> <x>10</x> <y>40</y> <width>310</width> <height>25</height> </rect> </property> </widget> <widget class="KPushButton"> <property name="name"> <cstring>kpbCancel</cstring> </property> <property name="geometry"> <rect> <x>210</x> <y>70</y> <width>111</width> <height>31</height> </rect> </property> <property name="text"> <string>Ca&ncel</string> </property> <property name="accel"> <string>Alt+N</string> </property> </widget> </widget> <layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kactivelabel.h</includehint> <includehint>kprogress.h</includehint> <includehint>kpushbutton.h</includehint> </includehints> </UI> |
Update of /cvsroot/kimageprocess/kimageprocess/src/libkimageprocess In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17877/src/libkimageprocess Modified Files: ktmethod.cpp ktmethod.h ktmethodmanager.cpp ktpatternmanager.cpp ktpatternmanager.h ktplugin.cpp ktplugin.h ktpluginmanager.cpp ktpluginmanager.h ktproject.cpp ktproject.h Log Message: All managers classes now use self() (global instance), which is much better than being passing pointers all around Index: ktproject.cpp =================================================================== RCS file: /cvsroot/kimageprocess/kimageprocess/src/libkimageprocess/ktproject.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- ktproject.cpp 31 Mar 2005 23:56:43 -0000 1.12 +++ ktproject.cpp 23 Jun 2005 03:18:47 -0000 1.13 @@ -25,6 +25,7 @@ #include <kio/netaccess.h> #include <ktempfile.h> #include <klocale.h> +#include <kstaticdeleter.h> #include <qdom.h> #include <qstringlist.h> @@ -36,8 +37,6 @@ : QObject(parent, name)/*, DCOPObject("KImageProcessIface")*/ { - m_patternManager = new KTPatternManager(this); - m_isSaved = false; m_changed = true; } @@ -47,9 +46,26 @@ { } +// Put the static deleter in its anonymous namespace -- why? +namespace +{ + KStaticDeleter<KTProject> sd; +} + +KTProject *KTProject::s_self = 0L; + +KTProject *KTProject::self() +{ + if (!s_self) + sd.setObject(s_self, new KTProject()); + + return s_self; +} + + void KTProject::newProject() { - m_patternManager->clear(); + KTImageManager::self()->clear(); m_isSaved = false; } @@ -116,8 +132,9 @@ void KTProject::closeProject() { - m_patternManager->clear(); + KTImageManager::self()->clear(); m_isSaved = false; + m_changed = false; } bool KTProject::isSaved() @@ -132,22 +149,26 @@ void KTProject::removeSampleImage(KTImage *image) { - m_patternManager->removeSampleImage(image); + m_changed = true; + KTImageManager::self()->removeSampleImage(image); } void KTProject::addSampleImage(const KURL &url) { - m_patternManager->addSampleImage(url); + m_changed = true; + KTImageManager::self()->addSampleImage(url); } void KTProject::removeTestingImage(KTImage *image) { - m_patternManager->removeTestingImage(image); + m_changed = true; + KTImageManager::self()->removeTestingImage(image); } void KTProject::addTestingImage(const KURL &url) { - m_patternManager->addTestingImage(url); + m_changed = true; + KTImageManager::self()->addTestingImage(url); } QString KTProject::generateDoc() @@ -163,7 +184,7 @@ QDomElement samplesGroup = m_doc.createElement("sample_images"); rootElem.appendChild(samplesGroup); - QStringList samples = patternManager()->sampleFileNames(); + QStringList samples = KTImageManager::self()->sampleFileNames(); for (QStringList::Iterator it = samples.begin(); it != samples.end(); ++it) { QDomElement sample = m_doc.createElement("sample"); @@ -174,7 +195,7 @@ QDomElement testingGroup = m_doc.createElement("testing_images"); rootElem.appendChild(testingGroup); - QStringList images = patternManager()->testingFileNames(); + QStringList images = KTImageManager::self()->testingFileNames(); for (QStringList::Iterator it = images.begin(); it != images.end(); ++it) { QDomElement image = m_doc.createElement("image"); @@ -189,14 +210,14 @@ window_size temp; QDomElement option; option = m_doc.createElement("windowType"); - option.setAttribute("value", QString::number(m_patternManager->windowType(), 10)); + option.setAttribute("value", QString::number(KTImageManager::self()->windowType(), 10)); options.appendChild(option); option = m_doc.createElement("numberIterations"); - option.setAttribute("value", QString::number(m_patternManager->numberIterations(), 10)); + option.setAttribute("value", QString::number(KTImageManager::self()->numberIterations(), 10)); options.appendChild(option); - temp = m_patternManager->windowSize(); + temp = KTImageManager::self()->windowSize(); option = m_doc.createElement("windowSize"); option.setAttribute("type", temp.type?"true":"false"); option.setAttribute("x", QString::number(temp.width, 10)); @@ -228,7 +249,9 @@ trOptions = nodes.item(i).toElement(); } - emit aboutToLoad(rootElem); + emit aboutToLoad(rootElem); + + KTImageManager::self()->clear(); // load the sample images from the project QDomNodeList samples = samplesGroup.childNodes(); @@ -268,14 +291,16 @@ QDomElement option = options.item(i).toElement(); if (option.nodeName() == "windowType") - m_patternManager->setWindowType(option.attribute("value").toInt(&ok, 10)); + KTImageManager::self()->setWindowType(option.attribute("value").toInt(&ok, 10)); else if (option.nodeName() == "numberIterations") - m_patternManager->setNumberIterations(option.attribute("value").toInt(&ok, 10)); + KTImageManager::self()->setNumberIterations(option.attribute("value").toInt(&ok, 10)); else if (option.nodeName() == "windowSize") - m_patternManager->setWindowSize((option.attribute("type","true")=="true")? true : false, + KTImageManager::self()->setWindowSize((option.attribute("type","true")=="true")? true : false, option.attribute("x").toInt(&ok, 10), option.attribute("y").toInt(&ok, 10)); } + m_isSaved = true; + m_changed = false; } #include "ktproject.moc" Index: ktmethodmanager.cpp =================================================================== RCS file: /cvsroot/kimageprocess/kimageprocess/src/libkimageprocess/ktmethodmanager.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- ktmethodmanager.cpp 2 Apr 2005 20:14:52 -0000 1.7 +++ ktmethodmanager.cpp 23 Jun 2005 03:18:47 -0000 1.8 @@ -73,7 +73,6 @@ if (method) { - method->setManager(KTMethodManager::self()); m_methods.insert(method->methodName(), method); kdDebug() << "Loaded method " << method->methodName() << endl; } Index: ktpatternmanager.h =================================================================== RCS file: /cvsroot/kimageprocess/kimageprocess/src/libkimageprocess/ktpatternmanager.h,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- ktpatternmanager.h 31 Mar 2005 23:56:43 -0000 1.12 +++ ktpatternmanager.h 23 Jun 2005 03:18:47 -0000 1.13 @@ -51,9 +51,9 @@ * It also generates the SNNS pattern file with the measures from these * pattern images * - * @short A class to manage pattern images + * @short A class to manage images (they being sample or testing images) */ -class KTPatternManager : public QObject +class KTImageManager : public QObject { Q_OBJECT public: @@ -62,9 +62,9 @@ * @param parent The parent of this object * @param name The name */ - KTPatternManager(QObject *parent = 0, const char *name = 0); + KTImageManager(QObject *parent = 0, const char *name = 0); - ~KTPatternManager(); + ~KTImageManager(); /** * Add a new sample image @@ -107,17 +107,17 @@ KTImage *testingImage(); /** - * Generate a SNNS Pattern file. + * Extract data from samples * The file format can be found in the JavaNNS documentation * @param img The pattern image that will be used to generate the pattern file. * @param backend The classification backend to be used * Note that when no @ref img is specified, the pattern file will be generated * using all available pattern images. */ - void generatePatternFile(KTImage *img = 0, KTClassifBackend *backend = 0); + void calculateSampleData(KTImage *img = 0, KTClassifBackend *backend = 0); - /** Generate a SNNS-compatible testing pattern file */ - void generateTestPatFile(KTImage *img, KTClassifBackend *backend = 0); + /** Extract data from testing images */ + void calculateTestData(KTImage *img, KTClassifBackend *backend = 0); /** count the active features */ int activeFeaturesCount(); @@ -136,6 +136,8 @@ window_size windowSize(); void clear(); + + static KTImageManager *self(); private: /** * generate and write results for the current window settings @@ -156,7 +158,8 @@ KAction *m_generatePatAction; - bool m_testingPattern; + static KTImageManager *s_self; + bool m_testingData; signals: /** Emitted when a training pattern is added to this project */ void trPatternAdded(KTImage *image); Index: ktproject.h =================================================================== RCS file: /cvsroot/kimageprocess/kimageprocess/src/libkimageprocess/ktproject.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- ktproject.h 16 Mar 2005 02:52:32 -0000 1.3 +++ ktproject.h 23 Jun 2005 03:18:47 -0000 1.4 @@ -78,12 +78,11 @@ /** Add a training sample image */ void addTestingImage(const KURL &url); - /** Return an instance of the pattern manager */ - KTPatternManager *patternManager() { return m_patternManager; } - /** Return the url of the project */ KURL url() { return m_url; } + static KTProject *self(); + signals: void addToRecent(const KURL &url); void aboutToSave(QDomDocument *doc, QDomElement *rootElem); @@ -96,12 +95,12 @@ /** Load the project from a root element */ void loadProject(QDomElement *rootElem); - KTPatternManager *m_patternManager; KURL m_url; QString m_tmpfile; bool m_isSaved; bool m_changed; + static KTProject *s_self; }; #endif Index: ktpatternmanager.cpp =================================================================== RCS file: /cvsroot/kimageprocess/kimageprocess/src/libkimageprocess/ktpatternmanager.cpp,v retrieving revision 1.29 retrieving revision 1.30 diff -u -d -r1.29 -r1.30 --- ktpatternmanager.cpp 1 Apr 2005 03:14:05 -0000 1.29 +++ ktpatternmanager.cpp 23 Jun 2005 03:18:47 -0000 1.30 @@ -1,5 +1,3 @@ - - /*************************************************************************** * Copyright (C) 2004 by * * Gustavo Pichorim Boiko <gus...@kd...> * @@ -33,18 +31,19 @@ #include <ktempfile.h> #include <kfiledialog.h> #include <kdebug.h> +#include <kstaticdeleter.h> #include <qfile.h> #include <qregexp.h> #include <qvaluelist.h> -KTPatternManager::KTPatternManager(QObject *parent, const char *name) +KTImageManager::KTImageManager(QObject *parent, const char *name) : QObject(parent, name) { // auto-destroy items on delete m_sampleImages.setAutoDelete(true); - m_testingPattern = false; + m_testingData = false; //Set defaults m_window_type = WIN_SEQ; @@ -54,11 +53,27 @@ m_iterations = 0; } -KTPatternManager::~KTPatternManager() +KTImageManager::~KTImageManager() { } -void KTPatternManager::addSampleImage(const KURL &url) +// Put the static deleter in its anonymous namespace -- why? +namespace +{ + KStaticDeleter<KTImageManager> sd; +} + +KTImageManager *KTImageManager::s_self = 0L; + +KTImageManager *KTImageManager::self() +{ + if (!s_self) + sd.setObject(s_self, new KTImageManager()); + + return s_self; +} + +void KTImageManager::addSampleImage(const KURL &url) { KTImage *img = new KTImage(); @@ -71,14 +86,14 @@ emit trPatternAdded(img); } -void KTPatternManager::removeSampleImage( KTImage *image ) +void KTImageManager::removeSampleImage( KTImage *image ) { emit aboutToRemoveTrPattern(image); m_sampleImages.remove(image); } -void KTPatternManager::addTestingImage(const KURL &url) +void KTImageManager::addTestingImage(const KURL &url) { KTImage *img = new KTImage(); @@ -91,14 +106,14 @@ emit testingImageAdded( img ); } -void KTPatternManager::removeTestingImage(KTImage *image) +void KTImageManager::removeTestingImage(KTImage *image) { emit aboutToRemoveTestingImage(image); m_testingImages.remove(image); } -QStringList KTPatternManager::sampleFileNames() +QStringList KTImageManager::sampleFileNames() { QStringList list; KTImage *it; @@ -108,7 +123,7 @@ return list; } -QStringList KTPatternManager::testingFileNames() +QStringList KTImageManager::testingFileNames() { QStringList list; KTImage *it; @@ -119,13 +134,13 @@ } -int KTPatternManager::activeFeaturesCount() +int KTImageManager::activeFeaturesCount() { //returning the number of active features return KTFeatureManager::self()->enabledFeaturesCount(KTMethodManager::self()->activeMethod()->methodName()); } -QStringList KTPatternManager::activeFeatureNames() +QStringList KTImageManager::activeFeatureNames() { QStringList names; FeatureList features = KTFeatureManager::self()->features( @@ -142,13 +157,13 @@ return names; } -void KTPatternManager::generatePatternFile(KTImage *img, KTClassifBackend *backend) +void KTImageManager::calculateSampleData(KTImage *img, KTClassifBackend *backend) { if (img) { int imgClass=1; - if (!m_testingPattern) + if (!m_testingData) { KTImage *it; for ( it = m_sampleImages.first(); it; it = m_sampleImages.next()) @@ -171,7 +186,7 @@ } } -void KTPatternManager::generateWindowResults(KTImage *img, int imgClass, KTClassifBackend *backend) +void KTImageManager::generateWindowResults(KTImage *img, int imgClass, KTClassifBackend *backend) { int i, x, y, width, height, acumm; KTImage *tmpimg; @@ -297,42 +312,42 @@ } } -void KTPatternManager::generateTestPatFile(KTImage *img, KTClassifBackend *backend) +void KTImageManager::calculateTestData(KTImage *img, KTClassifBackend *backend) { int wt = m_window_type; m_window_type = WIN_ALLPIX; - m_testingPattern = true; - KTMethodManager::self()->activeMethod()->setTestingPattern(true); + m_testingData = true; + KTMethodManager::self()->activeMethod()->setTestingData(true); if (img == 0) img = m_testingImages.first(); - generatePatternFile(img, backend); + calculateSampleData(img, backend); - m_testingPattern = false; - KTMethodManager::self()->activeMethod()->setTestingPattern(false); + m_testingData = false; + KTMethodManager::self()->activeMethod()->setTestingData(false); m_window_type = wt; } -void KTPatternManager::setWindowSize(bool type, int height, int width) +void KTImageManager::setWindowSize(bool type, int height, int width) { m_window_size.type = type; m_window_size.height = height; m_window_size.width = width; } -window_size KTPatternManager::windowSize() +window_size KTImageManager::windowSize() { return m_window_size; } -KTImage *KTPatternManager::testingImage() +KTImage *KTImageManager::testingImage() { return m_testingImages.first(); } -void KTPatternManager::clear() +void KTImageManager::clear() { KTImage *img; img = m_sampleImages.first(); Index: ktplugin.h =================================================================== RCS file: /cvsroot/kimageprocess/kimageprocess/src/libkimageprocess/ktplugin.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- ktplugin.h 26 Feb 2005 20:37:42 -0000 1.3 +++ ktplugin.h 23 Jun 2005 03:18:47 -0000 1.4 @@ -25,7 +25,7 @@ #include <kxmlguiclient.h> class KTPluginManager; -class KTPatternManager; +class KTImageManager; /** A base class for our plugins @@ -39,15 +39,7 @@ KTPlugin(QObject *parent = 0, const char *name = 0); virtual ~KTPlugin(); - void setManager(KTPluginManager *manager); - void setImageManager(KTPatternManager *manager); virtual void setupPlugin(); -protected: - KTPluginManager *manager() const; - KTPatternManager *imageManager() const; -private: - KTPluginManager *m_manager; - KTPatternManager *m_imageManager; }; #endif Index: ktpluginmanager.h =================================================================== RCS file: /cvsroot/kimageprocess/kimageprocess/src/libkimageprocess/ktpluginmanager.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- ktpluginmanager.h 10 Dec 2004 23:30:52 -0000 1.1.1.1 +++ ktpluginmanager.h 23 Jun 2005 03:18:47 -0000 1.2 @@ -25,8 +25,8 @@ #include <qptrlist.h> class KTPlugin; -class KMainWindow; -class KTPatternManager; +//class KMainWindow; +class KTImageManager; /** A class to manage KImageProcess plugins @@ -37,19 +37,20 @@ { Q_OBJECT public: - KTPluginManager(KMainWindow *parent, const char *name = 0); + KTPluginManager(/*KMainWindow *parent, const char *name = 0*/); ~KTPluginManager(); - void setPatternManager(KTPatternManager *pm); + void setPatternManager(KTImageManager *pm); void loadPlugins(); - KTPatternManager *patternManager() const; + static KTPluginManager *self(); + private: - KMainWindow *m_window; + //KMainWindow *m_window; QPtrList<KTPlugin> m_pluginList; - KTPatternManager *m_patternManager; + static KTPluginManager *s_self; }; #endif Index: ktplugin.cpp =================================================================== RCS file: /cvsroot/kimageprocess/kimageprocess/src/libkimageprocess/ktplugin.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- ktplugin.cpp 19 Feb 2005 22:32:48 -0000 1.2 +++ ktplugin.cpp 23 Jun 2005 03:18:47 -0000 1.3 @@ -30,28 +30,8 @@ { } -void KTPlugin::setManager(KTPluginManager *manager) -{ - m_manager = manager; -} - -KTPluginManager * KTPlugin::manager() const -{ - return m_manager; -} - void KTPlugin::setupPlugin() { } -void KTPlugin::setImageManager(KTPatternManager *manager) -{ - m_imageManager = manager; -} - -KTPatternManager * KTPlugin::imageManager() const -{ - return m_imageManager; -} - #include "ktplugin.moc" Index: ktmethod.h =================================================================== RCS file: /cvsroot/kimageprocess/kimageprocess/src/libkimageprocess/ktmethod.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- ktmethod.h 5 Apr 2005 22:49:07 -0000 1.5 +++ ktmethod.h 23 Jun 2005 03:18:47 -0000 1.6 @@ -47,26 +47,18 @@ QString methodName(); QString longName(); - void setManager(KTMethodManager *manager) { m_manager = manager; } - void setFeatureManager(KTFeatureManager *manager) { m_featureManager = manager; } - - void setTestingPattern(bool value) { m_testingPattern = value; } + void setTestingData(bool value) { m_testingData = value; } virtual void *data(int direction) const; - virtual int dataSize(int index = 0) { return 0; } + virtual int dataSize(int index = 0) { Q_UNUSED(index); return 0; } protected: QString m_methodName; QString m_longName; - KTMethodManager *manager() const { return m_manager; } - KTFeatureManager *featureManager() const { return m_featureManager; } - - bool m_testingPattern; -private: - KTMethodManager *m_manager; - KTFeatureManager *m_featureManager; + bool m_testingData; + }; Index: ktpluginmanager.cpp =================================================================== RCS file: /cvsroot/kimageprocess/kimageprocess/src/libkimageprocess/ktpluginmanager.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- ktpluginmanager.cpp 11 Mar 2005 19:23:59 -0000 1.3 +++ ktpluginmanager.cpp 23 Jun 2005 03:18:47 -0000 1.4 @@ -25,11 +25,11 @@ #include <kmainwindow.h> #include <kparts/componentfactory.h> #include <kdebug.h> +#include <kstaticdeleter.h> -KTPluginManager::KTPluginManager(KMainWindow *parent, const char *name) - : QObject(parent, name) +KTPluginManager::KTPluginManager(/*KMainWindow *parent, const char *name*/) + : QObject() { - m_window = parent; } @@ -37,7 +37,23 @@ { } -void KTPluginManager::loadPlugins( ) +// Put the static deleter in its anonymous namespace -- why? +namespace +{ + KStaticDeleter<KTPluginManager> sd; +} + +KTPluginManager *KTPluginManager::s_self = 0L; + +KTPluginManager *KTPluginManager::self() +{ + if (!s_self) + sd.setObject(s_self, new KTPluginManager()); + + return s_self; +} + +void KTPluginManager::loadPlugins() { KTPlugin *plugin; @@ -56,9 +72,7 @@ if (plugin) { - m_window->guiFactory()->addClient(plugin); - plugin->setManager(this); - plugin->setImageManager( m_patternManager ); + //m_window->guiFactory()->addClient(plugin); kdDebug() << "KTPluginManager: Loaded plugin " << plugin->name() << endl; @@ -67,14 +81,4 @@ } } -void KTPluginManager::setPatternManager( KTPatternManager *pm ) -{ - m_patternManager = pm; -} - -KTPatternManager * KTPluginManager::patternManager() const -{ - return m_patternManager; -} - #include "ktpluginmanager.moc" Index: ktmethod.cpp =================================================================== RCS file: /cvsroot/kimageprocess/kimageprocess/src/libkimageprocess/ktmethod.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- ktmethod.cpp 2 Apr 2005 20:14:52 -0000 1.4 +++ ktmethod.cpp 23 Jun 2005 03:18:47 -0000 1.5 @@ -27,7 +27,7 @@ KTMethod::KTMethod() { - m_testingPattern = false; + m_testingData = false; } KTMethod::~KTMethod() |
|
From: Gustavo P. B. <gb...@us...> - 2005-06-23 03:19:26
|
Update of /cvsroot/kimageprocess/kimageprocess/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17877/src Modified Files: kimageprocess.cpp kimageprocess.h kttextureoptions.cpp kttextureoptions.h pref.cpp pref.h Log Message: All managers classes now use self() (global instance), which is much better than being passing pointers all around Index: kttextureoptions.h =================================================================== RCS file: /cvsroot/kimageprocess/kimageprocess/src/kttextureoptions.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- kttextureoptions.h 10 Dec 2004 23:30:51 -0000 1.1.1.1 +++ kttextureoptions.h 23 Jun 2005 03:18:47 -0000 1.2 @@ -35,7 +35,7 @@ { Q_OBJECT public: - KTTextureOptions(QWidget *parent, KTProject *project, const char *name = 0); + KTTextureOptions(QWidget *parent, const char *name = 0); ~KTTextureOptions(); Index: pref.cpp =================================================================== RCS file: /cvsroot/kimageprocess/kimageprocess/src/pref.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- pref.cpp 18 Mar 2005 20:33:46 -0000 1.6 +++ pref.cpp 23 Jun 2005 03:18:47 -0000 1.7 @@ -32,7 +32,7 @@ #include <qlayout.h> #include <qlabel.h> -KImageProcessPreferences::KImageProcessPreferences(KTProject *project) +KImageProcessPreferences::KImageProcessPreferences() : KDialogBase(IconList, i18n("Preferences"), Ok|Apply|Cancel, Ok) { @@ -52,7 +52,7 @@ frame = addPage(i18n("Texture Options"), i18n("Texture Options")); layout = new QHBoxLayout(frame); layout->setAutoAdd(true); - m_textureOptions = new KTTextureOptions(frame,project); + m_textureOptions = new KTTextureOptions(frame); } Index: kttextureoptions.cpp =================================================================== RCS file: /cvsroot/kimageprocess/kimageprocess/src/kttextureoptions.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- kttextureoptions.cpp 31 Mar 2005 23:56:42 -0000 1.3 +++ kttextureoptions.cpp 23 Jun 2005 03:18:47 -0000 1.4 @@ -38,7 +38,7 @@ #include <ktmethod.h> -KTTextureOptions::KTTextureOptions( QWidget * parent, KTProject * project, const char *name) +KTTextureOptions::KTTextureOptions( QWidget * parent, const char *name) : QFrame(parent, name) { QHBoxLayout *layout = new QHBoxLayout(this); @@ -46,7 +46,7 @@ m_ui = new TextureOptionsUI(this); - m_project = project; + m_project = KTProject::self(); readConfig(); @@ -63,7 +63,7 @@ { window_size temp; - switch (m_project->patternManager()->windowType()) + switch (KTImageManager::self()->windowType()) { case WIN_SEQ: m_ui->rbnSequential->setChecked(true); @@ -77,7 +77,7 @@ m_ui->rbnSlideIterations->setChecked(true); break; } - temp = m_project->patternManager()->windowSize(); + temp = KTImageManager::self()->windowSize(); if (temp.type) m_ui->rbnCustom->setChecked(true); else @@ -90,14 +90,14 @@ } m_ui->spbX->setValue(temp.width); m_ui->spbY->setValue(temp.height); - if (m_project->patternManager()->numberIterations() == 0) + if (KTImageManager::self()->numberIterations() == 0) { m_ui->rbnSlideAll->setChecked(true); m_ui->spbIterations->setDisabled(true); } else m_ui->rbnSlideIterations->setChecked(true); - m_ui->spbIterations->setValue(m_project->patternManager()->numberIterations()); + m_ui->spbIterations->setValue(KTImageManager::self()->numberIterations()); //List methods and set the active one as selected MethodList methods = KTMethodManager::self()->methods(); @@ -115,16 +115,17 @@ void KTTextureOptions::save() { if (m_ui->rbnSequential->isChecked()) - m_project->patternManager()->setWindowType(WIN_SEQ); + KTImageManager::self()->setWindowType(WIN_SEQ); if (m_ui->rbnCascaded->isChecked()) - m_project->patternManager()->setWindowType(WIN_CASC); + KTImageManager::self()->setWindowType(WIN_CASC); if (m_ui->rbnRandom->isChecked()) - m_project->patternManager()->setWindowType(WIN_RAND); - m_project->patternManager()->setWindowSize(m_ui->rbnCustom->isChecked(), m_ui->spbY->value(), m_ui->spbX->value()); + KTImageManager::self()->setWindowType(WIN_RAND); + + KTImageManager::self()->setWindowSize(m_ui->rbnCustom->isChecked(), m_ui->spbY->value(), m_ui->spbX->value()); if (m_ui->rbnSlideAll->isChecked()) - m_project->patternManager()->setNumberIterations(0); + KTImageManager::self()->setNumberIterations(0); else - m_project->patternManager()->setNumberIterations(m_ui->spbIterations->value()); + KTImageManager::self()->setNumberIterations(m_ui->spbIterations->value()); QString method = m_ui->cmbMethod->currentText(); KTMethodManager::self()->setActiveMethod(method.remove(QRegExp(" - .*"))); Index: pref.h =================================================================== RCS file: /cvsroot/kimageprocess/kimageprocess/src/pref.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- pref.h 18 Mar 2005 20:33:46 -0000 1.6 +++ pref.h 23 Jun 2005 03:18:47 -0000 1.7 @@ -26,7 +26,6 @@ #include <kdialogbase.h> #include <qframe.h> -class KTProject; class KTFeatureChooser; class KTTextureOptions; @@ -34,7 +33,7 @@ { Q_OBJECT public: - KImageProcessPreferences(KTProject *project); + KImageProcessPreferences(); private: KTFeatureChooser *m_featureChooser; Index: kimageprocess.h =================================================================== RCS file: /cvsroot/kimageprocess/kimageprocess/src/kimageprocess.h,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- kimageprocess.h 18 Mar 2005 20:33:46 -0000 1.8 +++ kimageprocess.h 23 Jun 2005 03:18:47 -0000 1.9 @@ -119,9 +119,6 @@ void setupAccel(); void setupActions(); - KTProject *m_project; - KTPluginManager *m_pluginManager; - KTSideBar *m_sideBar; KImageProcessView *m_view; Index: kimageprocess.cpp =================================================================== RCS file: /cvsroot/kimageprocess/kimageprocess/src/kimageprocess.cpp,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- kimageprocess.cpp 1 Apr 2005 03:14:04 -0000 1.20 +++ kimageprocess.cpp 23 Jun 2005 03:18:47 -0000 1.21 @@ -60,13 +60,13 @@ KImageProcess::KImageProcess() : KMainWindow( 0, "KImageProcess" ), - m_pluginManager(new KTPluginManager(this)), m_printer(0) { //Create the managers + KTPluginManager::self(); KTFeatureManager::self(); KTMethodManager::self(); - m_project = new KTProject(this); + KTProject::self(); QVBoxLayout *layout = new QVBoxLayout(this); layout->setAutoAdd( true ); @@ -105,39 +105,39 @@ optionsShowStatusbar(); optionsShowToolbar(); - /*connect(m_view->listView(), SIGNAL(aboutToPopupMenu(KTPopupMenu*, KTImage* )), - m_project->patternManager(), SLOT(slotAboutToPopupMenu(KTPopupMenu*, KTImage* )));*/ - - connect(m_project->patternManager(), SIGNAL(trPatternAdded(KTImage* )), + KTImageManager *imgmng = KTImageManager::self(); + connect(imgmng, SIGNAL(trPatternAdded(KTImage* )), m_sideBar, SLOT(slotSampleAdded(KTImage* ))); - connect(m_project->patternManager(), SIGNAL(aboutToRemoveTrPattern(KTImage* )), + connect(imgmng, SIGNAL(aboutToRemoveTrPattern(KTImage* )), m_sideBar, SLOT(slotAboutToRemoveSample(KTImage* ))); - connect(m_project->patternManager(), SIGNAL(testingImageAdded(KTImage* )), + connect(imgmng, SIGNAL(testingImageAdded(KTImage* )), m_sideBar, SLOT(slotTestImageAdded(KTImage* ))); - connect(m_project->patternManager(), SIGNAL(aboutToRemoveTestingImage(KTImage* )), + connect(imgmng, SIGNAL(aboutToRemoveTestingImage(KTImage* )), m_sideBar, SLOT(slotAboutToRemoveTestImage(KTImage* ))); connect(m_sideBar, SIGNAL(showImage(KTImage* )), m_view, SLOT(showImage(KTImage* ))); - connect(m_project, SIGNAL(aboutToSave(QDomDocument*, QDomElement*)), - KTFeatureManager::self(), SLOT(slotSave(QDomDocument*, QDomElement*))); + KTFeatureManager *featmng = KTFeatureManager::self(); + KTProject *prj = KTProject::self(); - connect(m_project, SIGNAL(aboutToLoad(QDomElement*)), - KTFeatureManager::self(), SLOT(slotLoad(QDomElement*))); + connect(prj, SIGNAL(aboutToSave(QDomDocument*, QDomElement*)), + featmng, SLOT(slotSave(QDomDocument*, QDomElement*))); + + connect(prj, SIGNAL(aboutToLoad(QDomElement*)), + featmng, SLOT(slotLoad(QDomElement*))); - connect(m_project, SIGNAL(aboutToSave(QDomDocument*, QDomElement*)), - KTMethodManager::self(), SLOT(slotSave(QDomDocument*, QDomElement*))); + connect(prj, SIGNAL(aboutToSave(QDomDocument*, QDomElement*)), + featmng, SLOT(slotSave(QDomDocument*, QDomElement*))); - connect(m_project, SIGNAL(aboutToLoad(QDomElement*)), - KTMethodManager::self(), SLOT(slotLoad(QDomElement*))); + connect(prj, SIGNAL(aboutToLoad(QDomElement*)), + featmng, SLOT(slotLoad(QDomElement*))); //load all plugins - m_pluginManager->setPatternManager(m_project->patternManager()); - m_pluginManager->loadPlugins(); + KTPluginManager::self()->loadPlugins(); KTMethodManager::self()->loadMethods(); KTFeatureManager::self()->loadFeatures(); @@ -155,7 +155,7 @@ void KImageProcess::load(const KURL& url) { setCaption(url.prettyURL()); - m_project->openProject(url); + KTProject::self()->openProject(url); } void KImageProcess::setupActions() @@ -163,7 +163,7 @@ KStdAction::openNew(this, SLOT(fileNew()), actionCollection(),"project_new"); KStdAction::open(this, SLOT(fileOpen()), actionCollection(), "project_open"); m_recentFiles = KStdAction::openRecent(this, SLOT(fileOpen(const KURL&)), actionCollection(), "project_open_recent"); - connect(m_project, SIGNAL(addToRecent(const KURL& )), m_recentFiles, SLOT(addURL(const KURL& ))); + connect(KTProject::self(), SIGNAL(addToRecent(const KURL& )), m_recentFiles, SLOT(addURL(const KURL& ))); KStdAction::save(this, SLOT(fileSave()), actionCollection(), "project_save"); KStdAction::saveAs(this, SLOT(fileSaveAs()), actionCollection(),"project_save_as"); @@ -199,9 +199,9 @@ // the 'config' object points to the session managed // config file. anything you write here will be available // later when this app is restored - - if (!m_project->url().url().isEmpty()) - config->writeEntry("lastURL", m_project->url().url()); + QString url = KTProject::self()->url().url(); + if (!url.isEmpty()) + config->writeEntry("lastURL", url); } void KImageProcess::readProperties(KConfig *config) @@ -214,7 +214,7 @@ QString url = config->readEntry("lastURL"); if (!url.isEmpty()) - m_project->openProject(KURL(url)); + KTProject::self()->openProject(KURL(url)); } @@ -250,10 +250,10 @@ // for now it is doing nothing, but as we are going to make it project-based, // this slot will be used to create new projects - if (!m_project->changed()) + if (!KTProject::self()->changed()) { setCaption(i18n("Unnamed Project")); - m_project->newProject(); + KTProject::self()->newProject(); } } @@ -269,7 +269,7 @@ // standard filedialog KURL url = KFileDialog::getOpenURL(QString::null, "*.kimageprocess|KImageProcess Projects (*.kimageprocess)", this, i18n("Open Location")); if (!url.isEmpty()) - m_project->openProject(url); + KTProject::self()->openProject(url); } void KImageProcess::fileSave() @@ -279,10 +279,10 @@ // button is clicked // save the current project - if (!m_project->isSaved()) + if (!KTProject::self()->isSaved()) fileSaveAs(); else - m_project->saveProject(); + KTProject::self()->saveProject(); } void KImageProcess::fileSaveAs() @@ -293,7 +293,7 @@ if (!file_url.isEmpty() && file_url.isValid()) { // save the current project - m_project->saveProject(file_url); + KTProject::self()->saveProject(file_url); } } @@ -350,7 +350,7 @@ void KImageProcess::optionsPreferences() { - KImageProcessPreferences dlg(m_project); + KImageProcessPreferences dlg; if (dlg.exec()) { // redo your settings @@ -362,7 +362,7 @@ KURL url = KFileDialog::getImageOpenURL(QString::null, this, i18n("Open Sample Image")); if (!url.isEmpty()) - m_project->addSampleImage(url); + KTProject::self()->addSampleImage(url); } void KImageProcess::projectDelSample() @@ -378,7 +378,7 @@ return; if (itm->type() == KTListViewItem::LVISample) - m_project->removeSampleImage(itm->img()); + KTProject::self()->removeSampleImage(itm->img()); } void KImageProcess::projectAddImage() @@ -386,7 +386,7 @@ KURL url = KFileDialog::getImageOpenURL(QString::null, this, i18n("Open Testing Image")); if (!url.isEmpty()) - m_project->addTestingImage(url); + KTProject::self()->addTestingImage(url); } void KImageProcess::projectDelImage() @@ -402,7 +402,7 @@ return; if (itm->type() == KTListViewItem::LVIImg) - m_project->removeTestingImage(itm->img()); + KTProject::self()->removeTestingImage(itm->img()); } void KImageProcess::changeStatusbar(const QString& text) |
