Menu
▾
▴
flowdesigner-cvs — CVS commits
You can subscribe to this list here.
| 2004 |
Jan
|
Feb
(111) |
Mar
(34) |
Apr
(16) |
May
(23) |
Jun
(7) |
Jul
(7) |
Aug
(30) |
Sep
(1) |
Oct
(12) |
Nov
(2) |
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
(20) |
Feb
(1) |
Mar
(20) |
Apr
(1) |
May
|
Jun
(6) |
Jul
(6) |
Aug
(3) |
Sep
(29) |
Oct
(9) |
Nov
(97) |
Dec
(4) |
| 2006 |
Jan
(8) |
Feb
(10) |
Mar
(14) |
Apr
(13) |
May
|
Jun
|
Jul
(3) |
Aug
|
Sep
|
Oct
(32) |
Nov
(13) |
Dec
|
| 2007 |
Jan
|
Feb
(42) |
Mar
(28) |
Apr
(34) |
May
(11) |
Jun
(20) |
Jul
(34) |
Aug
(48) |
Sep
(17) |
Oct
(5) |
Nov
|
Dec
|
|
From: <ma...@us...> - 2007-10-11 12:30:21
|
Revision: 2124
http://flowdesigner.svn.sourceforge.net/flowdesigner/?rev=2124&view=rev
Author: maestro
Date: 2007-10-11 05:30:08 -0700 (Thu, 11 Oct 2007)
Log Message:
-----------
FlowDesigner 0.9.1 release.
Added Paths:
-----------
tags/FlowDesigner-0-9-1/
Copied: tags/FlowDesigner-0-9-1 (from rev 2123, trunk/FlowDesigner)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2007-10-10 15:20:32
|
Revision: 2123
http://flowdesigner.svn.sourceforge.net/flowdesigner/?rev=2123&view=rev
Author: maestro
Date: 2007-10-10 08:20:35 -0700 (Wed, 10 Oct 2007)
Log Message:
-----------
Fixed build with autoconf+cmake
Modified Paths:
--------------
trunk/FlowDesigner/Makefile.am
trunk/FlowDesigner/octave/configure.in
trunk/FlowDesigner/qtflow/configure.in
trunk/FlowDesigner/qtflow/include/Makefile.am
trunk/FlowDesigner/qtflow/src/Makefile.am
Modified: trunk/FlowDesigner/Makefile.am
===================================================================
--- trunk/FlowDesigner/Makefile.am 2007-10-09 21:22:38 UTC (rev 2122)
+++ trunk/FlowDesigner/Makefile.am 2007-10-10 15:20:35 UTC (rev 2123)
@@ -8,7 +8,7 @@
bin_SCRIPTS = flowdesigner-config
-EXTRA_DIST = FlowDesigner.spec FlowDesigner.spec.in nflow.dtd FlowDesigner.pc.in CMakeLists.txt
+EXTRA_DIST = FlowDesigner.spec FlowDesigner.spec.in nflow.dtd FlowDesigner.pc.in CMakeLists.txt COPYING.LGPL license.txt
#Fools KDevelop into finding all the files
if COND_OPT
Modified: trunk/FlowDesigner/octave/configure.in
===================================================================
--- trunk/FlowDesigner/octave/configure.in 2007-10-09 21:22:38 UTC (rev 2122)
+++ trunk/FlowDesigner/octave/configure.in 2007-10-10 15:20:35 UTC (rev 2123)
@@ -1,6 +1,6 @@
dnl Process this file with autoconf to produce a configure script. -*-m4-*-
-AC_INIT(n-files/test.n)
+AC_INIT(src/OctaveParser.cc)
FLOWDESIGNER_MAJOR_VERSION=0
FLOWDESIGNER_MINOR_VERSION=9
Modified: trunk/FlowDesigner/qtflow/configure.in
===================================================================
--- trunk/FlowDesigner/qtflow/configure.in 2007-10-09 21:22:38 UTC (rev 2122)
+++ trunk/FlowDesigner/qtflow/configure.in 2007-10-10 15:20:35 UTC (rev 2123)
@@ -60,6 +60,14 @@
AC_SUBST(FLOWDESIGNER_BINARY_AGE)
AC_SUBST(FLOWDESIGNER_VERSION)
+if test "x$prefix" != "xNONE"; then
+ AC_DEFINE_UNQUOTED(INSTALL_PREFIX, "${prefix}")
+ AC_DEFINE_UNQUOTED(TOOLBOX_PATH, "${prefix}/lib/flowdesigner/toolbox")
+else
+ AC_DEFINE_UNQUOTED(INSTALL_PREFIX, "${ac_default_prefix}")
+ AC_DEFINE_UNQUOTED(TOOLBOX_PATH, "${ac_default_prefix}/lib/flowdesigner/toolbox")
+fi
+
# libtool versioning
LT_RELEASE=$FLOWDESIGNER_MAJOR_VERSION.$FLOWDESIGNER_MINOR_VERSION
LT_CURRENT=`expr $FLOWDESIGNER_MICRO_VERSION - $FLOWDESIGNER_INTERFACE_AGE`
Modified: trunk/FlowDesigner/qtflow/include/Makefile.am
===================================================================
--- trunk/FlowDesigner/qtflow/include/Makefile.am 2007-10-09 21:22:38 UTC (rev 2122)
+++ trunk/FlowDesigner/qtflow/include/Makefile.am 2007-10-10 15:20:35 UTC (rev 2123)
@@ -3,11 +3,21 @@
override libdir=${prefix}/lib/flowdesigner/toolbox/qtflow
#bindir default is OK
-include_HEADERS = QtDocument.h \
- QtFlowDesigner.h \
- QtLink.h \
- QtNetTerminal.h \
- QtNetwork.h \
- QtNode.h \
- QtNodeTreeView.h \
- QtTerminal.h
+include_HEADERS = QtDLManager.h \
+ QtLink.h \
+ QtNode.h \
+ QtRunContext.h \
+ UILinkController.h \
+ UINodeController.h \
+ QtDocument.h \
+ QtNetTerminal.h \
+ QtNodeParameters.h \
+ QtTerminal.h \
+ UINetTerminalController.h \
+ UITerminalController.h \
+ QtFlowDesigner.h \
+ QtNetwork.h \
+ QtNodeTreeView.h \
+ UIDocumentController.h \
+ UINetworkController.h
+
Modified: trunk/FlowDesigner/qtflow/src/Makefile.am
===================================================================
--- trunk/FlowDesigner/qtflow/src/Makefile.am 2007-10-09 21:22:38 UTC (rev 2122)
+++ trunk/FlowDesigner/qtflow/src/Makefile.am 2007-10-10 15:20:35 UTC (rev 2123)
@@ -12,7 +12,7 @@
-I../include
-bin_PROGRAMS = flowdesigner-qt
+bin_PROGRAMS = flowdesigner-qt qtflow
lib_LTLIBRARIES = libbaseProbeQt.la
@@ -32,9 +32,63 @@
QtDocument.cc \
.moc/moc_QtDocument.cc \
QtNetTerminal.cc \
- .moc/moc_QtNetTerminal.cc
+ .moc/moc_QtNetTerminal.cc \
+ QtNodeParameters.cc \
+ .moc/moc_QtNodeParameters.cc \
+ QtDLManager.cc \
+ .moc/moc_QtDLManager.cc \
+ QtRunContext.cc \
+ .moc/moc_QtRunContext.cc \
+ UILinkController.cc \
+ .moc/moc_UILinkController.cc \
+ UINodeController.cc \
+ .moc/moc_UINodeController.cc \
+ UINetTerminalController.cc \
+ .moc/moc_UINetTerminalController.cc \
+ UITerminalController.cc \
+ .moc/moc_UITerminalController.cc \
+ UIDocumentController.cc \
+ .moc/moc_UIDocumentController.cc \
+ UINetworkController.cc \
+ .moc/moc_UINetworkController.cc
+qtflow_SOURCES = qtflow.cc \
+ QtLink.cc \
+ .moc/moc_QtLink.cc \
+ QtNetwork.cc \
+ .moc/moc_QtNetwork.cc \
+ QtNode.cc \
+ .moc/moc_QtNode.cc \
+ QtTerminal.cc \
+ .moc/moc_QtTerminal.cc \
+ QtFlowDesigner.cc \
+ .moc/moc_QtFlowDesigner.cc \
+ QtNodeTreeView.cc \
+ .moc/moc_QtNodeTreeView.cc \
+ QtDocument.cc \
+ .moc/moc_QtDocument.cc \
+ QtNetTerminal.cc \
+ .moc/moc_QtNetTerminal.cc \
+ QtNodeParameters.cc \
+ .moc/moc_QtNodeParameters.cc \
+ QtDLManager.cc \
+ .moc/moc_QtDLManager.cc \
+ QtRunContext.cc \
+ .moc/moc_QtRunContext.cc \
+ UILinkController.cc \
+ .moc/moc_UILinkController.cc \
+ UINodeController.cc \
+ .moc/moc_UINodeController.cc \
+ UINetTerminalController.cc \
+ .moc/moc_UINetTerminalController.cc \
+ UITerminalController.cc \
+ .moc/moc_UITerminalController.cc \
+ UIDocumentController.cc \
+ .moc/moc_UIDocumentController.cc \
+ UINetworkController.cc \
+ .moc/moc_UINetworkController.cc
+
libbaseProbeQt_la_SOURCES = empty.cc
install-data-local:
@@ -55,14 +109,17 @@
flowdesigner_qt_LDFLAGS = $(FFTW_LDFLAGS) $(CYGWIN_LDFLAGS) $(PACKAGE_LIBS) $(top_srcdir)/../data-flow/src/libflow.la
+qtflow_LDFLAGS = $(FFTW_LDFLAGS) $(CYGWIN_LDFLAGS) $(PACKAGE_LIBS) $(top_srcdir)/../data-flow/src/libflow.la
+
+
# This rule lets GNU make create any moc_*.cc from the equivalent *.h
.moc/moc_%.cc: ../include/%.h
mkdir -p .moc
- moc $< -o $@
+ moc-qt4 $< -o $@
%.ui.cc: %.ui
- uic $< -o $<.h
-# uic -impl $<.h $< -o $@
+ uic-qt4 $< -o $<.h
+# uic-qt4 -impl $<.h $< -o $@
# Adjust this line according to your resources.qrc
# resources.cc : resources.qrc octave-gui.png
@@ -70,4 +127,4 @@
#
# This line ensures that generated moc_*.cc and resources.cc files are
# deleted when we make clean.
-CLEANFILES = $(filter moc_%.cc,$(flowdesigner_qt_SOURCES) $(libbaseProbeQt_la_SOURCES))
+CLEANFILES = $(filter .moc/moc_%.cc,$(flowdesigner_qt_SOURCES) $(libbaseProbeQt_la_SOURCES))
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2007-10-09 21:22:54
|
Revision: 2122
http://flowdesigner.svn.sourceforge.net/flowdesigner/?rev=2122&view=rev
Author: maestro
Date: 2007-10-09 14:22:38 -0700 (Tue, 09 Oct 2007)
Log Message:
-----------
Added cmake files to distribution. Fixing few build problems.
Modified Paths:
--------------
trunk/FlowDesigner/FuzzyEngine/Makefile.am
trunk/FlowDesigner/HMM/Makefile.am
trunk/FlowDesigner/Makefile.am
trunk/FlowDesigner/NNet/Makefile.am
trunk/FlowDesigner/VQ/Makefile.am
trunk/FlowDesigner/audio_blocks/Makefile.am
trunk/FlowDesigner/configure.in
trunk/FlowDesigner/data-flow/Makefile.am
trunk/FlowDesigner/data-flow/include/Makefile.am
trunk/FlowDesigner/effects/Makefile.am
trunk/FlowDesigner/qtflow/Makefile.am
trunk/FlowDesigner/tools/Makefile.am
trunk/FlowDesigner/vflow/include/Makefile.am
Modified: trunk/FlowDesigner/FuzzyEngine/Makefile.am
===================================================================
--- trunk/FlowDesigner/FuzzyEngine/Makefile.am 2007-10-09 19:46:23 UTC (rev 2121)
+++ trunk/FlowDesigner/FuzzyEngine/Makefile.am 2007-10-09 21:22:38 UTC (rev 2122)
@@ -2,4 +2,7 @@
# Disable automatic dependency tracking if using other tools than gcc and gmake
#AUTOMAKE_OPTIONS = no-dependencies
+
+EXTRA_DIST = CMakeLists.txt src/CMakeLists.txt
+
SUBDIRS = src include
Modified: trunk/FlowDesigner/HMM/Makefile.am
===================================================================
--- trunk/FlowDesigner/HMM/Makefile.am 2007-10-09 19:46:23 UTC (rev 2121)
+++ trunk/FlowDesigner/HMM/Makefile.am 2007-10-09 21:22:38 UTC (rev 2122)
@@ -3,4 +3,6 @@
# Disable automatic dependency tracking if using other tools than gcc and gmake
#AUTOMAKE_OPTIONS = no-dependencies
+EXTRA_DIST = CMakeLists.txt src/CMakeLists.txt
+
SUBDIRS = src include
Modified: trunk/FlowDesigner/Makefile.am
===================================================================
--- trunk/FlowDesigner/Makefile.am 2007-10-09 19:46:23 UTC (rev 2121)
+++ trunk/FlowDesigner/Makefile.am 2007-10-09 21:22:38 UTC (rev 2122)
@@ -8,13 +8,13 @@
bin_SCRIPTS = flowdesigner-config
-EXTRA_DIST = FlowDesigner.spec FlowDesigner.spec.in nflow.dtd FlowDesigner.pc.in
+EXTRA_DIST = FlowDesigner.spec FlowDesigner.spec.in nflow.dtd FlowDesigner.pc.in CMakeLists.txt
#Fools KDevelop into finding all the files
if COND_OPT
-SUBDIRS = data-flow @modules@ tools examples qtflow
+SUBDIRS = data-flow @modules@ tools examples
else
-SUBDIRS = data-flow audio_blocks VQ HMM NNet FuzzyEngine effects lapackflow octave vflow tools examples
+SUBDIRS = data-flow audio_blocks VQ HMM NNet qtflow FuzzyEngine effects lapackflow octave vflow tools examples
endif
DIST_SUBDIRS = data-flow audio_blocks VQ HMM NNet FuzzyEngine effects lapackflow octave vflow qtflow tools examples
Modified: trunk/FlowDesigner/NNet/Makefile.am
===================================================================
--- trunk/FlowDesigner/NNet/Makefile.am 2007-10-09 19:46:23 UTC (rev 2121)
+++ trunk/FlowDesigner/NNet/Makefile.am 2007-10-09 21:22:38 UTC (rev 2122)
@@ -3,4 +3,6 @@
# Disable automatic dependency tracking if using other tools than gcc and gmake
#AUTOMAKE_OPTIONS = no-dependencies
+EXTRA_DIST = CMakeLists.txt src/CMakeLists.txt
+
SUBDIRS = src include m
Modified: trunk/FlowDesigner/VQ/Makefile.am
===================================================================
--- trunk/FlowDesigner/VQ/Makefile.am 2007-10-09 19:46:23 UTC (rev 2121)
+++ trunk/FlowDesigner/VQ/Makefile.am 2007-10-09 21:22:38 UTC (rev 2122)
@@ -3,4 +3,6 @@
# Disable automatic dependency tracking if using other tools than gcc and gmake
#AUTOMAKE_OPTIONS = no-dependencies
+EXTRA_DIST = CMakeLists.txt src/CMakeLists.txt
+
SUBDIRS = src include
Modified: trunk/FlowDesigner/audio_blocks/Makefile.am
===================================================================
--- trunk/FlowDesigner/audio_blocks/Makefile.am 2007-10-09 19:46:23 UTC (rev 2121)
+++ trunk/FlowDesigner/audio_blocks/Makefile.am 2007-10-09 21:22:38 UTC (rev 2122)
@@ -3,6 +3,8 @@
# Disable automatic dependency tracking if using other tools than gcc and gmake
#AUTOMAKE_OPTIONS = no-dependencies
+EXTRA_DIST = CMakeLists.txt src/CMakeLists.txt
+
SUBDIRS = src include n-files
check:
Modified: trunk/FlowDesigner/configure.in
===================================================================
--- trunk/FlowDesigner/configure.in 2007-10-09 19:46:23 UTC (rev 2121)
+++ trunk/FlowDesigner/configure.in 2007-10-09 21:22:38 UTC (rev 2122)
@@ -89,7 +89,7 @@
data-flow/n-files/Makefile \
tools/Makefile tools/src/Makefile examples/Makefile \
flowdesigner-config FlowDesigner.spec \
- FlowDesigner.pc \
+ FlowDesigner.pc \
])
Modified: trunk/FlowDesigner/data-flow/Makefile.am
===================================================================
--- trunk/FlowDesigner/data-flow/Makefile.am 2007-10-09 19:46:23 UTC (rev 2121)
+++ trunk/FlowDesigner/data-flow/Makefile.am 2007-10-09 21:22:38 UTC (rev 2122)
@@ -3,6 +3,8 @@
# Disable automatic dependency tracking if using other tools than gcc and gmake
#AUTOMAKE_OPTIONS = no-dependencies
+EXTRA_DIST = CMakeLists.txt n-files/CMakeLists.txt src/CMakeLists.txt include/CMakeLists.txt
+
SUBDIRS = src include n-files
check:
Modified: trunk/FlowDesigner/data-flow/include/Makefile.am
===================================================================
--- trunk/FlowDesigner/data-flow/include/Makefile.am 2007-10-09 19:46:23 UTC (rev 2121)
+++ trunk/FlowDesigner/data-flow/include/Makefile.am 2007-10-09 21:22:38 UTC (rev 2122)
@@ -34,6 +34,7 @@
UILink.h \
UINetwork.h \
UINodeParameters.h \
+ UIProbeLink.h \
vec.h \
fmath.h \
ExceptionObject.h \
Modified: trunk/FlowDesigner/effects/Makefile.am
===================================================================
--- trunk/FlowDesigner/effects/Makefile.am 2007-10-09 19:46:23 UTC (rev 2121)
+++ trunk/FlowDesigner/effects/Makefile.am 2007-10-09 21:22:38 UTC (rev 2122)
@@ -3,4 +3,6 @@
# Disable automatic dependency tracking if using other tools than gcc and gmake
#AUTOMAKE_OPTIONS = no-dependencies
+EXTRA_DIST = CMakeLists.txt src/CMakeLists.txt
+
SUBDIRS = src include
Modified: trunk/FlowDesigner/qtflow/Makefile.am
===================================================================
--- trunk/FlowDesigner/qtflow/Makefile.am 2007-10-09 19:46:23 UTC (rev 2121)
+++ trunk/FlowDesigner/qtflow/Makefile.am 2007-10-09 21:22:38 UTC (rev 2122)
@@ -1,2 +1,5 @@
+
+EXTRA_DIST = CMakeLists.txt src/CMakeLists.txt
+
SUBDIRS = src include
Modified: trunk/FlowDesigner/tools/Makefile.am
===================================================================
--- trunk/FlowDesigner/tools/Makefile.am 2007-10-09 19:46:23 UTC (rev 2121)
+++ trunk/FlowDesigner/tools/Makefile.am 2007-10-09 21:22:38 UTC (rev 2122)
@@ -7,4 +7,6 @@
# Disable automatic dependency tracking if using other tools than gcc and gmake
#AUTOMAKE_OPTIONS = no-dependencies
+EXTRA_DIST = CMakeLists.txt src/CMakeLists.txt
+
SUBDIRS = src
Modified: trunk/FlowDesigner/vflow/include/Makefile.am
===================================================================
--- trunk/FlowDesigner/vflow/include/Makefile.am 2007-10-09 19:46:23 UTC (rev 2121)
+++ trunk/FlowDesigner/vflow/include/Makefile.am 2007-10-09 21:22:38 UTC (rev 2122)
@@ -22,4 +22,5 @@
vflow.h \
GtkPlotProbe.h \
misc_gui.h \
- GUINote.h
+ GUINote.h \
+ GUITreeView.h
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2007-10-09 19:46:19
|
Revision: 2121
http://flowdesigner.svn.sourceforge.net/flowdesigner/?rev=2121&view=rev
Author: maestro
Date: 2007-10-09 12:46:23 -0700 (Tue, 09 Oct 2007)
Log Message:
-----------
Testing sym link
Added Paths:
-----------
trunk/FlowDesigner/license.txt
Added: trunk/FlowDesigner/license.txt
===================================================================
--- trunk/FlowDesigner/license.txt (rev 0)
+++ trunk/FlowDesigner/license.txt 2007-10-09 19:46:23 UTC (rev 2121)
@@ -0,0 +1 @@
+link COPYING.LGPL
\ No newline at end of file
Property changes on: trunk/FlowDesigner/license.txt
___________________________________________________________________
Name: svn:special
+ *
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2007-10-09 19:39:37
|
Revision: 2120
http://flowdesigner.svn.sourceforge.net/flowdesigner/?rev=2120&view=rev
Author: maestro
Date: 2007-10-09 12:39:26 -0700 (Tue, 09 Oct 2007)
Log Message:
-----------
Now building under OSX without problem.
Modified Paths:
--------------
trunk/FlowDesigner/CMakeLists.txt
Modified: trunk/FlowDesigner/CMakeLists.txt
===================================================================
--- trunk/FlowDesigner/CMakeLists.txt 2007-10-02 18:47:28 UTC (rev 2119)
+++ trunk/FlowDesigner/CMakeLists.txt 2007-10-09 19:39:26 UTC (rev 2120)
@@ -8,7 +8,7 @@
SET(FLOWDESIGNER_SOURCE_DIR ${PROJECT_SOURCE_DIR})
SET(CMAKE_BUILD_TYPE Release )
-SET(CMAKE_INSTALL_PREFIX "C:/Progra~1/FlowDesigner")
+SET(CMAKE_INSTALL_PREFIX "/usr/local/flowdesigner")
SET(CMAKE_VERBOSE_MAKEFILE ON)
SET(FD_TOOLBOX_DIR lib/flowdesigner/toolbox)
@@ -16,8 +16,11 @@
ADD_DEFINITIONS(-DFLOWDESIGNER_VERSION=\\\"0.9.1\\\")
ADD_DEFINITIONS(-DINSTALL_PREFIX=\\\"${CMAKE_INSTALL_PREFIX}\\\")
ADD_DEFINITIONS(-DHAVE_FLOAT_H)
-ADD_DEFINITIONS(-DHAVE_VALUES_H)
+IF("${CMAKE_SYSTEM}" MATCHES "Linux")
+ ADD_DEFINITIONS(-DHAVE_VALUES_H)
+ENDIF("${CMAKE_SYSTEM}" MATCHES "Linux")
+
#THIS WILL CALL XML2 MODULE IN macros DIRECTORY
find_package(LibXml2 REQUIRED)
@@ -38,47 +41,38 @@
ADD_SUBDIRECTORY(audio_blocks)
ADD_SUBDIRECTORY(effects)
ADD_SUBDIRECTORY(tools)
-ADD_SUBDIRECTORY(manyears)
-ADD_SUBDIRECTORY(FDQTTCP)
-ADD_SUBDIRECTORY(FDOpenCV)
+#ADD_SUBDIRECTORY(manyears)
+#ADD_SUBDIRECTORY(FDQTTCP)
+#ADD_SUBDIRECTORY(FDOpenCV)
ADD_SUBDIRECTORY(examples)
SET( ENV{FLOWDESIGNER_HOME} ${INSTALL_PREFIX} )
-#SUBDIRS(
-# PREORDER
-# ${FLOWDESIGNER_SOURCE_DIR}/data-flow
-# ${FLOWDESIGNER_SOURCE_DIR}/qtflow
-# ${FLOWDESIGNER_SOURCE_DIR}/FuzzyEngine
-# ${FLOWDESIGNER_SOURCE_DIR}/NNet
-# ${FLOWDESIGNER_SOURCE_DIR}/VQ
-# ${FLOWDESIGNER_SOURCE_DIR}/HMM
-# ${FLOWDESIGNER_SOURCE_DIR}/audio_blocks
-# ${FLOWDESIGNER_SOURCE_DIR}/effects
-# ${FLOWDESIGNER_SOURCE_DIR}/tools
-# ${FLOWDESIGNER_SOURCE_DIR}/manyears
-# ${FLOWDESIGNER_SOURCE_DIR}/FDQTTCP
-# ${FLOWDESIGNER_SOURCE_DIR}/FDOpenCV
-# )
-
INCLUDE(InstallRequiredSystemLibraries)
-#copy libxml
-SET(DEVCPP_DLL
- C:/Dev-Cpp/bin/libxml2.dll
- C:/Dev-Cpp/bin/iconv.dll
- C:/Dev-Cpp/bin/charset.dll
- C:/Dev-Cpp/bin/mingwm10.dll
- C:/Dev-Cpp/bin/zlib1.dll
-)
-
-INSTALL(FILES ${DEVCPP_DLL} DESTINATION bin)
+IF (WIN32)
+ #copy libxml
+ SET(DEVCPP_DLL
+ C:/Dev-Cpp/bin/libxml2.dll
+ C:/Dev-Cpp/bin/iconv.dll
+ C:/Dev-Cpp/bin/charset.dll
+ C:/Dev-Cpp/bin/mingwm10.dll
+ C:/Dev-Cpp/bin/zlib1.dll
+ )
+ INSTALL(FILES ${DEVCPP_DLL} DESTINATION bin)
+ENDIF(WIN32)
SET(CPACK_PACKAGE_NAME "FlowDesigner")
SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "FlowDesigner")
SET(CPACK_PACKAGE_VENDOR "Dominic Letourneau, Jean-Marc Valin")
SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README")
-SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING.LGPL")
+
+IF(APPLE)
+ SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/license.txt")
+ELSE(APPLE)
+ SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING.LGPL")
+ENDIF(APPLE)
+
SET(CPACK_PACKAGE_VERSION_MAJOR "0")
SET(CPACK_PACKAGE_VERSION_MINOR "9")
SET(CPACK_PACKAGE_VERSION_PATCH "1")
@@ -95,7 +89,7 @@
SET(CPACK_NSIS_MODIFY_PATH ON)
ENDIF(WIN32 AND NOT UNIX)
-SET(CPACK_PACKAGE_EXECUTABLES "flowdesigner" "FlowDesigner" "batchflow" "BatchFlow" "qtflow" "qtflow" "audioviewer" "audioviewer")
+SET(CPACK_PACKAGE_EXECUTABLES "flowdesigner" "FlowDesigner" "batchflow" "batchflow" "qtflow" "qtflow")
INCLUDE(CPack)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: jdascenzio <jda...@us...> - 2007-09-27 20:49:29
|
Update of /cvsroot/flowdesigner/FlowDesigner
In directory sc8-pr-cvs17:/tmp/cvs-serv28932
Modified Files:
CMakeLists.txt
Log Message:
change install configuration
Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/flowdesigner/FlowDesigner/CMakeLists.txt,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** CMakeLists.txt 27 Jun 2007 13:24:08 -0000 1.18
--- CMakeLists.txt 27 Sep 2007 20:49:31 -0000 1.19
***************
*** 9,18 ****
SET(CMAKE_BUILD_TYPE Release )
! SET(CMAKE_INSTALL_PREFIX "/home/dominic/install/FDQT")
SET(CMAKE_VERBOSE_MAKEFILE ON)
SET(FD_TOOLBOX_DIR lib/flowdesigner/toolbox)
! ADD_DEFINITIONS(-DFLOWDESIGNER_VERSION=\\\"TESTING\\\")
ADD_DEFINITIONS(-DINSTALL_PREFIX=\\\"${CMAKE_INSTALL_PREFIX}\\\")
ADD_DEFINITIONS(-DHAVE_FLOAT_H)
--- 9,18 ----
SET(CMAKE_BUILD_TYPE Release )
! SET(CMAKE_INSTALL_PREFIX "C:/Progra~1/FlowDesigner")
SET(CMAKE_VERBOSE_MAKEFILE ON)
SET(FD_TOOLBOX_DIR lib/flowdesigner/toolbox)
! ADD_DEFINITIONS(-DFLOWDESIGNER_VERSION=\\\"0.9.1\\\")
ADD_DEFINITIONS(-DINSTALL_PREFIX=\\\"${CMAKE_INSTALL_PREFIX}\\\")
ADD_DEFINITIONS(-DHAVE_FLOAT_H)
***************
*** 30,46 ****
! SUBDIRS(${FLOWDESIGNER_SOURCE_DIR}/data-flow
! ${FLOWDESIGNER_SOURCE_DIR}/qtflow
! ${FLOWDESIGNER_SOURCE_DIR}/FuzzyEngine
! ${FLOWDESIGNER_SOURCE_DIR}/NNet
! ${FLOWDESIGNER_SOURCE_DIR}/VQ
! ${FLOWDESIGNER_SOURCE_DIR}/HMM
! ${FLOWDESIGNER_SOURCE_DIR}/audio_blocks
! ${FLOWDESIGNER_SOURCE_DIR}/effects
! ${FLOWDESIGNER_SOURCE_DIR}/tools
! )
INCLUDE(InstallRequiredSystemLibraries)
SET(CPACK_PACKAGE_NAME "FlowDesigner")
SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "FlowDesigner")
--- 30,78 ----
! ADD_SUBDIRECTORY(data-flow)
! ADD_SUBDIRECTORY(qtflow)
! ADD_SUBDIRECTORY(FuzzyEngine)
! ADD_SUBDIRECTORY(NNet)
! ADD_SUBDIRECTORY(VQ)
! ADD_SUBDIRECTORY(HMM)
! ADD_SUBDIRECTORY(audio_blocks)
! ADD_SUBDIRECTORY(effects)
! ADD_SUBDIRECTORY(tools)
! ADD_SUBDIRECTORY(manyears)
! ADD_SUBDIRECTORY(FDQTTCP)
! ADD_SUBDIRECTORY(FDOpenCV)
! ADD_SUBDIRECTORY(examples)
!
! SET( ENV{FLOWDESIGNER_HOME} ${INSTALL_PREFIX} )
!
! #SUBDIRS(
! # PREORDER
! # ${FLOWDESIGNER_SOURCE_DIR}/data-flow
! # ${FLOWDESIGNER_SOURCE_DIR}/qtflow
! # ${FLOWDESIGNER_SOURCE_DIR}/FuzzyEngine
! # ${FLOWDESIGNER_SOURCE_DIR}/NNet
! # ${FLOWDESIGNER_SOURCE_DIR}/VQ
! # ${FLOWDESIGNER_SOURCE_DIR}/HMM
! # ${FLOWDESIGNER_SOURCE_DIR}/audio_blocks
! # ${FLOWDESIGNER_SOURCE_DIR}/effects
! # ${FLOWDESIGNER_SOURCE_DIR}/tools
! # ${FLOWDESIGNER_SOURCE_DIR}/manyears
! # ${FLOWDESIGNER_SOURCE_DIR}/FDQTTCP
! # ${FLOWDESIGNER_SOURCE_DIR}/FDOpenCV
! # )
INCLUDE(InstallRequiredSystemLibraries)
+ #copy libxml
+ SET(DEVCPP_DLL
+ C:/Dev-Cpp/bin/libxml2.dll
+ C:/Dev-Cpp/bin/iconv.dll
+ C:/Dev-Cpp/bin/charset.dll
+ C:/Dev-Cpp/bin/mingwm10.dll
+ C:/Dev-Cpp/bin/zlib1.dll
+ )
+
+ INSTALL(FILES ${DEVCPP_DLL} DESTINATION bin)
+
SET(CPACK_PACKAGE_NAME "FlowDesigner")
SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "FlowDesigner")
***************
*** 64,68 ****
ENDIF(WIN32 AND NOT UNIX)
! SET(CPACK_PACKAGE_EXECUTABLES "batchflow;flowdesigner")
INCLUDE(CPack)
--- 96,101 ----
ENDIF(WIN32 AND NOT UNIX)
! SET(CPACK_PACKAGE_EXECUTABLES "flowdesigner" "FlowDesigner" "batchflow" "BatchFlow" "qtflow" "qtflow" "audioviewer" "audioviewer")
!
INCLUDE(CPack)
|
|
From: jdascenzio <jda...@us...> - 2007-09-27 20:48:07
|
Update of /cvsroot/flowdesigner/FlowDesigner/effects/src
In directory sc8-pr-cvs17:/tmp/cvs-serv28538
Modified Files:
CMakeLists.txt
Log Message:
change the install configuration
Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/flowdesigner/FlowDesigner/effects/src/CMakeLists.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CMakeLists.txt 17 Apr 2007 15:01:31 -0000 1.2
--- CMakeLists.txt 27 Sep 2007 20:48:10 -0000 1.3
***************
*** 19,22 ****
#INSTALLING .def file
! INSTALL( CODE "EXECUTE_PROCESS(WORKING_DIRECTORY ${FLOWDESIGNER_SOURCE_DIR}/effects/src OUTPUT_FILE ${CMAKE_INSTALL_PREFIX}/${FD_TOOLBOX_DIR}/EFFECTS/libaudio.def COMMAND ${PERL} ${FLOWDESIGNER_SOURCE_DIR}/tools/src/info2def.pl ${EFFECTS_SRCS})" )
!
--- 19,22 ----
#INSTALLING .def file
! INSTALL( CODE "EXECUTE_PROCESS(WORKING_DIRECTORY ${FLOWDESIGNER_SOURCE_DIR}/effects/src OUTPUT_FILE libeffect.def COMMAND ${PERL} ${FLOWDESIGNER_SOURCE_DIR}/tools/src/info2def.pl ${EFFECTS_SRCS})" )
! INSTALL( FILES ${FLOWDESIGNER_SOURCE_DIR}/effects/src/libeffect.def DESTINATION ${FD_TOOLBOX_DIR}/EFFECTS/)
|
|
From: jdascenzio <jda...@us...> - 2007-09-27 20:48:03
|
Update of /cvsroot/flowdesigner/FlowDesigner/data-flow/src
In directory sc8-pr-cvs17:/tmp/cvs-serv28188
Modified Files:
CMakeLists.txt
Log Message:
change the install configuration
Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/flowdesigner/FlowDesigner/data-flow/src/CMakeLists.txt,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** CMakeLists.txt 7 Aug 2007 18:05:37 -0000 1.8
--- CMakeLists.txt 27 Sep 2007 20:48:01 -0000 1.9
***************
*** 23,26 ****
--- 23,27 ----
CompositeType.cc
JitterMatrix.cc
+ VMethod.cc
)
***************
*** 185,188 ****
INSTALL( CODE "FILE(MAKE_DIRECTORY ${CMAKE_INSTALL_PREFIX}/${FD_TOOLBOX_DIR}/LIBFLOW)")
#INSTALLING .def file
! INSTALL( CODE "EXECUTE_PROCESS(WORKING_DIRECTORY ${FLOWDESIGNER_SOURCE_DIR}/data-flow/src OUTPUT_FILE ${CMAKE_INSTALL_PREFIX}/${FD_TOOLBOX_DIR}/LIBFLOW/libflow.def COMMAND ${PERL} ${FLOWDESIGNER_SOURCE_DIR}/tools/src/info2def.pl ${FULL_SRCS})" )
--- 186,190 ----
INSTALL( CODE "FILE(MAKE_DIRECTORY ${CMAKE_INSTALL_PREFIX}/${FD_TOOLBOX_DIR}/LIBFLOW)")
#INSTALLING .def file
! INSTALL( CODE "EXECUTE_PROCESS(WORKING_DIRECTORY ${FLOWDESIGNER_SOURCE_DIR}/data-flow/src OUTPUT_FILE libflow.def COMMAND ${PERL} ${FLOWDESIGNER_SOURCE_DIR}/tools/src/info2def.pl ${FULL_SRCS})" )
! INSTALL( FILES libflow.def DESTINATION ${FD_TOOLBOX_DIR}/LIBFLOW/)
|
|
From: jdascenzio <jda...@us...> - 2007-09-27 20:47:53
|
Update of /cvsroot/flowdesigner/FlowDesigner/audio_blocks/src
In directory sc8-pr-cvs17:/tmp/cvs-serv28154
Modified Files:
CMakeLists.txt
Log Message:
change the install configuration
Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/flowdesigner/FlowDesigner/audio_blocks/src/CMakeLists.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CMakeLists.txt 17 Apr 2007 15:01:31 -0000 1.2
--- CMakeLists.txt 27 Sep 2007 20:47:52 -0000 1.3
***************
*** 95,98 ****
#INSTALLING .def file
! INSTALL( CODE "EXECUTE_PROCESS(WORKING_DIRECTORY ${FLOWDESIGNER_SOURCE_DIR}/audio_blocks/src OUTPUT_FILE ${CMAKE_INSTALL_PREFIX}/${FD_TOOLBOX_DIR}/AUDIO/libaudio.def COMMAND ${PERL} ${FLOWDESIGNER_SOURCE_DIR}/tools/src/info2def.pl ${AUDIO_SRCS})" )
!
--- 95,98 ----
#INSTALLING .def file
! INSTALL( CODE "EXECUTE_PROCESS(WORKING_DIRECTORY ${FLOWDESIGNER_SOURCE_DIR}/audio_blocks/src OUTPUT_FILE libaudio.def COMMAND ${PERL} ${FLOWDESIGNER_SOURCE_DIR}/tools/src/info2def.pl ${AUDIO_SRCS})" )
! INSTALL( FILES libaudio.def DESTINATION ${FD_TOOLBOX_DIR}/AUDIO/)
|
|
From: jdascenzio <jda...@us...> - 2007-09-27 20:47:39
|
Update of /cvsroot/flowdesigner/FlowDesigner/VQ/src
In directory sc8-pr-cvs17:/tmp/cvs-serv28137
Modified Files:
CMakeLists.txt
Log Message:
change the install configuration
Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/flowdesigner/FlowDesigner/VQ/src/CMakeLists.txt,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** CMakeLists.txt 17 Apr 2007 15:01:31 -0000 1.3
--- CMakeLists.txt 27 Sep 2007 20:47:41 -0000 1.4
***************
*** 36,39 ****
#INSTALLING .def file
! INSTALL( CODE "EXECUTE_PROCESS(WORKING_DIRECTORY ${FLOWDESIGNER_SOURCE_DIR}/VQ/src OUTPUT_FILE ${CMAKE_INSTALL_PREFIX}/${FD_TOOLBOX_DIR}/VQ/libvq.def COMMAND ${PERL} ${FLOWDESIGNER_SOURCE_DIR}/tools/src/info2def.pl ${VQ_SRCS})" )
!
--- 36,39 ----
#INSTALLING .def file
! INSTALL( CODE "EXECUTE_PROCESS(WORKING_DIRECTORY ${FLOWDESIGNER_SOURCE_DIR}/VQ/src OUTPUT_FILE libvq.def COMMAND ${PERL} ${FLOWDESIGNER_SOURCE_DIR}/tools/src/info2def.pl ${VQ_SRCS})" )
! INSTALL( FILES libvq.def DESTINATION ${FD_TOOLBOX_DIR}/VQ/)
|
|
From: jdascenzio <jda...@us...> - 2007-09-27 20:47:31
|
Update of /cvsroot/flowdesigner/FlowDesigner/NNet/src
In directory sc8-pr-cvs17:/tmp/cvs-serv28126
Modified Files:
CMakeLists.txt
Log Message:
change the install configuration
Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/flowdesigner/FlowDesigner/NNet/src/CMakeLists.txt,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** CMakeLists.txt 17 Apr 2007 15:01:31 -0000 1.3
--- CMakeLists.txt 27 Sep 2007 20:47:34 -0000 1.4
***************
*** 30,33 ****
#INSTALLING .def file
! INSTALL( CODE "EXECUTE_PROCESS(WORKING_DIRECTORY ${FLOWDESIGNER_SOURCE_DIR}/NNet/src OUTPUT_FILE ${CMAKE_INSTALL_PREFIX}/${FD_TOOLBOX_DIR}/NNET/libnnet.def COMMAND ${PERL} ${FLOWDESIGNER_SOURCE_DIR}/tools/src/info2def.pl ${NNET_SRCS})" )
!
--- 30,33 ----
#INSTALLING .def file
! INSTALL( CODE "EXECUTE_PROCESS(WORKING_DIRECTORY ${FLOWDESIGNER_SOURCE_DIR}/NNet/src OUTPUT_FILE libnnet.def COMMAND ${PERL} ${FLOWDESIGNER_SOURCE_DIR}/tools/src/info2def.pl ${NNET_SRCS})" )
! INSTALL( FILES libnnet.def DESTINATION ${FD_TOOLBOX_DIR}/NNET/)
|
|
From: jdascenzio <jda...@us...> - 2007-09-27 20:47:23
|
Update of /cvsroot/flowdesigner/FlowDesigner/HMM/src
In directory sc8-pr-cvs17:/tmp/cvs-serv28111
Modified Files:
CMakeLists.txt
Log Message:
change the install configuration
Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/flowdesigner/FlowDesigner/HMM/src/CMakeLists.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CMakeLists.txt 17 Apr 2007 15:01:30 -0000 1.2
--- CMakeLists.txt 27 Sep 2007 20:47:25 -0000 1.3
***************
*** 36,39 ****
#INSTALLING .def file
! INSTALL( CODE "EXECUTE_PROCESS(WORKING_DIRECTORY ${FLOWDESIGNER_SOURCE_DIR}/HMM/src OUTPUT_FILE ${CMAKE_INSTALL_PREFIX}/${FD_TOOLBOX_DIR}/HMM/libhmm.def COMMAND ${PERL} ${FLOWDESIGNER_SOURCE_DIR}/tools/src/info2def.pl ${HMM_SRCS})" )
!
--- 36,39 ----
#INSTALLING .def file
! INSTALL( CODE "EXECUTE_PROCESS(WORKING_DIRECTORY ${FLOWDESIGNER_SOURCE_DIR}/HMM/src OUTPUT_FILE libhmm.def COMMAND ${PERL} ${FLOWDESIGNER_SOURCE_DIR}/tools/src/info2def.pl ${HMM_SRCS})" )
! INSTALL( FILES libhmm.def DESTINATION ${FD_TOOLBOX_DIR}/HMM/)
|
|
From: jdascenzio <jda...@us...> - 2007-09-27 20:47:14
|
Update of /cvsroot/flowdesigner/FlowDesigner/FuzzyEngine/src
In directory sc8-pr-cvs17:/tmp/cvs-serv28096
Modified Files:
CMakeLists.txt
Log Message:
change the install configuration
Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/flowdesigner/FlowDesigner/FuzzyEngine/src/CMakeLists.txt,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** CMakeLists.txt 17 Apr 2007 15:01:30 -0000 1.4
--- CMakeLists.txt 27 Sep 2007 20:47:16 -0000 1.5
***************
*** 28,31 ****
#INSTALLING .def file
! INSTALL( CODE "EXECUTE_PROCESS(WORKING_DIRECTORY ${FLOWDESIGNER_SOURCE_DIR}/FuzzyEngine/src OUTPUT_FILE ${CMAKE_INSTALL_PREFIX}/${FD_TOOLBOX_DIR}/FUZZY/libfuzzy.def COMMAND ${PERL} ${FLOWDESIGNER_SOURCE_DIR}/tools/src/info2def.pl ${FUZZY_SRCS})" )
!
--- 28,31 ----
#INSTALLING .def file
! INSTALL( CODE "EXECUTE_PROCESS(WORKING_DIRECTORY ${FLOWDESIGNER_SOURCE_DIR}/FuzzyEngine/src OUTPUT_FILE libfuzzy.def COMMAND ${PERL} ${FLOWDESIGNER_SOURCE_DIR}/tools/src/info2def.pl ${FUZZY_SRCS})" )
! INSTALL( FILES libfuzzy.def DESTINATION ${FD_TOOLBOX_DIR}/FUZZY/)
|
|
From: jdascenzio <jda...@us...> - 2007-09-27 20:44:24
|
Update of /cvsroot/flowdesigner/FDOpenCV
In directory sc8-pr-cvs17:/tmp/cvs-serv26686
Modified Files:
CMakeLists.txt
Log Message:
install exemples
Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/flowdesigner/FDOpenCV/CMakeLists.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CMakeLists.txt 9 Aug 2007 14:00:15 -0000 1.2
--- CMakeLists.txt 27 Sep 2007 20:44:26 -0000 1.3
***************
*** 1,5 ****
find_package(OpenCV REQUIRED)
!
SET(FDOPENCV_SRCS
CvImage.cc
--- 1,28 ----
find_package(OpenCV REQUIRED)
!
! SET(FDOPENCV_DLL
! "C:/Program Files/OpenCV/bin/highgui100.dll"
! "C:/Program Files/OpenCV/bin/cxcore100.dll"
! "C:/Program Files/OpenCV/bin/cv100.dll"
! "C:/Program Files/OpenCV/bin/cvcam100.dll"
! "C:/Program Files/OpenCV/bin/cvaux100.dll"
! "C:/Program Files/OpenCV/bin/cxts001.dll"
! "C:/Program Files/OpenCV/bin/libguide40.dll"
! "C:/Program Files/OpenCV/bin/ml100.dll"
! )
!
! SET(FDOPENCV_EXAMPLES
! example/azimut.jpg
! example/building.jpg
! example/findContourRect.n
! example/rectangle.bmp
! example/selectContour.n
! example/Transformation.n
! example/webcamFindColor.n
! example/webcamFindMouvement.n
! example/webcamGravityCenter.n
! )
!
SET(FDOPENCV_SRCS
CvImage.cc
***************
*** 66,69 ****
#INSTALLING .def file
! INSTALL( CODE "EXECUTE_PROCESS(WORKING_DIRECTORY ${FLOWDESIGNER_SOURCE_DIR}/FDOpenCV OUTPUT_FILE ${CMAKE_INSTALL_PREFIX}/${FD_TOOLBOX_DIR}/FDOPENCV/libopencv.def COMMAND ${PERL} ${FLOWDESIGNER_SOURCE_DIR}/tools/src/info2def.pl ${FDOPENCV_SRCS})" )
!
--- 89,94 ----
#INSTALLING .def file
! INSTALL( CODE "EXECUTE_PROCESS(WORKING_DIRECTORY ${FLOWDESIGNER_SOURCE_DIR}/FDOpenCV OUTPUT_FILE libopencv.def COMMAND ${PERL} ${FLOWDESIGNER_SOURCE_DIR}/tools/src/info2def.pl ${FDOPENCV_SRCS})" )
! INSTALL( FILES libopencv.def DESTINATION ${FD_TOOLBOX_DIR}/FDOPENCV)
! INSTALL( FILES ${FDOPENCV_DLL} DESTINATION bin)
! INSTALL( FILES ${FDOPENCV_EXAMPLES} DESTINATION examples/FDOPENCV)
|
|
From: jdascenzio <jda...@us...> - 2007-09-27 20:38:10
|
Update of /cvsroot/flowdesigner/FDQTTCP
In directory sc8-pr-cvs17:/tmp/cvs-serv24288
Modified Files:
QtSendString.cc
Log Message:
correct a cout message
Index: QtSendString.cc
===================================================================
RCS file: /cvsroot/flowdesigner/FDQTTCP/QtSendString.cc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** QtSendString.cc 8 Aug 2007 15:39:52 -0000 1.2
--- QtSendString.cc 27 Sep 2007 20:38:09 -0000 1.3
***************
*** 98,102 ****
if(!m_tcpClient.waitForBytesWritten(10))
{
! cout << "WriteJitterMatrix -> ERROR"<< endl;
(*(outputs[m_boolWriteID].buffer))[count] = ObjectRef(Bool::alloc(false));
return;
--- 98,102 ----
if(!m_tcpClient.waitForBytesWritten(10))
{
! cout << "QtSendString -> Error to write bytes"<< endl;
(*(outputs[m_boolWriteID].buffer))[count] = ObjectRef(Bool::alloc(false));
return;
|
|
From: jdascenzio <jda...@us...> - 2007-09-27 20:37:32
|
Update of /cvsroot/flowdesigner/FDQTTCP
In directory sc8-pr-cvs17:/tmp/cvs-serv23899
Modified Files:
CMakeLists.txt
Log Message:
install the exemples
Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/flowdesigner/FDQTTCP/CMakeLists.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CMakeLists.txt 7 Aug 2007 17:45:14 -0000 1.1
--- CMakeLists.txt 27 Sep 2007 20:37:32 -0000 1.2
***************
*** 3,6 ****
--- 3,13 ----
include(${QT_USE_FILE})
+ SET(FDQTTCP_EXAMPLES
+ exemple/listenJitterMatrix.n
+ exemple/listenString.n
+ exemple/sendString.n
+ exemple/sendWebcam.n
+ )
+
SET(FDQTTCP_SRCS
QtSendJitterMatrix.cc
***************
*** 8,12 ****
QtSendString.cc
QtListenString.cc
! )
INCLUDE_DIRECTORIES(${FLOWDESIGNER_SOURCE_DIR}/data-flow/include
--- 15,19 ----
QtSendString.cc
QtListenString.cc
! )
INCLUDE_DIRECTORIES(${FLOWDESIGNER_SOURCE_DIR}/data-flow/include
***************
*** 26,29 ****
#INSTALLING .def file
! INSTALL( CODE "EXECUTE_PROCESS(WORKING_DIRECTORY ${FLOWDESIGNER_SOURCE_DIR}/FDQtTCP OUTPUT_FILE ${CMAKE_INSTALL_PREFIX}/${FD_TOOLBOX_DIR}/FDQTTCP/libqttcp.def COMMAND ${PERL} ${FLOWDESIGNER_SOURCE_DIR}/tools/src/info2def.pl ${FDQTTCP_SRCS})" )
!
--- 33,37 ----
#INSTALLING .def file
! INSTALL( CODE "EXECUTE_PROCESS(WORKING_DIRECTORY ${FLOWDESIGNER_SOURCE_DIR}/FDQtTCP OUTPUT_FILE libqttcp.def COMMAND ${PERL} ${FLOWDESIGNER_SOURCE_DIR}/tools/src/info2def.pl ${FDQTTCP_SRCS})" )
! INSTALL( FILES libqttcp.def DESTINATION ${FD_TOOLBOX_DIR}/FDQTTCP/)
! INSTALL( FILES ${FDQTTCP_EXAMPLES} DESTINATION examples/FDQTTCP/)
|
|
From: jdascenzio <jda...@us...> - 2007-09-27 20:34:41
|
Update of /cvsroot/flowdesigner/FlowDesigner/qtflow/include In directory sc8-pr-cvs17:/tmp/cvs-serv22717 Modified Files: QtNodeTreeView.h Log Message: correct an include Index: QtNodeTreeView.h =================================================================== RCS file: /cvsroot/flowdesigner/FlowDesigner/qtflow/include/QtNodeTreeView.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** QtNodeTreeView.h 23 Feb 2007 22:12:28 -0000 1.4 --- QtNodeTreeView.h 27 Sep 2007 20:34:44 -0000 1.5 *************** *** 7,11 **** #include <vector> #include <string> ! #include <QtGui> namespace FD --- 7,11 ---- #include <vector> #include <string> ! #include <QtGui/QtGui> namespace FD |
|
From: jdascenzio <jda...@us...> - 2007-09-27 20:34:24
|
Update of /cvsroot/flowdesigner/FlowDesigner/qtflow/include In directory sc8-pr-cvs17:/tmp/cvs-serv22702 Modified Files: QtFlowDesigner.h Log Message: correct an include Index: QtFlowDesigner.h =================================================================== RCS file: /cvsroot/flowdesigner/FlowDesigner/qtflow/include/QtFlowDesigner.h,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** QtFlowDesigner.h 5 Sep 2007 14:41:53 -0000 1.11 --- QtFlowDesigner.h 27 Sep 2007 20:34:26 -0000 1.12 *************** *** 19,22 **** --- 19,23 ---- #include <QtGui/QTextEdit> #include <QtGui/QWorkspace> + #include <QtGui/QInputDialog> #include "UINetwork.h" #include <string> |
|
From: jdascenzio <jda...@us...> - 2007-09-27 20:33:26
|
Update of /cvsroot/flowdesigner/FlowDesigner/qtflow/src
In directory sc8-pr-cvs17:/tmp/cvs-serv22313
Modified Files:
QtNodeParameters.cc
Log Message:
correct bug objects->object and int->float
Index: QtNodeParameters.cc
===================================================================
RCS file: /cvsroot/flowdesigner/FlowDesigner/qtflow/src/QtNodeParameters.cc,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** QtNodeParameters.cc 12 Sep 2007 17:46:30 -0000 1.6
--- QtNodeParameters.cc 27 Sep 2007 20:33:27 -0000 1.7
***************
*** 116,120 ****
combo->addItem("float");
combo->addItem("bool");
! combo->addItem("objects");
combo->addItem("subnet_param");
int index = combo->findText( textParams[i]->type.c_str() );
--- 116,120 ----
combo->addItem("float");
combo->addItem("bool");
! combo->addItem("object");
combo->addItem("subnet_param");
int index = combo->findText( textParams[i]->type.c_str() );
***************
*** 234,238 ****
//Maybe to change...
doubleSpinBox->setRange( -1000000, 1000000 );
! doubleSpinBox->setValue( QString(textParams[index]->value.c_str()).toInt() ) ;
connect(doubleSpinBox, SIGNAL( valueChanged(double) ), this, SLOT( valueChanged() ) );
m_valuesWidge.insert(index, doubleSpinBox);
--- 234,238 ----
//Maybe to change...
doubleSpinBox->setRange( -1000000, 1000000 );
! doubleSpinBox->setValue( QString(textParams[index]->value.c_str()).toFloat() ) ;
connect(doubleSpinBox, SIGNAL( valueChanged(double) ), this, SLOT( valueChanged() ) );
m_valuesWidge.insert(index, doubleSpinBox);
|
|
From: jdascenzio <jda...@us...> - 2007-09-12 17:46:29
|
Update of /cvsroot/flowdesigner/FlowDesigner/qtflow/src
In directory sc8-pr-cvs17:/tmp/cvs-serv12479
Modified Files:
QtNodeParameters.cc
Log Message:
close on cancel
Index: QtNodeParameters.cc
===================================================================
RCS file: /cvsroot/flowdesigner/FlowDesigner/qtflow/src/QtNodeParameters.cc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** QtNodeParameters.cc 14 Aug 2007 14:59:45 -0000 1.5
--- QtNodeParameters.cc 12 Sep 2007 17:46:30 -0000 1.6
***************
*** 290,293 ****
--- 290,294 ----
{
setView(m_params->get_textParams());
+ close();
}
else if(button == (QAbstractButton*)m_buttonBox->button( QDialogButtonBox::RestoreDefaults ))
|
|
From: jdascenzio <jda...@us...> - 2007-09-05 14:42:24
|
Update of /cvsroot/flowdesigner/FlowDesigner/qtflow/include
In directory sc8-pr-cvs17:/tmp/cvs-serv13437
Modified Files:
QtDocument.h QtFlowDesigner.h QtLink.h QtNetwork.h QtNode.h
QtTerminal.h UILinkController.h UINetworkController.h
UINodeController.h
Log Message:
add many fuction (delete, colors, iterateNetwork..)
Index: QtNetwork.h
===================================================================
RCS file: /cvsroot/flowdesigner/FlowDesigner/qtflow/include/QtNetwork.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** QtNetwork.h 14 Aug 2007 20:59:42 -0000 1.13
--- QtNetwork.h 5 Sep 2007 14:41:54 -0000 1.14
***************
*** 17,24 ****
class QtLink;
class QtTerminal;
! class UINetwork;
! class UINode;
class UINode;
class UILink;
class QtNetwork : public QGraphicsView
--- 17,25 ----
class QtLink;
class QtTerminal;
! class UINetworkController;
class UINode;
+ class UINodeController;
class UILink;
+ class UILinkController;
class QtNetwork : public QGraphicsView
***************
*** 28,40 ****
public:
! QtNetwork(UINetwork *uiNetwork);
void addQtLink(QtLink *link);
! QtNode* addNode(UINode* node);
!
! QtLink* addLink(QtTerminal *source, QtTerminal *dest, UILink* link);
! const std::string getName() const;
! protected:
void mouseMoveEvent ( QMouseEvent * e );
--- 29,45 ----
public:
! QtNetwork(UINetworkController *uiNetwork);
! const std::string getName() const;
!
! //Node
! QtNode* addNode(UINodeController* node);
! void removeNode(QtNode* node);
+ //Link
+ QtLink* addLink(QtTerminal *source, QtTerminal *dest, UILinkController* link);
void addQtLink(QtLink *link);
+ void removeLink(QtLink* link);
! protected:
void mouseMoveEvent ( QMouseEvent * e );
***************
*** 50,59 ****
void scaleView(qreal scaleFactor);
! UINetwork *m_uiNetwork;
//std::vector<QtNode*> m_nodes;
//std::vector<QtLink*> m_links;
! std::map<UINode*,QtNode*> m_nodeMap;
! std::map<UILink*,QtLink*> m_linkMap;
//Drag & Drop
--- 55,68 ----
void scaleView(qreal scaleFactor);
! UINetworkController *m_uiNetwork;
//std::vector<QtNode*> m_nodes;
//std::vector<QtLink*> m_links;
! //std::map<UINodeController*,QtNode*> m_nodeMap;
! std::map<QtNode*, UINodeController*> m_nodeMap;
! //std::map<UILink*,QtLink*> m_linkMap;
! std::map<QtLink*, UILinkController*> m_linkMap;
!
! bool isNodeExist(const QString &name);
//Drag & Drop
***************
*** 65,69 ****
void menuTriggered(QAction* action);
-
};
}//namespace FD
--- 74,77 ----
Index: QtLink.h
===================================================================
RCS file: /cvsroot/flowdesigner/FlowDesigner/qtflow/include/QtLink.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** QtLink.h 29 Jun 2007 17:51:36 -0000 1.6
--- QtLink.h 5 Sep 2007 14:41:53 -0000 1.7
***************
*** 4,7 ****
--- 4,8 ----
#define _QTLINK_H
+ #include <QPen>
#include <QGraphicsItem>
#include <string>
***************
*** 10,49 ****
namespace FD
{
!
! class QtNode;
! class QtTerminal;
! class UILink;
!
! class QtLink : public QGraphicsItem
! {
!
! public:
! QtLink(QtTerminal *source, QtTerminal *dest, UILink* uiLink);
~QtLink();
!
QtTerminal *sourceQtTerminal() const {return m_source;}
void setSourceQtTerminal(QtTerminal *source) {m_source = source; adjust();}
!
QtTerminal *destQtTerminal() const {return m_dest;}
void setDestQtTerminal(QtTerminal* dest) {m_dest = dest; adjust();}
!
void adjust();
!
! UILink* getUILink() {return m_uiLink;}
!
! protected:
QRectF boundingRect() const;
void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
!
! private:
!
QPointF m_sourcePoint;
QPointF m_destPoint;
QtTerminal *m_source;
QtTerminal *m_dest;
! UILink *m_uiLink;
qreal arrowSize;
! };
!
}//namespace FD
--- 11,56 ----
namespace FD
{
!
! class QtNode;
! class QtTerminal;
! class UILinkController;
!
! class QtLink : public QGraphicsItem
! {
!
! public:
! QtLink(QtTerminal *source, QtTerminal *dest, UILinkController* uiLink);
~QtLink();
!
QtTerminal *sourceQtTerminal() const {return m_source;}
void setSourceQtTerminal(QtTerminal *source) {m_source = source; adjust();}
!
QtTerminal *destQtTerminal() const {return m_dest;}
void setDestQtTerminal(QtTerminal* dest) {m_dest = dest; adjust();}
!
void adjust();
!
! UILinkController* getUILink() {return m_uiLink;}
!
! enum { Type = UserType + 2 };
! int type() const { return Type; }
!
! protected:
QRectF boundingRect() const;
void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
! QVariant itemChange(GraphicsItemChange change, const QVariant &value);
!
! private:
!
QPointF m_sourcePoint;
QPointF m_destPoint;
QtTerminal *m_source;
QtTerminal *m_dest;
! UILinkController *m_uiLink;
qreal arrowSize;
!
! qreal m_penWidth;
! };
!
}//namespace FD
Index: QtTerminal.h
===================================================================
RCS file: /cvsroot/flowdesigner/FlowDesigner/qtflow/include/QtTerminal.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** QtTerminal.h 29 Jun 2007 17:51:36 -0000 1.10
--- QtTerminal.h 5 Sep 2007 14:41:54 -0000 1.11
***************
*** 13,36 ****
namespace FD
{
!
! class QtNode;
! class QtLink;
! class QtNetTerminal;
!
!
! class QtTerminal : public QObject, public QGraphicsRectItem
! {
!
! Q_OBJECT;
!
! public:
!
!
enum {INPUT,OUTPUT,VIRTUAL};
!
QtTerminal(QtNode *node, std::string name="", int type = INPUT ,float x = 0, float y = 0);
QtTerminal(QtNode *node, UITerminal *uiTerminal);
!
int getType(){return m_type;}
--- 13,36 ----
namespace FD
{
!
! class QtNode;
! class QtLink;
! class QtNetTerminal;
!
!
! class QtTerminal : public QObject, public QGraphicsRectItem
! {
!
! Q_OBJECT;
!
! public:
!
!
enum {INPUT,OUTPUT,VIRTUAL};
!
QtTerminal(QtNode *node, std::string name="", int type = INPUT ,float x = 0, float y = 0);
QtTerminal(QtNode *node, UITerminal *uiTerminal);
!
int getType(){return m_type;}
***************
*** 38,55 ****
QtNode* getQtNode(){return m_node;}
!
std::string getName();
!
UITerminal * getUITerminal() {return m_uiTerminal;}
!
! QtNetTerminal* addNetTerminal(UINetTerminal *netTerminal);
!
! signals:
!
! void positionChanged(float x, float y);
! void newLinkCreated(UITerminal* from, UITerminal* to);
!
! protected:
!
//QT events
virtual void mousePressEvent(QGraphicsSceneMouseEvent *event);
--- 38,55 ----
QtNode* getQtNode(){return m_node;}
!
std::string getName();
!
UITerminal * getUITerminal() {return m_uiTerminal;}
!
! QtNetTerminal* addNetTerminal(UINetTerminal *netTerminal);
!
! signals:
!
! void positionChanged(float x, float y);
! void newLinkCreated(UITerminal* from, UITerminal* to);
!
! protected:
!
//QT events
virtual void mousePressEvent(QGraphicsSceneMouseEvent *event);
***************
*** 57,63 ****
virtual void mouseMoveEvent(QGraphicsSceneMouseEvent * event);
! virtual QVariant itemChange ( GraphicsItemChange change, const QVariant & value );
!
!
QGraphicsTextItem *m_label;
QtNode *m_node;
--- 57,63 ----
virtual void mouseMoveEvent(QGraphicsSceneMouseEvent * event);
! virtual QVariant itemChange ( GraphicsItemChange change, const QVariant & value );
!
!
QGraphicsTextItem *m_label;
QtNode *m_node;
***************
*** 70,76 ****
QtNetTerminal* m_netTerminal;
! };
!
!
}
#endif
--- 70,76 ----
QtNetTerminal* m_netTerminal;
! };
!
!
}
#endif
Index: UINodeController.h
===================================================================
RCS file: /cvsroot/flowdesigner/FlowDesigner/qtflow/include/UINodeController.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** UINodeController.h 27 Jun 2007 13:24:09 -0000 1.5
--- UINodeController.h 5 Sep 2007 14:41:54 -0000 1.6
***************
*** 7,59 ****
namespace FD
{
!
! class UINetworkController;
class QtNode;
class QtNetwork;
!
class UINodeController : public QObject, public UINode
{
! Q_OBJECT;
!
public:
!
! UINodeController ( UINetworkController* _net, xmlNodePtr def );
!
! UINodeController ( UINetworkController* _net, std::string _name, std::string _type, double x, double y );
!
! virtual UILink *newLink ( UITerminal *_from, UITerminal *_to );
!
! virtual UITerminal* newTerminal ( ItemInfo *_info, UINode *_node, bool _isInput, double _x, double _y );
!
! virtual UINetTerminal *newNetTerminal ( UITerminal *_terminal, UINetTerminal::NetTermType _type, const std::string &_name,
! const std::string &_objType="any", const std::string &_description="No description available" );
!
! virtual UINodeParameters *newNodeParameters ( UINode *_node, std::string type );
!
! virtual void rename ( const std::string &newName );
!
! void setQtNode ( QtNode *node );
!
! QtNode* getQtNode() {return m_QtNode;}
!
! void updateTerminals();
!
! void updateParameters();
!
! void updateView ( QtNetwork *net );
!
public slots:
! void setPos ( float x, float y );
!
!
private:
!
! UINodeController();
!
! QtNode* m_QtNode;
!
};
!
!
} //namespace FD
--- 7,62 ----
namespace FD
{
!
! class UINetworkController;
! class UITerminalController;
class QtNode;
class QtNetwork;
!
class UINodeController : public QObject, public UINode
{
! Q_OBJECT;
!
public:
!
! UINodeController ( UINetworkController* _net, xmlNodePtr def );
!
! UINodeController ( UINetworkController* _net, std::string _name, std::string _type, double x, double y );
!
! virtual UILink *newLink ( UITerminal *_from, UITerminal *_to );
!
! virtual UITerminal* newTerminal ( ItemInfo *_info, UINode *_node, bool _isInput, double _x, double _y );
!
! virtual UINetTerminal *newNetTerminal ( UITerminal *_terminal, UINetTerminal::NetTermType _type, const std::string &_name,
! const std::string &_objType="any", const std::string &_description="No description available" );
!
!
! void removeTerminal(UITerminalController* terminal);
! virtual UINodeParameters *newNodeParameters ( UINode *_node, std::string type );
!
! virtual void rename ( const std::string &newName );
!
! void setQtNode ( QtNode *node );
!
! QtNode* getQtNode() {return m_QtNode;}
!
! void updateTerminals();
!
! void updateParameters();
!
! void updateView ( QtNetwork *net );
!
public slots:
! void setPos ( float x, float y );
!
!
private:
!
! UINodeController();
!
! QtNode* m_QtNode;
!
};
!
!
} //namespace FD
Index: UINetworkController.h
===================================================================
RCS file: /cvsroot/flowdesigner/FlowDesigner/qtflow/include/UINetworkController.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** UINetworkController.h 20 Jul 2007 01:55:48 -0000 1.4
--- UINetworkController.h 5 Sep 2007 14:41:54 -0000 1.5
***************
*** 10,13 ****
--- 10,14 ----
class UIDocumentController;
class UINodeController;
+ class UILinkController;
class QtNetwork;
class QtDocument;
***************
*** 33,39 ****
virtual UINode *newNode(UINetwork* _net, xmlNodePtr def);
!
virtual UILink *newLink (UITerminal *_from, UITerminal *_to,const char *str=NULL);
virtual UINote* newNote(const std::string &text, double x, double y, bool visible);
--- 34,43 ----
virtual UINode *newNode(UINetwork* _net, xmlNodePtr def);
!
! void removeNode(UINodeController* node);
virtual UILink *newLink (UITerminal *_from, UITerminal *_to,const char *str=NULL);
+
+ void removeLink(UILinkController* link);
virtual UINote* newNote(const std::string &text, double x, double y, bool visible);
***************
*** 42,47 ****
--- 46,53 ----
const std::string &_objType="any", const std::string &_description="No description available");
+
void setQtNetwork(QtNetwork *network) {m_QtNetwork = network;}
+
QtNetwork* getQtNetwork(){return m_QtNetwork;}
***************
*** 52,56 ****
UINetworkController();
!
QtNetwork *m_QtNetwork;
--- 58,62 ----
UINetworkController();
!
QtNetwork *m_QtNetwork;
Index: QtFlowDesigner.h
===================================================================
RCS file: /cvsroot/flowdesigner/FlowDesigner/qtflow/include/QtFlowDesigner.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** QtFlowDesigner.h 10 Aug 2007 20:43:52 -0000 1.10
--- QtFlowDesigner.h 5 Sep 2007 14:41:53 -0000 1.11
***************
*** 19,25 ****
#include <QtGui/QTextEdit>
#include <QtGui/QWorkspace>
!
#include <string>
namespace FD
{
--- 19,27 ----
#include <QtGui/QTextEdit>
#include <QtGui/QWorkspace>
! #include "UINetwork.h"
#include <string>
+ #include "QtDocument.h"
+
namespace FD
{
***************
*** 49,53 ****
void openDocumentClicked();
void saveDocumentClicked();
!
protected:
--- 51,56 ----
void openDocumentClicked();
void saveDocumentClicked();
! void newNetwork(UINetwork::Type type);
! QtDocument *activeDocument();
protected:
Index: QtNode.h
===================================================================
RCS file: /cvsroot/flowdesigner/FlowDesigner/qtflow/include/QtNode.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** QtNode.h 26 Jun 2007 20:18:11 -0000 1.8
--- QtNode.h 5 Sep 2007 14:41:54 -0000 1.9
***************
*** 16,81 ****
namespace FD
{
-
- class QtLink;
- class QtNetwork;
- class QtTerminal;
- class UITerminal;
- class UINode;
-
- class QtNode : public QObject, public QGraphicsRectItem
- {
-
- Q_OBJECT;
-
- public:
-
- QtNode(QtNetwork *graphWidget, std::string name = "");
-
- QtNode(QtNetwork *graphWidget, UINode *uiNode);
-
- void addQtLink(QtLink *edge);
- void removeQtLink(QtLink *edge);
- QList<QtLink *> edges() const;
! enum { Type = UserType + 1 };
! int type() const { return Type; }
!
!
! QtTerminal* addTerminal(UITerminal *terminal);
! QtNetwork* getQtNetwork() { return graph;}
!
! //QtTerminal* getQtTerminal(UITerminal *terminal);
!
! signals:
!
! void positionChanged(float x, float y);
- protected:
-
-
- QVariant itemChange(GraphicsItemChange change, const QVariant &value);
- void mousePressEvent(QGraphicsSceneMouseEvent *event);
- void mouseMoveEvent(QGraphicsSceneMouseEvent *event);
- void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
- void mouseDoubleClickEvent ( QGraphicsSceneMouseEvent * event);
-
-
- UINode *m_uiNode;
- QGraphicsTextItem *nameItem;
- QList<QtLink *> edgeList;
- QPointF newPos;
- QtNetwork *graph;
- QtNode* m_virtualQtNode;
- QtLink* m_virtualQtLink;
- bool m_linking;
- //std::vector<QtTerminal*> m_inputQtTerminals;
- //std::vector<QtTerminal*> m_outputQtTerminals;
- std::map<UITerminal*,QtTerminal*> m_inputTerminalsMap;
- std::map<UITerminal*,QtTerminal*> m_outputTerminalsMap;
-
-
- };
-
}//namespace FD
#endif
--- 16,81 ----
namespace FD
{
! class QtLink;
! class QtNetwork;
! class QtTerminal;
! class UITerminal;
! class UINode;
! class QtNode : public QObject, public QGraphicsRectItem
! {
!
! Q_OBJECT;
!
! public:
!
! QtNode(QtNetwork *graphWidget, std::string name = "");
!
! QtNode(QtNetwork *graphWidget, UINode *uiNode);
!
! void addQtLink(QtLink *edge);
! void removeQtLink(QtLink *edge);
! QList<QtLink *> edges() const;
!
! enum { Type = UserType + 1 };
! int type() const { return Type; }
!
!
! QtTerminal* addTerminal(UITerminal *terminal);
! void removeTerminal(QtTerminal* terminal);
!
! QtNetwork* getQtNetwork() { return graph;}
!
! //QtTerminal* getQtTerminal(UITerminal *terminal);
!
! signals:
!
! void positionChanged(float x, float y);
!
! protected:
!
! QVariant itemChange(GraphicsItemChange change, const QVariant &value);
! void mousePressEvent(QGraphicsSceneMouseEvent *event);
! void mouseMoveEvent(QGraphicsSceneMouseEvent *event);
! void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
! void mouseDoubleClickEvent ( QGraphicsSceneMouseEvent * event);
!
!
! UINode *m_uiNode;
! QGraphicsTextItem *nameItem;
! QList<QtLink *> edgeList;
! QPointF newPos;
! QtNetwork *graph;
! QtNode* m_virtualQtNode;
! QtLink* m_virtualQtLink;
! bool m_linking;
! //std::vector<QtTerminal*> m_inputQtTerminals;
! //std::vector<QtTerminal*> m_outputQtTerminals;
! std::map<UITerminal*,QtTerminal*> m_inputTerminalsMap;
! std::map<UITerminal*,QtTerminal*> m_outputTerminalsMap;
!
!
! };
}//namespace FD
#endif
Index: QtDocument.h
===================================================================
RCS file: /cvsroot/flowdesigner/FlowDesigner/qtflow/include/QtDocument.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** QtDocument.h 14 Aug 2007 21:00:16 -0000 1.9
--- QtDocument.h 5 Sep 2007 14:41:53 -0000 1.10
***************
*** 9,12 ****
--- 9,13 ----
#include <QtGui/QHBoxLayout>
#include <QtGui/QButtonGroup>
+ #include "UINetwork.h"
***************
*** 28,32 ****
QtDocument(QWidget *parent, const std::string &name);
! QtDocument(QWidget *parent, UIDocumentController *doc);
//QtDocument(QWidget *parent, const std::string &name = "Untitled");
--- 29,33 ----
QtDocument(QWidget *parent, const std::string &name);
! QtDocument(QWidget *parent, UINetwork::Type type, UIDocumentController *doc);
//QtDocument(QWidget *parent, const std::string &name = "Untitled");
***************
*** 36,47 ****
void save(const std::string &file);
! QtNetwork* addNetwork(UINetworkController* net);
! void addSubnetNetwork(QString name);
! void addIteratorNetwork(QString name);
std::vector<QtNetwork*> getNetworks() { return m_networks; }
public slots:
void onRunDocument();
--- 37,49 ----
void save(const std::string &file);
! QtNetwork* addNetwork(UINetworkController* net);
! void addNetwork(const QString &name, UINetwork::Type type);
std::vector<QtNetwork*> getNetworks() { return m_networks; }
+ bool isNetworkExist(const QString &name);
public slots:
void onRunDocument();
+ void tabWidgetChanged(int index);
***************
*** 55,60 ****
std::vector<QtNetwork*> m_networks;
!
!
};
} //namespace FD
--- 57,61 ----
std::vector<QtNetwork*> m_networks;
!
};
} //namespace FD
Index: UILinkController.h
===================================================================
RCS file: /cvsroot/flowdesigner/FlowDesigner/qtflow/include/UILinkController.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** UILinkController.h 20 Jul 2007 01:55:48 -0000 1.5
--- UILinkController.h 5 Sep 2007 14:41:54 -0000 1.6
***************
*** 8,40 ****
namespace FD
{
!
class UITerminalController;
class QtNetwork;
class QtLink;
!
class UILinkController : public QObject, public UILink
{
! Q_OBJECT;
!
public:
!
! UILinkController ( UITerminalController *_from,
! UITerminalController *_to,
! const char *points_str=NULL );
!
public slots:
! void positionChanged ( double x, double y );
!
! void updateView ( QtNetwork *net );
!
! QtLink* getQtLink() {return m_QtLink;}
!
protected:
!
! QtLink *m_QtLink;
!
};
!
!
} //namespace FD
--- 8,43 ----
namespace FD
{
!
class UITerminalController;
class QtNetwork;
class QtLink;
!
class UILinkController : public QObject, public UILink
{
! Q_OBJECT;
!
public:
!
! UILinkController ( UITerminalController *_from,
! UITerminalController *_to,
! const char *points_str=NULL );
!
! QtLink* getQtLink() {return m_QtLink;}
! void setQtLink(QtLink *link) {m_QtLink = link;}
!
public slots:
! void positionChanged ( double x, double y );
!
! void updateView ( QtNetwork *net );
!
! bool valid();
!
protected:
!
! QtLink *m_QtLink;
!
};
!
!
} //namespace FD
|
|
From: jdascenzio <jda...@us...> - 2007-09-05 14:41:48
|
Update of /cvsroot/flowdesigner/FlowDesigner/qtflow/src
In directory sc8-pr-cvs17:/tmp/cvs-serv13387
Modified Files:
QtDocument.cc QtFlowDesigner.cc QtLink.cc QtNetwork.cc
QtNode.cc QtTerminal.cc UILinkController.cc
UINetworkController.cc UINodeController.cc
Log Message:
add many fuction (delete, colors, iterateNetwork..)
Index: QtTerminal.cc
===================================================================
RCS file: /cvsroot/flowdesigner/FlowDesigner/qtflow/src/QtTerminal.cc,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** QtTerminal.cc 20 Jul 2007 01:55:48 -0000 1.16
--- QtTerminal.cc 5 Sep 2007 14:41:20 -0000 1.17
***************
*** 21,55 ****
namespace FD
{
!
QtTerminal::QtTerminal ( QtNode *node, std::string name, int type, float x, float y )
! : QGraphicsRectItem ( QRectF ( 0,0,5.0,5.0 ),node ),m_node ( node ), m_type ( type ),
! m_virtualQtTerminal ( NULL ), m_virtualQtLink ( NULL ), m_linking ( false )
{
setPos ( x,y );
m_label = new QGraphicsTextItem ( name.c_str(),this );
QRectF rect = m_label->boundingRect();
!
float offset_x = 0;
float offset_y = -1 * rect.height() / 2.0 + 5.0 / 2.0;
!
switch ( m_type )
{
case INPUT:
! offset_x = -1 * rect.width();
! break;
!
case OUTPUT:
! offset_x = 5.0;
! break;
}
!
m_label->setPos ( offset_x, offset_y );
setBrush ( QBrush ( QColor ( 255,0,0,128 ) ) );
}
!
!
QtTerminal::QtTerminal ( QtNode *node, UITerminal *uiTerminal )
! : QGraphicsRectItem ( QRectF ( 0,0,5.0,5.0 ),node ), m_node ( node ),
! m_virtualQtTerminal ( NULL ), m_virtualQtLink ( NULL ), m_linking ( false ), m_uiTerminal ( uiTerminal ), m_netTerminal ( NULL )
{
if ( m_uiTerminal )
--- 21,55 ----
namespace FD
{
!
QtTerminal::QtTerminal ( QtNode *node, std::string name, int type, float x, float y )
! : QGraphicsRectItem ( QRectF ( 0,0,5.0,5.0 ),node ),m_node ( node ), m_type ( type ),
! m_virtualQtTerminal ( NULL ), m_virtualQtLink ( NULL ), m_linking ( false )
{
setPos ( x,y );
m_label = new QGraphicsTextItem ( name.c_str(),this );
QRectF rect = m_label->boundingRect();
!
float offset_x = 0;
float offset_y = -1 * rect.height() / 2.0 + 5.0 / 2.0;
!
switch ( m_type )
{
case INPUT:
! offset_x = -1 * rect.width();
! break;
!
case OUTPUT:
! offset_x = 5.0;
! break;
}
!
m_label->setPos ( offset_x, offset_y );
setBrush ( QBrush ( QColor ( 255,0,0,128 ) ) );
}
!
!
QtTerminal::QtTerminal ( QtNode *node, UITerminal *uiTerminal )
! : QGraphicsRectItem ( QRectF ( 0,0,5.0,5.0 ),node ), m_node ( node ),
! m_virtualQtTerminal ( NULL ), m_virtualQtLink ( NULL ), m_linking ( false ), m_uiTerminal ( uiTerminal ), m_netTerminal ( NULL )
{
if ( m_uiTerminal )
***************
*** 59,74 ****
//cerr<<"Terminal name "<<m_uiTerminal->getName()<<" pos "<<posx<<","<<posy<<endl;
//setPos(posx,posy);
!
m_label = new QGraphicsTextItem ( m_uiTerminal->getName().c_str(),this );
QRectF rect = m_label->boundingRect();
!
float offset_x = 0;
float offset_y = 0;//-1 * rect.height() / 2.0 + 5.0 / 2.0;
!
if ( m_uiTerminal->isInputTerminal() )
{
offset_x = 5;//-1 * rect.width();
cerr<<"terminal is input"<<endl;
! m_type = INPUT;
}
else
--- 59,74 ----
//cerr<<"Terminal name "<<m_uiTerminal->getName()<<" pos "<<posx<<","<<posy<<endl;
//setPos(posx,posy);
!
m_label = new QGraphicsTextItem ( m_uiTerminal->getName().c_str(),this );
QRectF rect = m_label->boundingRect();
!
float offset_x = 0;
float offset_y = 0;//-1 * rect.height() / 2.0 + 5.0 / 2.0;
!
if ( m_uiTerminal->isInputTerminal() )
{
offset_x = 5;//-1 * rect.width();
cerr<<"terminal is input"<<endl;
! m_type = INPUT;
}
else
***************
*** 76,88 ****
offset_x = -1 * rect.width();//5.0;
cerr<<"terminal is output"<<endl;
! m_type = OUTPUT;
}
m_label->setPos ( offset_x, offset_y );
setBrush ( QBrush ( QColor ( 255,0,0,128 ) ) );
!
!
}
}
!
void QtTerminal::mousePressEvent ( QGraphicsSceneMouseEvent *event )
{
--- 76,88 ----
offset_x = -1 * rect.width();//5.0;
cerr<<"terminal is output"<<endl;
! m_type = OUTPUT;
}
m_label->setPos ( offset_x, offset_y );
setBrush ( QBrush ( QColor ( 255,0,0,128 ) ) );
!
!
}
}
!
void QtTerminal::mousePressEvent ( QGraphicsSceneMouseEvent *event )
{
***************
*** 90,99 ****
if ( event->button() == Qt::LeftButton )
{
!
if ( event->modifiers() == Qt::NoModifier )
{
!
QGraphicsItem::mousePressEvent ( event );
!
cerr<<"mousePressEvent on terminal "<<getName() <<" posx "<<pos().x() <<" posy "<<pos().y() <<endl;
//TODO CREATE LINK
--- 90,99 ----
if ( event->button() == Qt::LeftButton )
{
!
if ( event->modifiers() == Qt::NoModifier )
{
!
QGraphicsItem::mousePressEvent ( event );
!
cerr<<"mousePressEvent on terminal "<<getName() <<" posx "<<pos().x() <<" posy "<<pos().y() <<endl;
//TODO CREATE LINK
***************
*** 112,126 ****
if ( m_uiTerminal && m_uiTerminal->getNetTerminal() == NULL )
{
!
//CREATING A NET TERMINAL
bool ok;
QString name = QInputDialog::getText ( NULL,QString ( "Network Terminal Name" ),
! QString ( "Terminal Name : " ),QLineEdit::Normal,
! QString ( m_uiTerminal->getName().c_str() ),&ok );
!
//TODO : LOOK FOR DUPLICATED NAMES
if ( ok && !name.isEmpty() )
{
!
if ( m_uiTerminal )
{
--- 112,126 ----
if ( m_uiTerminal && m_uiTerminal->getNetTerminal() == NULL )
{
!
//CREATING A NET TERMINAL
bool ok;
QString name = QInputDialog::getText ( NULL,QString ( "Network Terminal Name" ),
! QString ( "Terminal Name : " ),QLineEdit::Normal,
! QString ( m_uiTerminal->getName().c_str() ),&ok );
!
//TODO : LOOK FOR DUPLICATED NAMES
if ( ok && !name.isEmpty() )
{
!
if ( m_uiTerminal )
{
***************
*** 139,283 ****
}
/*
!
//CREATE NET TERMINAL
UINetTerminal *netTerminal = NULL;
!
!
!
!
if (m_uiTerminal->isInputTerminal())
{
! netTerminal = new UINetTerminal(m_uiTerminal,UINetTerminal::INPUT,name.toStdString());
}
else
{
! netTerminal = new UINetTerminal(m_uiTerminal,UINetTerminal::OUTPUT,name.toStdString());
}
!
//CONNECT NET TERMINAL
m_uiTerminal->connectNetTerminal(netTerminal);
!
//CREATE GUI PART
cerr << "QtTerminal Scene pos x :"<<scenePos ().x() << " y:"<< scenePos().y() <<endl;
!
m_netTerminal = new QtNetTerminal(this,m_uiTerminal->getNetTerminal());
scene()->addItem(m_netTerminal);
*/
!
}
!
m_linking = false;
event->accept();
}
}
! }
!
! }
!
! void QtTerminal::mouseReleaseEvent ( QGraphicsSceneMouseEvent *event )
! {
! update();
! if ( event->button() == Qt::LeftButton )
! {
! QGraphicsItem::mousePressEvent ( event );
!
! cerr<<"mouseReleaseEvent on terminal "<<getName() <<endl;
! QtTerminal* destinationQtTerminal = dynamic_cast<QtTerminal*> ( scene()->itemAt ( event->scenePos() ) );
!
! //TERMINAL NEAR BY?
! if ( destinationQtTerminal )
{
! cerr<<"found terminal"<<destinationQtTerminal->getName() <<endl;
!
! //QtNode* destinationNode = destinationQtTerminal->getQtNode();
!
! //QtNode* sourceNode = m_virtualQtLink->get
!
! QtTerminal *sourceQtTerminal = m_virtualQtLink->sourceQtTerminal();
- if (sourceQtTerminal->getType() !=
- destinationQtTerminal->getType())
- {
-
- cerr<<"TODO : CALL MODEL"<<endl;
- if (sourceQtTerminal->getType() == INPUT)
- {
- emit newLinkCreated(sourceQtTerminal->getUITerminal(),destinationQtTerminal->getUITerminal());
- m_uiTerminal->getNode()->getNetwork()->newLink(destinationQtTerminal->getUITerminal(),sourceQtTerminal->getUITerminal(),NULL);
-
- }
- else
- {
- emit newLinkCreated(destinationQtTerminal->getUITerminal(),sourceQtTerminal->getUITerminal());
- m_uiTerminal->getNode()->getNetwork()->newLink(sourceQtTerminal->getUITerminal(),destinationQtTerminal->getUITerminal(),NULL);
-
- }
- }
-
-
-
-
- }
-
- m_linking = false;
- delete m_virtualQtTerminal;
- m_virtualQtTerminal = NULL;
- delete m_virtualQtLink;
- m_virtualQtLink = NULL;
- }
- }
-
- void QtTerminal::mouseMoveEvent ( QGraphicsSceneMouseEvent * event )
- {
- update();
- cerr<<"mouseMoveEvent on terminal "<<getName() <<endl;
- if ( m_linking )
- {
- m_virtualQtTerminal->setPos ( event->scenePos() );
- m_virtualQtLink->adjust();
- }
- else
- {
- m_node->getQtNetwork()->ensureVisible ( this );
- QGraphicsItem::mouseMoveEvent ( event );
- }
- }
-
- std::string QtTerminal::getName()
- {
- return m_uiTerminal->getName();
- }
-
- QtNetTerminal* QtTerminal::addNetTerminal ( UINetTerminal *netTerminal )
- {
- QtNetTerminal* myNetTerminal = new QtNetTerminal ( this,netTerminal );
- scene()->addItem ( myNetTerminal );
- return myNetTerminal;
- }
-
-
- QVariant QtTerminal::itemChange ( GraphicsItemChange change, const QVariant & value )
- {
- cerr<<"QtTerminal::itemChange ( GraphicsItemChange change, const QVariant & value )"<<endl;
-
- if ( change == ItemPositionChange && scene() )
- {
- // value is the new position.
- QPointF newPos = value.toPointF();
-
- emit positionChanged ( newPos.x(), newPos.y() );
-
- //QRectF rect = scene()->sceneRect();
- //if (!rect.contains(newPos)) {
- // Keep the item inside the scene rect.
- // newPos.setX(qMin(rect.right(), qMax(newPos.x(), rect.left())));
- // newPos.setY(qMin(rect.bottom(), qMax(newPos.y(), rect.top())));
- // return newPos;
- //}
- }
-
- return QGraphicsItem::itemChange ( change, value );
- }
-
} //namespace FD
--- 139,295 ----
}
/*
!
//CREATE NET TERMINAL
UINetTerminal *netTerminal = NULL;
!
!
!
!
if (m_uiTerminal->isInputTerminal())
{
! netTerminal = new UINetTerminal(m_uiTerminal,UINetTerminal::INPUT,name.toStdString());
}
else
{
! netTerminal = new UINetTerminal(m_uiTerminal,UINetTerminal::OUTPUT,name.toStdString());
}
!
//CONNECT NET TERMINAL
m_uiTerminal->connectNetTerminal(netTerminal);
!
//CREATE GUI PART
cerr << "QtTerminal Scene pos x :"<<scenePos ().x() << " y:"<< scenePos().y() <<endl;
!
m_netTerminal = new QtNetTerminal(this,m_uiTerminal->getNetTerminal());
scene()->addItem(m_netTerminal);
*/
!
}
!
m_linking = false;
event->accept();
}
}
! else if ( event->modifiers() == Qt::ControlModifier )
{
! cerr<<"**** 1 ****"<<endl;
! if ( m_uiTerminal && m_uiTerminal->getNetTerminal() == NULL && !m_uiTerminal->isInputTerminal())
! {
! cerr<<"**** 2 ****"<<endl;
! UINode *myNode = m_uiTerminal->getNode();
! if ( myNode )
! {
! cerr<<"**** 3 ****"<<endl;
! myNode->newNetTerminal( m_uiTerminal,UINetTerminal::CONDITION,"CONDITION");
! }
! }
! cerr<<"**** 4 ****"<<endl;
! m_linking = false;
! event->accept();
! }
! }
! }
!
! void QtTerminal::mouseReleaseEvent ( QGraphicsSceneMouseEvent *event )
! {
! update();
! if ( event->button() == Qt::LeftButton && m_linking)
! {
! QGraphicsItem::mousePressEvent ( event );
!
! cerr<<"mouseReleaseEvent on terminal "<<getName() <<endl;
! QtTerminal* destinationQtTerminal = dynamic_cast<QtTerminal*> ( scene()->itemAt ( event->scenePos() ) );
!
! //TERMINAL NEAR BY?
! if ( destinationQtTerminal )
! {
! cerr<<"found terminal"<<destinationQtTerminal->getName() <<endl;
!
! //QtNode* destinationNode = destinationQtTerminal->getQtNode();
!
! //QtNode* sourceNode = m_virtualQtLink->get
!
! QtTerminal *sourceQtTerminal = m_virtualQtLink->sourceQtTerminal();
!
! if (sourceQtTerminal->getType() !=
! destinationQtTerminal->getType())
! {
!
! cerr<<"TODO : CALL MODEL"<<endl;
! if (sourceQtTerminal->getType() == INPUT)
! {
! emit newLinkCreated(sourceQtTerminal->getUITerminal(),destinationQtTerminal->getUITerminal());
! m_uiTerminal->getNode()->getNetwork()->newLink(destinationQtTerminal->getUITerminal(),sourceQtTerminal->getUITerminal(),NULL);
! }
! else
! {
! emit newLinkCreated(destinationQtTerminal->getUITerminal(),sourceQtTerminal->getUITerminal());
! m_uiTerminal->getNode()->getNetwork()->newLink(sourceQtTerminal->getUITerminal(),destinationQtTerminal->getUITerminal(),NULL);
!
! }
!
! }
! }
!
! m_linking = false;
! delete m_virtualQtTerminal;
! m_virtualQtTerminal = NULL;
! delete m_virtualQtLink;
! m_virtualQtLink = NULL;
! }
! }
!
! void QtTerminal::mouseMoveEvent ( QGraphicsSceneMouseEvent * event )
! {
! update();
! cerr<<"mouseMoveEvent on terminal "<<getName() <<endl;
! if ( m_linking )
! {
! m_virtualQtTerminal->setPos ( event->scenePos() );
! m_virtualQtLink->adjust();
! }
! else
! {
! m_node->getQtNetwork()->ensureVisible ( this );
! QGraphicsItem::mouseMoveEvent ( event );
! }
! }
!
! std::string QtTerminal::getName()
! {
! return m_uiTerminal->getName();
! }
!
! QtNetTerminal* QtTerminal::addNetTerminal ( UINetTerminal *netTerminal )
! {
! QtNetTerminal* myNetTerminal = new QtNetTerminal ( this,netTerminal );
! scene()->addItem ( myNetTerminal );
! return myNetTerminal;
! }
!
!
! QVariant QtTerminal::itemChange ( GraphicsItemChange change, const QVariant & value )
! {
! cerr<<"QtTerminal::itemChange ( GraphicsItemChange change, const QVariant & value )"<<endl;
!
! if ( change == ItemPositionChange && scene() )
! {
! // value is the new position.
! QPointF newPos = value.toPointF();
!
! emit positionChanged ( newPos.x(), newPos.y() );
!
! //QRectF rect = scene()->sceneRect();
! //if (!rect.contains(newPos)) {
! // Keep the item inside the scene rect.
! // newPos.setX(qMin(rect.right(), qMax(newPos.x(), rect.left())));
! // newPos.setY(qMin(rect.bottom(), qMax(newPos.y(), rect.top())));
! // return newPos;
! //}
! }
!
! return QGraphicsItem::itemChange ( change, value );
! }
} //namespace FD
Index: UILinkController.cc
===================================================================
RCS file: /cvsroot/flowdesigner/FlowDesigner/qtflow/src/UILinkController.cc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** UILinkController.cc 29 Jun 2007 17:51:36 -0000 1.5
--- UILinkController.cc 5 Sep 2007 14:41:20 -0000 1.6
***************
*** 8,23 ****
{
using namespace std;
!
!
UILinkController::UILinkController ( UITerminalController *_from,UITerminalController *_to,const char *points_str )
! : UILink ( _from,_to,points_str ), m_QtLink ( NULL )
{
}
!
void UILinkController::updateView ( QtNetwork *net )
{
if ( net )
{
!
//CREATE VIEW IF REQUIRED
if ( !m_QtLink )
--- 8,23 ----
{
using namespace std;
!
!
UILinkController::UILinkController ( UITerminalController *_from,UITerminalController *_to,const char *points_str )
! : UILink ( _from,_to,points_str ), m_QtLink ( NULL )
{
}
!
void UILinkController::updateView ( QtNetwork *net )
{
if ( net )
{
!
//CREATE VIEW IF REQUIRED
if ( !m_QtLink )
***************
*** 25,29 ****
QtTerminal *source = dynamic_cast<UITerminalController*> ( from )->getQtTerminal();
QtTerminal *dest = dynamic_cast<UITerminalController*> ( to )->getQtTerminal();
!
//add link
m_QtLink = net->addLink ( source,dest,this );
--- 25,29 ----
QtTerminal *source = dynamic_cast<UITerminalController*> ( from )->getQtTerminal();
QtTerminal *dest = dynamic_cast<UITerminalController*> ( to )->getQtTerminal();
!
//add link
m_QtLink = net->addLink ( source,dest,this );
***************
*** 34,41 ****
m_QtLink->adjust();
}
!
}
}
!
void UILinkController::positionChanged ( double x, double y )
{
--- 34,41 ----
m_QtLink->adjust();
}
!
}
}
!
void UILinkController::positionChanged ( double x, double y )
{
***************
*** 45,48 ****
}
}
!
} //namespace FD
--- 45,57 ----
}
}
!
! bool UILinkController::valid()
! {
! if(from->getType()=="any" || to->getType()=="any" )
! {
! return true;
! }
! return (from->getType() == to->getType());
! }
!
} //namespace FD
Index: UINetworkController.cc
===================================================================
RCS file: /cvsroot/flowdesigner/FlowDesigner/qtflow/src/UINetworkController.cc,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** UINetworkController.cc 29 Jun 2007 17:51:36 -0000 1.7
--- UINetworkController.cc 5 Sep 2007 14:41:20 -0000 1.8
***************
*** 12,27 ****
namespace FD {
!
using namespace std;
!
UINetworkController::UINetworkController()
! : UINetwork(NULL,NULL,false), m_QtNetwork(NULL)
{
!
!
}
!
UINetworkController::UINetworkController(UIDocumentController *_doc, xmlNodePtr net)
! : UINetwork(_doc,net,false), m_QtNetwork(NULL)
{
//Load XML
--- 12,27 ----
namespace FD {
!
using namespace std;
!
UINetworkController::UINetworkController()
! : UINetwork(NULL,NULL,false), m_QtNetwork(NULL)
{
!
!
}
!
UINetworkController::UINetworkController(UIDocumentController *_doc, xmlNodePtr net)
! : UINetwork(_doc,net,false), m_QtNetwork(NULL)
{
//Load XML
***************
*** 30,48 ****
UINetworkController::UINetworkController(UIDocumentController *doc, const std::string &_name, UINetwork::Type type)
! : UINetwork(doc,_name,type), m_QtNetwork(NULL)
{
!
!
}
UINode* UINetworkController::newNode(UINetwork* _net, std::string _name,
! std::string _type, double _x, double _y, bool doInit)
{
!
cerr<<"UINode* UINetworkController::newNode "<<endl;
!
//CREATE MODEL & CONTROLLER
UINodeController *nodeController = new UINodeController(dynamic_cast<UINetworkController*>(_net),_name,_type,_x,_y);
!
//UPDATE VIEW
//TO DO, UPDATE MULTIPLE VIEWS?
--- 30,48 ----
UINetworkController::UINetworkController(UIDocumentController *doc, const std::string &_name, UINetwork::Type type)
! : UINetwork(doc,_name,type), m_QtNetwork(NULL)
{
!
!
}
UINode* UINetworkController::newNode(UINetwork* _net, std::string _name,
! std::string _type, double _x, double _y, bool doInit)
{
!
cerr<<"UINode* UINetworkController::newNode "<<endl;
! getDocument()->updateAllNetworks();
//CREATE MODEL & CONTROLLER
UINodeController *nodeController = new UINodeController(dynamic_cast<UINetworkController*>(_net),_name,_type,_x,_y);
!
//UPDATE VIEW
//TO DO, UPDATE MULTIPLE VIEWS?
***************
*** 50,81 ****
{
//QtNode *qtNode = m_QtNetwork->addNode(nodeController);
! //nodeController->setQtNode(qtNode);
}
!
! nodeController->updateView(m_QtNetwork);
!
!
! //UPDATE VIEW
! //nodeController->updateTerminals();
! //nodeController->updateParameters();
!
!
return nodeController;
}
!
! UINode* UINetworkController::newNode(UINetwork* _net, xmlNodePtr def)
! {
cerr<<"UINode* UINetworkController::newNode (XML)"<<endl;
!
//CREATE MODEL & CONTROLLER
UINodeController *nodeController = new UINodeController(dynamic_cast<UINetworkController*>(_net),def);
!
//UPDATE VIEW
//TO DO, UPDATE MULTIPLE VIEWS?
if (m_QtNetwork)
{
! nodeController->updateView(m_QtNetwork);
//QtNode *qtNode = m_QtNetwork->addNode(nodeController);
! //nodeController->setQtNode(qtNode);
}
else
--- 50,81 ----
{
//QtNode *qtNode = m_QtNetwork->addNode(nodeController);
! //nodeController->setQtNode(qtNode);
}
!
! nodeController->updateView(m_QtNetwork);
!
!
! //UPDATE VIEW
! //nodeController->updateTerminals();
! //nodeController->updateParameters();
!
!
return nodeController;
}
!
! UINode* UINetworkController::newNode(UINetwork* _net, xmlNodePtr def)
! {
cerr<<"UINode* UINetworkController::newNode (XML)"<<endl;
!
//CREATE MODEL & CONTROLLER
UINodeController *nodeController = new UINodeController(dynamic_cast<UINetworkController*>(_net),def);
!
//UPDATE VIEW
//TO DO, UPDATE MULTIPLE VIEWS?
if (m_QtNetwork)
{
! nodeController->updateView(m_QtNetwork);
//QtNode *qtNode = m_QtNetwork->addNode(nodeController);
! //nodeController->setQtNode(qtNode);
}
else
***************
*** 83,96 ****
cerr<<"WARNING : UINode* UINetworkController::newNode --> No QtNetwork defined."<<endl;
}
!
//UPDATE VIEW
//nodeController->updateTerminals();
//nodeController->updateParameters();
!
! return nodeController;
! }
!
!
!
UILink* UINetworkController::newLink (UITerminal *_from, UITerminal *_to,const char *str)
{
--- 83,96 ----
cerr<<"WARNING : UINode* UINetworkController::newNode --> No QtNetwork defined."<<endl;
}
!
//UPDATE VIEW
//nodeController->updateTerminals();
//nodeController->updateParameters();
!
! return nodeController;
! }
!
!
!
UILink* UINetworkController::newLink (UITerminal *_from, UITerminal *_to,const char *str)
{
***************
*** 100,113 ****
//UILinkController *linkController = new UILinkController(dynamic_cast<UITerminalController*>(_from),
// );
! return new UILinkController(dynamic_cast<UITerminalController*>(_from),dynamic_cast<UITerminalController*>(_to),str);
}
!
UINote* UINetworkController::newNote(const std::string &text, double x, double y, bool visible)
{
return new UINote(text,x,y,visible);
}
!
UINetTerminal * UINetworkController::newNetTerminal (UITerminal *_terminal, UINetTerminal::NetTermType _type, const std::string &_name,
! const std::string &_objType, const std::string &_description)
{
return new UINetTerminalController(dynamic_cast<UITerminalController*>(_terminal),_type,_name,_objType,_description);
--- 100,115 ----
//UILinkController *linkController = new UILinkController(dynamic_cast<UITerminalController*>(_from),
// );
! UILinkController *linkController = new UILinkController(dynamic_cast<UITerminalController*>(_from),dynamic_cast<UITerminalController*>(_to),str);
! linkController->updateView( m_QtNetwork );
! return linkController;
}
!
UINote* UINetworkController::newNote(const std::string &text, double x, double y, bool visible)
{
return new UINote(text,x,y,visible);
}
!
UINetTerminal * UINetworkController::newNetTerminal (UITerminal *_terminal, UINetTerminal::NetTermType _type, const std::string &_name,
! const std::string &_objType, const std::string &_description)
{
return new UINetTerminalController(dynamic_cast<UITerminalController*>(_terminal),_type,_name,_objType,_description);
***************
*** 120,127 ****
return myNode;
}
void UINetworkController::updateView(QtDocument *doc)
! {
!
if (doc)
{
--- 122,154 ----
return myNode;
}
+
+ void UINetworkController::removeNode(UINodeController* node)
+ {
+ cerr<<"UINetworkController::removeNode(UINodeController* node)"<<endl;
+ std::vector<UITerminal*> terminal = node->getInputs();
+ for( unsigned int i = 0; i < terminal.size();i++ )
+ {
+ node->removeTerminal( dynamic_cast<UITerminalController*>(terminal[i]) );
+ }
+ terminal = node->getOutputs();
+ for( unsigned int i = 0; i < terminal.size();i++ )
+ {
+ node->removeTerminal( dynamic_cast<UITerminalController*>(terminal[i]) );
+ }
+
+ m_QtNetwork->removeNode(node->getQtNode());
+ UINetwork::removeNode(node);
+ cerr<<"UINetworkController::removeNode(UINodeController* node) END"<<endl;
+ }
+
+ void UINetworkController::removeLink(UILinkController* link)
+ {
+ m_QtNetwork->removeLink(link->getQtLink());
+ UINetwork::removeLink(link);
+ }
void UINetworkController::updateView(QtDocument *doc)
! {
! getDocument()->updateAllNetworks();
if (doc)
{
***************
*** 131,161 ****
m_QtNetwork = doc->addNetwork(this);
}
!
//UPDATE VIEW FOR EACH NODES
for (unsigned int i =0; i < nodes.size(); i++)
{
UINodeController *nodeCtrl = dynamic_cast<UINodeController*>(nodes[i]);
!
if (nodeCtrl)
! {
nodeCtrl->updateView(m_QtNetwork);
}
!
}
!
//UPDATE VIEW FOR EACH LINKS
for (unsigned int i = 0; i < links.size(); i++)
{
UILinkController *linkCtrl = dynamic_cast<UILinkController*>(links[i]);
!
if (linkCtrl)
{
linkCtrl->updateView(m_QtNetwork);
}
!
}
}//if doc
}
!
} //namespace FD
--- 158,188 ----
m_QtNetwork = doc->addNetwork(this);
}
!
//UPDATE VIEW FOR EACH NODES
for (unsigned int i =0; i < nodes.size(); i++)
{
UINodeController *nodeCtrl = dynamic_cast<UINodeController*>(nodes[i]);
!
if (nodeCtrl)
! {
nodeCtrl->updateView(m_QtNetwork);
}
!
}
!
//UPDATE VIEW FOR EACH LINKS
for (unsigned int i = 0; i < links.size(); i++)
{
UILinkController *linkCtrl = dynamic_cast<UILinkController*>(links[i]);
!
if (linkCtrl)
{
linkCtrl->updateView(m_QtNetwork);
}
!
}
}//if doc
}
!
} //namespace FD
Index: UINodeController.cc
===================================================================
RCS file: /cvsroot/flowdesigner/FlowDesigner/qtflow/src/UINodeController.cc,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** UINodeController.cc 14 Aug 2007 19:28:35 -0000 1.8
--- UINodeController.cc 5 Sep 2007 14:41:20 -0000 1.9
***************
*** 16,32 ****
{
using namespace std;
!
UINodeController::UINodeController()
! : UINode(NULL,NULL,false), m_QtNode(NULL)
{
!
!
}
UINodeController::UINodeController(UINetworkController* _net, xmlNodePtr def)
! : UINode(_net,def,false), m_QtNode(NULL)
{
cerr<<"UINodeController::UINodeController(UINetworkController* _net, xmlNodePtr def)"<<endl;
!
//creating GUI Node
if (_net && def)
--- 16,32 ----
{
using namespace std;
!
UINodeController::UINodeController()
! : UINode(NULL,NULL,false), m_QtNode(NULL)
{
!
!
}
UINodeController::UINodeController(UINetworkController* _net, xmlNodePtr def)
! : UINode(_net,def,false), m_QtNode(NULL)
{
cerr<<"UINodeController::UINodeController(UINetworkController* _net, xmlNodePtr def)"<<endl;
!
//creating GUI Node
if (_net && def)
***************
*** 35,90 ****
loadXML(def);
}
!
!
!
}
UINodeController::UINodeController(UINetworkController* _net, std::string _name, std::string _type, double x, double y)
! : UINode(_net,_name,_type,x,y,false), m_QtNode(NULL)
{
cerr<<"UINodeController::UINodeController created"<<endl;
- net->getDocument()->updateNetInfo(net);
description = net->getDocument()->getDescription(type);
!
! //Updating information from terminals
! updateTerminals();
!
! //updating information from parameters
! updateParameters();
!
}
! void UINodeController::updateTerminals()
! {
//WARNING :
//This part is taken from UINode's constructor and must be reimplemented here since
//it calls virtual functions that are not "known" to base class at construction.
!
vector<ItemInfo *> inputname;
vector<ItemInfo *> outputname;
inputname = net->getDocument()->getNetInputs(type);
outputname = net->getDocument()->getNetOutputs(type);
!
for (unsigned int i=0;i<inputname.size();i++)
{
inputs.insert(inputs.end(), newTerminal(inputname[i], this, true, 0.0, 0.0));
}
!
for (unsigned int i=0;i<outputname.size();i++)
{
outputs.insert(outputs.end(), newTerminal(outputname[i], this, false, 0.0, 0.0));
}
! }
!
! void UINodeController::updateParameters()
! {
! //WARNING :
//This part is taken from UINode's constructor and must be reimplemented here since
//it calls virtual functions that are not "known" to base class at construction.
parameters = newNodeParameters(this,type);
!
! }
!
UILink* UINodeController::newLink (UITerminal *_from, UITerminal *_to)
--- 35,88 ----
loadXML(def);
}
!
!
!
}
UINodeController::UINodeController(UINetworkController* _net, std::string _name, std::string _type, double x, double y)
! : UINode(_net,_name,_type,x,y,false), m_QtNode(NULL)
{
cerr<<"UINodeController::UINodeController created"<<endl;
description = net->getDocument()->getDescription(type);
! //Updating information from terminals
! updateTerminals();
!
! //updating information from parameters
! updateParameters();
!
}
! void UINodeController::updateTerminals()
! {
//WARNING :
//This part is taken from UINode's constructor and must be reimplemented here since
//it calls virtual functions that are not "known" to base class at construction.
!
vector<ItemInfo *> inputname;
vector<ItemInfo *> outputname;
inputname = net->getDocument()->getNetInputs(type);
outputname = net->getDocument()->getNetOutputs(type);
!
for (unsigned int i=0;i<inputname.size();i++)
{
inputs.insert(inputs.end(), newTerminal(inputname[i], this, true, 0.0, 0.0));
}
!
for (unsigned int i=0;i<outputname.size();i++)
{
outputs.insert(outputs.end(), newTerminal(outputname[i], this, false, 0.0, 0.0));
}
! }
!
! void UINodeController::updateParameters()
! {
! //WARNING :
//This part is taken from UINode's constructor and must be reimplemented here since
//it calls virtual functions that are not "known" to base class at construction.
parameters = newNodeParameters(this,type);
!
! }
!
UILink* UINodeController::newLink (UITerminal *_from, UITerminal *_to)
***************
*** 93,97 ****
return new UILinkController(dynamic_cast<UITerminalController*>(_from),dynamic_cast<UITerminalController*>(_to));
}
!
UITerminal* UINodeController::newTerminal(ItemInfo *_info, UINode *_node, bool _isInput, double _x, double _y)
--- 91,95 ----
return new UILinkController(dynamic_cast<UITerminalController*>(_from),dynamic_cast<UITerminalController*>(_to));
}
!
UITerminal* UINodeController::newTerminal(ItemInfo *_info, UINode *_node, bool _isInput, double _x, double _y)
***************
*** 100,111 ****
return new UITerminalController(_info,dynamic_cast<UINodeController*>(_node),_isInput,_x,_y);
}
UINetTerminal* UINodeController::newNetTerminal (UITerminal *_terminal, UINetTerminal::NetTermType _type, const std::string &_name,
! const std::string &_objType, const std::string &_description)
{
cerr<<"UINetTerminal* UINodeController::newNetTerminal"<<endl;
return new UINetTerminalController(dynamic_cast<UITerminalController*>(_terminal), _type, _name);
}
!
UINodeParameters* UINodeController::newNodeParameters (UINode *_node, std::string type)
{
--- 98,124 ----
return new UITerminalController(_info,dynamic_cast<UINodeController*>(_node),_isInput,_x,_y);
}
+
+ void UINodeController::removeTerminal(UITerminalController* terminal)
+ {
+ std::vector<UILink*> link = terminal->getConnections();
+ for( unsigned int i = 0; i < link.size();i++ )
+ {
+ m_QtNode->getQtNetwork()->removeLink( dynamic_cast<UILinkController*>(link[i])->getQtLink() );
+ getNetwork()->removeLink(link[i]);
+ }
+ m_QtNode->removeTerminal(terminal->getQtTerminal());
+ if(terminal->getNetTerminal())
+ UINode::removeTerminal(terminal->getName(), terminal->getNetTerminal()->getType());
+ else
+ cerr<<"terminal->getNetTerminal()=0"<<endl;
+ }
UINetTerminal* UINodeController::newNetTerminal (UITerminal *_terminal, UINetTerminal::NetTermType _type, const std::string &_name,
! const std::string &_objType, const std::string &_description)
{
cerr<<"UINetTerminal* UINodeController::newNetTerminal"<<endl;
return new UINetTerminalController(dynamic_cast<UITerminalController*>(_terminal), _type, _name);
}
!
UINodeParameters* UINodeController::newNodeParameters (UINode *_node, std::string type)
{
***************
*** 114,129 ****
return new UINodeParameters(_node,type);
}
!
void UINodeController::rename (const std::string &newName)
{
UINode::rename(newName);
}
!
void UINodeController::setQtNode(QtNode* node)
! {
cerr<<"UINodeController::setQtNode "<<node<<endl;
m_QtNode = node;
! }
!
void UINodeController::updateView(QtNetwork *net)
{
--- 127,142 ----
return new UINodeParameters(_node,type);
}
!
void UINodeController::rename (const std::string &newName)
{
UINode::rename(newName);
}
!
void UINodeController::setQtNode(QtNode* node)
! {
cerr<<"UINodeController::setQtNode "<<node<<endl;
m_QtNode = node;
! }
!
void UINodeController::updateView(QtNetwork *net)
{
***************
*** 131,150 ****
if (!m_QtNode && net)
{
! m_QtNode = net->addNode(this);
!
! connect(m_QtNode,SIGNAL(positionChanged(float, float)),this,SLOT(setPos(float, float)));
}
!
//UPDATE THE VIEW
//INPUT TERMINALS
for (unsigned int i = 0; i < inputs.size(); i++)
{
UITerminalController *terminalCTRL = dynamic_cast<UITerminalController*>(inputs[i]);
-
if (terminalCTRL)
{
terminalCTRL->updateView(m_QtNode);
}
!
}
//OUTPUT TERMINALS
--- 144,163 ----
if (!m_QtNode && net)
{
! m_QtNode = net->addNode(this);
!
! connect(m_QtNode,SIGNAL(positionChanged(float, float)),this,SLOT(setPos(float, float)));
}
!
//UPDATE THE VIEW
//INPUT TERMINALS
+ cerr<<getName()<<endl;
for (unsigned int i = 0; i < inputs.size(); i++)
{
UITerminalController *terminalCTRL = dynamic_cast<UITerminalController*>(inputs[i]);
if (terminalCTRL)
{
terminalCTRL->updateView(m_QtNode);
}
!
}
//OUTPUT TERMINALS
***************
*** 152,156 ****
{
UITerminalController *terminalCTRL = dynamic_cast<UITerminalController*>(outputs[i]);
-
if (terminalCTRL)
{
--- 165,168 ----
***************
*** 158,172 ****
}
}
!
! //TODO : LINKS
!
!
}
!
void UINodeController::setPos(float _x, float _y)
{
!
cerr<<"(SLOT) UINodeController::setPos(float _x, float _y)"<<_x<<","<<_y<<endl;
!
x = _x;
y = _y;
--- 170,183 ----
}
}
! //TODO : LINKS
!
!
}
!
void UINodeController::setPos(float _x, float _y)
{
!
cerr<<"(SLOT) UINodeController::setPos(float _x, float _y)"<<_x<<","<<_y<<endl;
!
x = _x;
y = _y;
***************
*** 178,182 ****
{
UITerminalController *terminal = dynamic_cast<UITerminalController*>(inputs[i]);
!
if (terminal)
{
--- 189,193 ----
{
UITerminalController *terminal = dynamic_cast<UITerminalController*>(inputs[i]);
!
if (terminal)
{
***************
*** 184,193 ****
}
}
!
//update view for all output terminals
for (unsigned int i = 0; i < outputs.size(); i++)
{
UITerminalController *terminal = dynamic_cast<UITerminalController*>(outputs[i]);
!
if (terminal)
{
--- 195,204 ----
}
}
!
//update view for all output terminals
for (unsigned int i = 0; i < outputs.size(); i++)
{
UITerminalController *terminal = dynamic_cast<UITerminalController*>(outputs[i]);
!
if (terminal)
{
***************
*** 196,207 ****
}
}
!
//update view for terminals
/**Pointers to all the inputs*/
//std::vector <UITerminal *> inputs;
!
/**Pointers to all the outputs*/
//std::vector <UITerminal *> outputs;
!
}
--- 207,218 ----
}
}
!
//update view for terminals
/**Pointers to all the inputs*/
//std::vector <UITerminal *> inputs;
!
/**Pointers to all the outputs*/
//std::vector <UITerminal *> outputs;
!
}
Index: QtFlowDesigner.cc
===================================================================
RCS file: /cvsroot/flowdesigner/FlowDesigner/qtflow/src/QtFlowDesigner.cc,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** QtFlowDesigner.cc 14 Aug 2007 20:58:55 -0000 1.14
--- QtFlowDesigner.cc 5 Sep 2007 14:41:20 -0000 1.15
***************
*** 2,6 ****
#include "QtFlowDesigner.h"
- #include "QtDocument.h"
#include "QtNetwork.h"
#include "QtNodeTreeView.h"
--- 2,5 ----
***************
*** 315,319 ****
} // retranslateUi
! void QtFlowDesigner::newNetwork(const std::string name)
{
--- 314,318 ----
} // retranslateUi
! /*void QtFlowDesigner::newNetwork(const std::string name)
{
***************
*** 331,387 ****
! }
void QtFlowDesigner::newNetworkClicked()
{
! QWidget *window = m_workspace->activeWindow ();
! QtDocument *doc = dynamic_cast<QtDocument*>(window);
! if(doc==0)
! {
! QtDocument *doc = new QtDocument(this,NULL);
! QWidget *window = m_workspace->addWindow(doc);
! window->setWindowTitle("QtDocument - untitled");
! m_workspace->setActiveWindow(window);
! window->show();
! }
else
{
bool ok;
QString name = QInputDialog::getText ( NULL,QString ( "New network" ),
! QString ( "Network name : " ),QLineEdit::Normal, "NAME",&ok );
! doc->addSubnetNetwork(name);
}
}
void QtFlowDesigner::newIteratorNetworkClicked()
{
! QWidget *window = m_workspace->activeWindow ();
! QtDocument *doc = dynamic_cast<QtDocument*>(window);
! if(doc==0)
! {
! //create new document
! }
else
{
bool ok;
! QString name = QInputDialog::getText ( NULL,QString ( "New Iterator Network" ),
! QString ( "Network Name : " ),QLineEdit::Normal, "NAME",&ok );
!
! for(unsigned int i=0; i<doc->getNetworks().size(); i++)
{
! if(doc->getNetworks()[i]->getName() == name.toStdString())
! {
! QMessageBox::critical( this
! , tr("New Iterator Network ERROR")
! , tr("This name is already in used"));
! return;
! }
!
! }
! doc->addIteratorNetwork(name);
}
-
}
void QtFlowDesigner::openDocumentClicked()
--- 330,408 ----
! }*/
!
! void QtFlowDesigner::newNetwork(UINetwork::Type type)
! {
! QtDocument *doc = new QtDocument(this,type,NULL);
! QWidget *window = m_workspace->addWindow(doc);
! window->setWindowTitle("QtDocument - untitled");
! m_workspace->setActiveWindow(window);
! window->show();
! }
void QtFlowDesigner::newNetworkClicked()
{
! QtDocument* activeDoc = activeDocument();
! if(activeDoc==0)
! newNetwork(UINetwork::subnet);
else
{
bool ok;
QString name = QInputDialog::getText ( NULL,QString ( "New network" ),
! QString ( "Network name : " ),QLineEdit::Normal, "subnet",&ok );
! if(name=="")
! {
! QMessageBox::critical( this
! , tr("New Network ERROR")
! , tr("Name NULL"));
! return;
! }
! if(activeDoc->isNetworkExist(name))
! {
! QMessageBox::critical( this
! , tr("New Network ERROR")
! , tr("This name is already used"));
! return;
! }
! activeDoc->addNetwork(name, UINetwork::subnet);
}
}
+
+
void QtFlowDesigner::newIteratorNetworkClicked()
{
! QtDocument* activeDoc = activeDocument();
! if(activeDoc==0)
! newNetwork(UINetwork::iterator);
else
{
bool ok;
! QString name = QInputDialog::getText ( NULL,QString ( "New iterator network" ),
! QString ( "Network name : " ),QLineEdit::Normal, "loop",&ok );
! if(name=="")
{
! QMessageBox::critical( this
! , tr("New Network ERROR")
! , tr("Name NULL"));
! return;
! }
! else if(activeDoc->isNetworkExist(name))
! {
! QMessageBox::critical( this
! , tr("New Network ERROR")
! , tr("This name is already used"));
! return;
! }
! activeDoc->addNetwork(name, UINetwork::iterator);
}
}
+ QtDocument *QtFlowDesigner::activeDocument()
+ {
+ QWidget *window = m_workspace->activeWindow ();
+ QtDocument *doc = dynamic_cast<QtDocument*>(window);
+ return doc;
+ }
void QtFlowDesigner::openDocumentClicked()
Index: QtDocument.cc
===================================================================
RCS file: /cvsroot/flowdesigner/FlowDesigner/qtflow/src/QtDocument.cc,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** QtDocument.cc 10 Aug 2007 20:43:32 -0000 1.7
--- QtDocument.cc 5 Sep 2007 14:41:20 -0000 1.8
***************
*** 39,44 ****
//create tab widget
m_tabWidget = new QTabWidget(NULL);
! m_tabWidget->setObjectName(QString::fromUtf8("tabWidget"));
!
m_vboxLayout->addWidget(runButton);
m_vboxLayout->addWidget(m_tabWidget);
--- 39,44 ----
//create tab widget
m_tabWidget = new QTabWidget(NULL);
! m_tabWidget->setObjectName(QString::fromUtf8("tabWidget"));
! connect(m_tabWidget, SIGNAL(currentChanged(int)),this, SLOT(tabWidgetChanged(int)));
m_vboxLayout->addWidget(runButton);
m_vboxLayout->addWidget(m_tabWidget);
***************
*** 52,56 ****
}
! QtDocument::QtDocument(QWidget *parent, UIDocumentController* doc)
: QDialog(parent), m_doc(doc)
{
--- 52,58 ----
}
!
!
! QtDocument::QtDocument(QWidget *parent, UINetwork::Type type, UIDocumentController* doc)
: QDialog(parent), m_doc(doc)
{
***************
*** 79,83 ****
m_tabWidget = new QTabWidget(NULL);
m_tabWidget->setObjectName(QString::fromUtf8("tabWidget"));
!
m_vboxLayout->addWidget(runButton);
m_vboxLayout->addWidget(m_tabWidget);
--- 81,85 ----
m_tabWidget = new QTabWidget(NULL);
m_tabWidget->setObjectName(QString::fromUtf8("tabWidget"));
! connect(m_tabWidget, SIGNAL(currentChanged(int)),this, SLOT(tabWidgetChanged(int)));
m_vboxLayout->addWidget(runButton);
m_vboxLayout->addWidget(m_tabWidget);
***************
*** 92,96 ****
//Create a new document with a MAIN network
m_doc = new UIDocumentController("Untitled",this);
! m_doc->addNetwork("MAIN",UINetwork::subnet);
}
else
--- 94,98 ----
//Create a new document with a MAIN network
m_doc = new UIDocumentController("Untitled",this);
! m_doc->addNetwork("MAIN",type);
}
else
***************
*** 101,113 ****
}
! void QtDocument::addSubnetNetwork(QString name)
! {
! m_doc->addNetwork(name.toStdString(),UINetwork::subnet);
! }
! void QtDocument::addIteratorNetwork(QString name)
{
! m_doc->addNetwork(name.toStdString(),UINetwork::iterator);
}
!
void QtDocument::open(const std::string &fname) {
--- 103,114 ----
}
! bool QtDocument::isNetworkExist(const QString &name)
{
! for(unsigned int i=0; i<m_networks.size(); i++)
! if(m_networks[i]->getName() == name.toStdString())
! return true;
! return false;
}
!
void QtDocument::open(const std::string &fname) {
***************
*** 180,185 ****
QtNetwork* QtDocument::addNetwork(UINetworkController* net)
! {
! QtNetwork *qtnet = new QtNetwork(net);
net->setQtNetwork(qtnet);
m_networks.push_back(qtnet);
--- 181,186 ----
QtNetwork* QtDocument::addNetwork(UINetworkController* net)
! {
! QtNetwork *qtnet = new QtNetwork(net);
net->setQtNetwork(qtnet);
m_networks.push_back(qtnet);
***************
*** 188,192 ****
return qtnet;
}
!
!
}//namespace FD
--- 189,201 ----
return qtnet;
}
!
! void QtDocument::addNetwork(const QString &name, UINetwork::Type type)
! {
! m_doc->addNetwork(name.toStdString(),type);
! }
!
! void QtDocument::tabWidgetChanged(int index)
! {
! m_doc->updateView();
! }
}//namespace FD
Index: QtNetwork.cc
===================================================================
RCS file: /cvsroot/flowdesigner/FlowDesigner/qtflow/src/QtNetwork.cc,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** QtNetwork.cc 14 Aug 2007 20:58:31 -0000 1.21
--- QtNetwork.cc 5 Sep 2007 14:41:20 -0000 1.22
***************
*** 13,16 ****
--- 13,17 ----
#include <QTreeWidgetItem>
#include "QtNodeTreeView.h"
+ #include "QtDocument.h"
#include <math.h>
***************
*** 18,21 ****
--- 19,23 ----
#include "UINetworkController.h"
#include "UINodeController.h"
+ #include "UILinkController.h"
#include "UINodeRepository.h"
#include "UIDocument.h"
***************
*** 28,32 ****
using namespace std;
! QtNetwork::QtNetwork(UINetwork *uiNetwork)
: m_uiNetwork(uiNetwork)
{
--- 30,34 ----
using namespace std;
! QtNetwork::QtNetwork(UINetworkController *uiNetwork)
: m_uiNetwork(uiNetwork)
{
***************
*** 38,42 ****
setCacheMode(CacheBackground);
setRenderHint(QPainter::Antialiasing);
!
/*
if (m_uiNetwork)
--- 40,44 ----
setCacheMode(CacheBackground);
setRenderHint(QPainter::Antialiasing);
! setDragMode( QGraphicsView::RubberBandDrag );
/*
if (m_uiNetwork)
***************
*** 90,94 ****
}
else {
! cerr<<"No UINetwork defined"<<endl;
}
*/
--- 92,96 ----
}
else {
! cerr<<"No UINetworkController defined"<<endl;
}
*/
***************
*** 136,139 ****
--- 138,162 ----
}
break;
+ case Qt::Key_Delete:
+ {
+ int nbSelectedItems = scene()->selectedItems().size();
+ while(scene()->selectedItems().size()!=0)
+ {
+ QtNode * selectNode = qgraphicsitem_cast<QtNode *>(scene()->selectedItems()[0]);
+ if(selectNode)
+ m_uiNetwork->removeNode( m_nodeMap[selectNode] );
+ else
+ {
+ QtLink * selectLink = qgraphicsitem_cast<QtLink *>(scene()->selectedItems()[0]);
+ if(selectLink)
+ {
+ cout<<"selectLink: "<<selectLink<<endl;
+ m_uiNetwork->removeLink( m_linkMap[selectLink] );
+ }
+ }
+
+ }
+ break;
+ }
default:
QGraphicsView::keyPressEvent(event);
***************
*** 165,184 ****
void QtNetwork::menuTriggered(QAction* action)
{
std::vector<UINetwork *> network = m_uiNetwork->getDocument()->get_networks();
! for( unsigned int i=0 ; i< network.size(); i++ )
! {
! if( network[i]->getName() == action->text().toStdString())
! {
! QPointF pos = mapToScene(m_contextMenuEvent->pos());
! UINode* node = m_uiNetwork->newNode(network[i]
! , action->text().toStdString()
! , action->text().toStdString()
! , pos.x()
! , pos.y()
! , true);
! m_uiNetwork->addNode(node);
!
! }
! }
}
--- 188,219 ----
void QtNetwork::menuTriggered(QAction* action)
{
+
+ m_uiNetwork->updateView( dynamic_cast<QtDocument*>(this->parentWidget()) );
+
std::vector<UINetwork *> network = m_uiNetwork->getDocument()->get_networks();
! QString name;
! static int number = 0;
! stringstream networkname;
!
! networkname << action->text().toStdString() << "_" << number++;
!
!
! QPointF pos = mapToScene(m_contextMenuEvent->pos());
! UINode* node = m_uiNetwork->newNode(m_uiNetwork
! , networkname.str()
! , action->text().toStdString()
! , pos.x()
! , pos.y()
! , true);
! m_uiNetwork->addNode(node);
!
! }
!
! bool QtNetwork::isNodeExist(const QString &name)
! {
! for(unsigned int i=0; i<m_uiNetwork->getNodes().size(); i++)
! if(m_uiNetwork->getNodes()[i]->getName() == name.toStdString())
! return true;
! return false;
}
***************
*** 277,280 ****
--- 312,316 ----
m_uiNetwork->addNode(node);
+ //cerr<<node->getInputs()[0]-><<end;;
/*
***************
*** 316,336 ****
if (link->getUILink() && m_uiNetwork)
{
! m_uiNetwork->addLink(link->getUILink());
scene()->addItem(link);
! m_linkMap.insert(make_pair(link->getUILink(),link));
}
}
}
! QtNode* QtNetwork::addNode(UINode* node)
{
cerr<<"QtNode* QtNetwork::addNode(UINodeController* node)"<<endl;
QtNode *qtnode = new QtNode(this,node);
scene()->addItem(qtnode);
! m_nodeMap.insert(make_pair(node,qtnode));
return qtnode;
}
! QtLink* QtNetwork::addLink(QtTerminal *source, QtTerminal *dest, UILink* link)
{
if (source && dest && link)
--- 352,375 ----
if (link->getUILink() && m_uiNetwork)
{
! //m_uiNetwork->addLink(link->getUILink());
scene()->addItem(link);
! //m_linkMap.insert(make_pair(link->getUILink(),link));
! m_linkMap.insert(make_pair(link,link->getUILink()));
}
}
}
! QtNode* QtNetwork::addNode(UINodeController* node)
{
cerr<<"QtNode* QtNetwork::addNode(UINodeController* node)"<<endl;
QtNode *qtnode = new QtNode(this,node);
scene()->addItem(qtnode);
! node->setQtNode( qtnode );
! //m_nodeMap.insert(make_pair(node,qtnode));
! m_nodeMap.insert(make_pair(qtnode,node));
return qtnode;
}
! QtLink* QtNetwork::addLink(QtTerminal *source, QtTerminal *dest, UILinkController* link)
{
if (source && dest && link)
***************
*** 338,342 ****
QtLink *qtlink = new QtLink(source,dest,link);
scene()->addItem(qtlink);
! m_linkMap.insert(make_pair(link,qtlink));
return qtlink;
}
--- 377,382 ----
QtLink *qtlink = new QtLink(source,dest,link);
scene()->addItem(qtlink);
! // m_linkMap.insert(make_pair(link,qtlink));
! m_linkMap.insert(make_pair(qtlink,link));
return qtlink;
}
***************
*** 345,348 ****
return NULL;
}
! }
} //namespace FD
--- 385,399 ----
return NULL;
}
! }
! void QtNetwork::removeNode(QtNode* node)
! {
! cerr<<"QtNetwork::removeNode(QtNode* node)"<<endl;
! scene()->removeItem(node);
! }
!
! void QtNetwork::removeLink(QtLink* link)
! {
! cerr<<"QtNetwork::removeLink(QtLink* link)"<<endl;
! scene()->removeItem(link);
! }
} //namespace FD
Index: QtLink.cc
===================================================================
RCS file: /cvsroot/flowdesigner/FlowDesigner/qtflow/src/QtLink.cc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** QtLink.cc 2 May 2007 19:12:22 -0000 1.5
--- QtLink.cc 5 Sep 2007 14:41:20 -0000 1.6
***************
*** 6,9 ****
--- 6,10 ----
#include "QtTerminal.h"
#include "UIProbeLink.h"
+ #include "UILinkController.h"
#include <cmath>
#include <iostream>
***************
*** 13,93 ****
namespace FD
{
-
- static const double Pi = 3.14159265358979323846264338327950288419717;
- static double TwoPi = 2.0 * Pi;
-
- QtLink::QtLink(QtTerminal * source, QtTerminal * dest, UILink* uiLink)
- : m_source(source), m_dest(dest), arrowSize(10), m_uiLink(uiLink)
- {
- setAcceptedMouseButtons(0);
- adjust();
- }
-
- QtLink::~QtLink()
- {
- //source->removeQtLink(this);
- //dest->removeQtLink(this);
- }
-
- void QtLink::adjust()
- {
- if (!m_source || !m_dest)
- return;
-
- QPointF testPoint = m_source->mapFromParent (0,0);
! //cerr<<"Map from parent x "<<testPoint.x()<<" y "<<testPoint.y()<<endl;
- //QLineF line(mapFromItem(m_source, 0, 0), mapFromItem(m_dest, 0, 0));
- QLineF line(m_source->scenePos(), m_dest->scenePos());
- //QLineF line(m_source->mapToScene(0,0), m_dest->mapToScene(0,0));
- removeFromIndex();
- m_sourcePoint = line.p1();
- m_destPoint = line.p2();
- addToIndex();
- }
-
- QRectF QtLink::boundingRect() const
- {
- if (!m_source || !m_dest)
- return QRectF();
-
- qreal penWidth = 1;
- qreal extra = (penWidth + arrowSize) / 2.0;
-
- return QRectF(m_sourcePoint, QSizeF(m_destPoint.x() - m_sourcePoint.x(),
- m_destPoint.y() - m_sourcePoint.y()))
- .normalized()
- .adjusted(-extra, -extra, extra, extra);
- }
-
- void QtLink::paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidget *)
- {
- if (!m_source || !m_dest)
- return;
-
- // Draw the line itself
- QLineF line(m_sourcePoint, m_destPoint);
- painter->setPen(QPen(Qt::black, 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin));
- painter->drawLine(line);
-
- // Draw the arrows if there's enough room
- double angle = ::acos(line.dx() / line.length());
- if (line.dy() >= ...
[truncated message content] |
|
From: Jean-Marc V. <jm...@us...> - 2007-08-28 01:51:02
|
Update of /cvsroot/flowdesigner/FlowDesigner/data-flow/include In directory sc8-pr-cvs17:/tmp/cvs-serv18680/data-flow/include Modified Files: Makefile.am Log Message: Fixed syntax error (extra backslash) Index: Makefile.am =================================================================== RCS file: /cvsroot/flowdesigner/FlowDesigner/data-flow/include/Makefile.am,v retrieving revision 1.84 retrieving revision 1.85 diff -C2 -d -r1.84 -r1.85 *** Makefile.am 7 Aug 2007 18:03:40 -0000 1.84 --- Makefile.am 28 Aug 2007 01:51:02 -0000 1.85 *************** *** 76,80 **** Power.h \ UINote.h \ ! JitterMatrix.h \ noinst_HEADERS = \ --- 76,80 ---- Power.h \ UINote.h \ ! JitterMatrix.h noinst_HEADERS = \ |
|
From: Jean-Marc V. <jm...@us...> - 2007-08-28 01:48:20
|
Update of /cvsroot/flowdesigner/FlowDesigner/data-flow/include
In directory sc8-pr-cvs17:/tmp/cvs-serv17838/data-flow/include
Modified Files:
JitterMatrix.h
Log Message:
Fixed syntax error
Index: JitterMatrix.h
===================================================================
RCS file: /cvsroot/flowdesigner/FlowDesigner/data-flow/include/JitterMatrix.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** JitterMatrix.h 7 Aug 2007 18:03:40 -0000 1.1
--- JitterMatrix.h 28 Aug 2007 01:48:13 -0000 1.2
***************
*** 44,48 ****
JitterMatrix(const JitterMatrix& jitterMatrix);
! JitterMatrix::JitterMatrix(const long& width
, const long& height
, const long& planeCount
--- 44,48 ----
JitterMatrix(const JitterMatrix& jitterMatrix);
! JitterMatrix(const long& width
, const long& height
, const long& planeCount
|
Update of /cvsroot/flowdesigner/FDOpenCV
In directory sc8-pr-cvs17:/tmp/cvs-serv13314
Modified Files:
CvAdd.cc CvAvg.cc CvContourArea.cc CvCreateColor.cc
CvCreateImage.cc CvCreateStructuringElement.cc CvDilate.cc
CvDrawContours.cc CvErode.cc CvFindColorHSV.cc
CvFindColorRGB.cc CvFindContours.cc CvFirstContour.cc
CvGravityCenter.cc CvGray.cc CvImageToJitterMatrix.cc
CvJitterMatrixToImage.cc CvLine.cc CvLoadImage.cc
CvLoadVideo.cc CvMorphology.cc CvNextContour.cc
CvNextHierarchy.cc CvOpticalFlowHS.cc CvOpticalFlowLK.cc
CvPrevContour.cc CvPrevHierarchy.cc CvQueryFrame.cc
CvRectangle.cc CvSaveImage.cc CvSelectContour.cc
CvShowImage.cc CvShowImageQt.cc CvSobel.cc CvThreshold.cc
CvWebcam.cc
Log Message:
correct tab problem in the definition of the components
Index: CvFirstContour.cc
===================================================================
RCS file: /cvsroot/flowdesigner/FDOpenCV/CvFirstContour.cc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CvFirstContour.cc 29 Jun 2007 18:31:22 -0000 1.2
--- CvFirstContour.cc 22 Aug 2007 15:52:00 -0000 1.3
***************
*** 22,26 ****
* @output_name CONTOURSOUT
* @output_description The result contour
! * @output_type CvContours
*
END*/
--- 22,26 ----
* @output_name CONTOURSOUT
* @output_description The result contour
! * @output_type CvContours
*
END*/
Index: CvFindColorHSV.cc
===================================================================
RCS file: /cvsroot/flowdesigner/FDOpenCV/CvFindColorHSV.cc,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** CvFindColorHSV.cc 6 Aug 2007 20:28:26 -0000 1.6
--- CvFindColorHSV.cc 22 Aug 2007 15:52:00 -0000 1.7
***************
*** 28,37 ****
* @input_name COLORMAX
* @input_description Color which represents the maximal value for each channel.
! * @input_type CvColor
! *
* @output_name IMAGEOUT
* @output_description Result image
! * @output_type CvImage
! *
END*/
inline std::string CINT(int value)
--- 28,37 ----
* @input_name COLORMAX
* @input_description Color which represents the maximal value for each channel.
! * @input_type CvColor
! *
* @output_name IMAGEOUT
* @output_description Result image
! * @output_type CvImage
! *
END*/
inline std::string CINT(int value)
Index: CvOpticalFlowHS.cc
===================================================================
RCS file: /cvsroot/flowdesigner/FDOpenCV/CvOpticalFlowHS.cc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CvOpticalFlowHS.cc 6 Aug 2007 20:42:43 -0000 1.2
--- CvOpticalFlowHS.cc 22 Aug 2007 15:52:00 -0000 1.3
***************
*** 47,55 ****
* @output_name VEL_X
* @output_description Horizontal component of the optical flow
! * @output_type CvImage
*
* @output_name VEL_Y
* @output_description Vertical component of the optical flow
! * @output_type CvImage
*
END*/
--- 47,55 ----
* @output_name VEL_X
* @output_description Horizontal component of the optical flow
! * @output_type CvImage
*
* @output_name VEL_Y
* @output_description Vertical component of the optical flow
! * @output_type CvImage
*
END*/
Index: CvNextHierarchy.cc
===================================================================
RCS file: /cvsroot/flowdesigner/FDOpenCV/CvNextHierarchy.cc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** CvNextHierarchy.cc 11 Jul 2007 17:51:34 -0000 1.3
--- CvNextHierarchy.cc 22 Aug 2007 15:52:00 -0000 1.4
***************
*** 22,34 ****
* @output_name CONTOURSOUT
* @output_description The result contour
! * @output_type CvContours
*
* @output_name BOOL
* @output_description True if the next hierarchy exist. If false, the first contour is return
! * @output_type bool
*
* @output_name NBELEMENTS
* @output_description Number of elements in the selected contour
! * @output_type int
*
END*/
--- 22,34 ----
* @output_name CONTOURSOUT
* @output_description The result contour
! * @output_type CvContours
*
* @output_name BOOL
* @output_description True if the next hierarchy exist. If false, the first contour is return
! * @output_type bool
*
* @output_name NBELEMENTS
* @output_description Number of elements in the selected contour
! * @output_type int
*
END*/
Index: CvGravityCenter.cc
===================================================================
RCS file: /cvsroot/flowdesigner/FDOpenCV/CvGravityCenter.cc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** CvGravityCenter.cc 6 Aug 2007 20:28:26 -0000 1.3
--- CvGravityCenter.cc 22 Aug 2007 15:52:00 -0000 1.4
***************
*** 26,30 ****
* @parameter_value 0
* @parameter_description If the flag is non-zero, all the zero pixel values are treated as zeroes, all the others are treated as 0xFF.
! *
* @parameter_name CHANNEL
* @parameter_type int
--- 26,30 ----
* @parameter_value 0
* @parameter_description If the flag is non-zero, all the zero pixel values are treated as zeroes, all the others are treated as 0xFF.
! *
* @parameter_name CHANNEL
* @parameter_type int
***************
*** 34,42 ****
* @output_name X
* @output_description The coordinate x of the gravity center.
! * @output_type float
! *
* @output_name Y
* @output_description The coordinate y of the gravity center.
! * @output_type float
*
END*/
--- 34,42 ----
* @output_name X
* @output_description The coordinate x of the gravity center.
! * @output_type float
! *
* @output_name Y
* @output_description The coordinate y of the gravity center.
! * @output_type float
*
END*/
Index: CvSobel.cc
===================================================================
RCS file: /cvsroot/flowdesigner/FDOpenCV/CvSobel.cc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** CvSobel.cc 7 Aug 2007 17:50:20 -0000 1.5
--- CvSobel.cc 22 Aug 2007 15:52:00 -0000 1.6
***************
*** 19,23 ****
* @input_description Input image
* @input_type CvImage
! *
* @output_name IMAGEOUT
* @output_description Image of the edges found by the function.
--- 19,23 ----
* @input_description Input image
* @input_type CvImage
! *
* @output_name IMAGEOUT
* @output_description Image of the edges found by the function.
Index: CvAdd.cc
===================================================================
RCS file: /cvsroot/flowdesigner/FDOpenCV/CvAdd.cc,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** CvAdd.cc 6 Aug 2007 18:54:08 -0000 1.7
--- CvAdd.cc 22 Aug 2007 15:52:00 -0000 1.8
***************
*** 25,29 ****
* @input_description Input image2.
* @input_type CvImage
! *
* @output_name OUTPUT
* @output_description Output image.
--- 25,29 ----
* @input_description Input image2.
* @input_type CvImage
! *
* @output_name OUTPUT
* @output_description Output image.
Index: CvDilate.cc
===================================================================
RCS file: /cvsroot/flowdesigner/FDOpenCV/CvDilate.cc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** CvDilate.cc 6 Aug 2007 19:22:04 -0000 1.4
--- CvDilate.cc 22 Aug 2007 15:52:00 -0000 1.5
***************
*** 24,28 ****
* @input_description Input element
* @input_type CvStructuringElement
! *
* @output_name IMAGEOUT
* @output_description Output image
--- 24,28 ----
* @input_description Input element
* @input_type CvStructuringElement
! *
* @output_name IMAGEOUT
* @output_description Output image
Index: CvContourArea.cc
===================================================================
RCS file: /cvsroot/flowdesigner/FDOpenCV/CvContourArea.cc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** CvContourArea.cc 10 Jul 2007 15:34:05 -0000 1.3
--- CvContourArea.cc 22 Aug 2007 15:52:00 -0000 1.4
***************
*** 19,27 ****
* @input_description The contours to handle
* @input_type CvContours
! *
* @output_name AREA
* @output_description the contour area
! * @output_type float
! *
END*/
--- 19,27 ----
* @input_description The contours to handle
* @input_type CvContours
! *
* @output_name AREA
* @output_description the contour area
! * @output_type float
! *
END*/
Index: CvSelectContour.cc
===================================================================
RCS file: /cvsroot/flowdesigner/FDOpenCV/CvSelectContour.cc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** CvSelectContour.cc 11 Jul 2007 17:51:34 -0000 1.4
--- CvSelectContour.cc 22 Aug 2007 15:52:00 -0000 1.5
***************
*** 28,41 ****
* @output_name CONTOURSOUT
* @output_description The result contour
! * @output_type CvContours
*
* @output_name NBELEMENTS
* @output_description Number of elemtents in the selected contour
! * @output_type int
! *
* @output_name BOOL
* @output_description true if the next contour exist. If false, the first contour is return
! * @output_type bool
! *
END*/
inline std::string CINT(int value)
--- 28,41 ----
* @output_name CONTOURSOUT
* @output_description The result contour
! * @output_type CvContours
*
* @output_name NBELEMENTS
* @output_description Number of elemtents in the selected contour
! * @output_type int
! *
* @output_name BOOL
* @output_description true if the next contour exist. If false, the first contour is return
! * @output_type bool
! *
END*/
inline std::string CINT(int value)
Index: CvFindColorRGB.cc
===================================================================
RCS file: /cvsroot/flowdesigner/FDOpenCV/CvFindColorRGB.cc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** CvFindColorRGB.cc 6 Aug 2007 20:28:26 -0000 1.4
--- CvFindColorRGB.cc 22 Aug 2007 15:52:00 -0000 1.5
***************
*** 43,48 ****
* @output_name IMAGEOUT
* @output_description Result image
! * @output_type CvImage
! *
END*/
inline std::string CINT(int value)
--- 43,48 ----
* @output_name IMAGEOUT
* @output_description Result image
! * @output_type CvImage
! *
END*/
inline std::string CINT(int value)
Index: CvFindContours.cc
===================================================================
RCS file: /cvsroot/flowdesigner/FDOpenCV/CvFindContours.cc,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** CvFindContours.cc 6 Aug 2007 20:28:26 -0000 1.6
--- CvFindContours.cc 22 Aug 2007 15:52:00 -0000 1.7
***************
*** 47,56 ****
* @output_name CONTOURS
* @output_description Contain the pointer to the first outer contour
! * @output_type CvContours
! *
* @output_name NBCONTOURS
* @output_description Number of contours
! * @output_type int
! *
END*/
--- 47,56 ----
* @output_name CONTOURS
* @output_description Contain the pointer to the first outer contour
! * @output_type CvContours
! *
* @output_name NBCONTOURS
* @output_description Number of contours
! * @output_type int
! *
END*/
Index: CvThreshold.cc
===================================================================
RCS file: /cvsroot/flowdesigner/FDOpenCV/CvThreshold.cc,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** CvThreshold.cc 7 Aug 2007 17:50:20 -0000 1.6
--- CvThreshold.cc 22 Aug 2007 15:52:00 -0000 1.7
***************
*** 21,25 ****
* @input_description Input image
* @input_type CvImage
! *
* @output_name IMAGEOUT
* @output_description Output image
--- 21,25 ----
* @input_description Input image
* @input_type CvImage
! *
* @output_name IMAGEOUT
* @output_description Output image
***************
*** 40,43 ****
--- 40,44 ----
* @parameter_value CV_THRESH_BINARY;CV_THRESH_BINARY_INV;CV_THRESH_TRUNC;CV_THRESH_TOZERO;CV_THRESH_TOZERO_INV
* @parameter_description Thresholding type
+ *
END*/
Index: CvShowImage.cc
===================================================================
RCS file: /cvsroot/flowdesigner/FDOpenCV/CvShowImage.cc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** CvShowImage.cc 11 Jul 2007 14:23:14 -0000 1.4
--- CvShowImage.cc 22 Aug 2007 15:52:00 -0000 1.5
***************
*** 30,34 ****
* @parameter_value 1
* @parameter_description If it is set to 1, window size is automatically adjusted to fit the displayed image, while user can not change the window size manually.
! *
* @output_name IMAGEOUT
* @output_description Same as input image
--- 30,34 ----
* @parameter_value 1
* @parameter_description If it is set to 1, window size is automatically adjusted to fit the displayed image, while user can not change the window size manually.
! *
* @output_name IMAGEOUT
* @output_description Same as input image
Index: CvJitterMatrixToImage.cc
===================================================================
RCS file: /cvsroot/flowdesigner/FDOpenCV/CvJitterMatrixToImage.cc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CvJitterMatrixToImage.cc 7 Aug 2007 17:47:27 -0000 1.1
--- CvJitterMatrixToImage.cc 22 Aug 2007 15:52:00 -0000 1.2
***************
*** 23,27 ****
* @output_description The result image
* @output_type CvImage
! *
END*/
--- 23,27 ----
* @output_description The result image
* @output_type CvImage
! *
END*/
Index: CvImageToJitterMatrix.cc
===================================================================
RCS file: /cvsroot/flowdesigner/FDOpenCV/CvImageToJitterMatrix.cc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CvImageToJitterMatrix.cc 7 Aug 2007 17:47:26 -0000 1.1
--- CvImageToJitterMatrix.cc 22 Aug 2007 15:52:00 -0000 1.2
***************
*** 22,26 ****
* @output_name JITTERMATRIX
* @output_description The result jitterMatrix
! * @output_type JitterMatrix
*
END*/
--- 22,26 ----
* @output_name JITTERMATRIX
* @output_description The result jitterMatrix
! * @output_type JitterMatrix
*
END*/
Index: CvCreateStructuringElement.cc
===================================================================
RCS file: /cvsroot/flowdesigner/FDOpenCV/CvCreateStructuringElement.cc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** CvCreateStructuringElement.cc 9 Jul 2007 18:07:34 -0000 1.3
--- CvCreateStructuringElement.cc 22 Aug 2007 15:52:00 -0000 1.4
***************
*** 44,49 ****
* @output_name STRUCTURINGELEMENT
* @output_description The element structure
! * @output_type CvStructuringElement
! *
END*/
--- 44,49 ----
* @output_name STRUCTURINGELEMENT
* @output_description The element structure
! * @output_type CvStructuringElement
! *
END*/
Index: CvSaveImage.cc
===================================================================
RCS file: /cvsroot/flowdesigner/FDOpenCV/CvSaveImage.cc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** CvSaveImage.cc 10 Jul 2007 15:34:07 -0000 1.3
--- CvSaveImage.cc 22 Aug 2007 15:52:00 -0000 1.4
***************
*** 23,31 ****
* @input_description The file name to save
* @input_type string
! *
* @output_name OUTPUT
* @output_description The saved image
! * @output_type CvImage
! *
END*/
--- 23,31 ----
* @input_description The file name to save
* @input_type string
! *
* @output_name OUTPUT
* @output_description The saved image
! * @output_type CvImage
! *
END*/
Index: CvLoadImage.cc
===================================================================
RCS file: /cvsroot/flowdesigner/FDOpenCV/CvLoadImage.cc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CvLoadImage.cc 29 Jun 2007 18:31:23 -0000 1.2
--- CvLoadImage.cc 22 Aug 2007 15:52:00 -0000 1.3
***************
*** 29,34 ****
* @output_name IMAGE
* @output_description The loaded image data structure
! * @output_type CvImage
! *
END*/
--- 29,34 ----
* @output_name IMAGE
* @output_description The loaded image data structure
! * @output_type CvImage
! *
END*/
Index: CvCreateImage.cc
===================================================================
RCS file: /cvsroot/flowdesigner/FDOpenCV/CvCreateImage.cc,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** CvCreateImage.cc 9 Aug 2007 15:17:01 -0000 1.7
--- CvCreateImage.cc 22 Aug 2007 15:52:00 -0000 1.8
***************
*** 43,48 ****
* @output_name IMAGE
* @output_description The result image
! * @output_type CvImage
! *
END*/
--- 43,48 ----
* @output_name IMAGE
* @output_description The result image
! * @output_type CvImage
! *
END*/
Index: CvCreateColor.cc
===================================================================
RCS file: /cvsroot/flowdesigner/FDOpenCV/CvCreateColor.cc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** CvCreateColor.cc 6 Aug 2007 20:28:25 -0000 1.3
--- CvCreateColor.cc 22 Aug 2007 15:52:00 -0000 1.4
***************
*** 33,38 ****
* @output_name COLOUR
* @output_description The element structure of the color
! * @output_type CvColor
! *
END*/
--- 33,38 ----
* @output_name COLOUR
* @output_description The element structure of the color
! * @output_type CvColor
! *
END*/
Index: CvLoadVideo.cc
===================================================================
RCS file: /cvsroot/flowdesigner/FDOpenCV/CvLoadVideo.cc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CvLoadVideo.cc 29 Jun 2007 14:28:20 -0000 1.1
--- CvLoadVideo.cc 22 Aug 2007 15:52:00 -0000 1.2
***************
*** 25,30 ****
* @output_name VIDEO
* @output_description The loaded video data structure
! * @output_type CvVideo
! *
END*/
--- 25,30 ----
* @output_name VIDEO
* @output_description The loaded video data structure
! * @output_type CvVideo
! *
END*/
Index: CvLine.cc
===================================================================
RCS file: /cvsroot/flowdesigner/FDOpenCV/CvLine.cc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** CvLine.cc 10 Jul 2007 15:34:06 -0000 1.4
--- CvLine.cc 22 Aug 2007 15:52:00 -0000 1.5
***************
*** 46,64 ****
* @parameter_value 1
* @parameter_description Thickness of lines that make up the rectangle. Negative values, make the function to draw a filled rectangle
! *
* @parameter_name LINE_TYPE
* @parameter_type string
* @parameter_value 8;4;CV_AA
* @parameter_description Type of the contour segments
! *
* @parameter_name SHIFT
* @parameter_type int
* @parameter_value 0
* @parameter_description Number of fractional bits in the point coordinates
! *
* @output_name IMAGEOUT
* @output_description The result image
! * @output_type CvImage
! *
END*/
inline std::string CINT(int value)
--- 46,64 ----
* @parameter_value 1
* @parameter_description Thickness of lines that make up the rectangle. Negative values, make the function to draw a filled rectangle
! *
* @parameter_name LINE_TYPE
* @parameter_type string
* @parameter_value 8;4;CV_AA
* @parameter_description Type of the contour segments
! *
* @parameter_name SHIFT
* @parameter_type int
* @parameter_value 0
* @parameter_description Number of fractional bits in the point coordinates
! *
* @output_name IMAGEOUT
* @output_description The result image
! * @output_type CvImage
! *
END*/
inline std::string CINT(int value)
Index: CvGray.cc
===================================================================
RCS file: /cvsroot/flowdesigner/FDOpenCV/CvGray.cc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** CvGray.cc 6 Aug 2007 19:22:04 -0000 1.4
--- CvGray.cc 22 Aug 2007 15:52:00 -0000 1.5
***************
*** 19,23 ****
* @input_description Input image
* @input_type CvImage
! *
* @output_name IMAGEOUT
* @output_description The result gray image
--- 19,23 ----
* @input_description Input image
* @input_type CvImage
! *
* @output_name IMAGEOUT
* @output_description The result gray image
Index: CvWebcam.cc
===================================================================
RCS file: /cvsroot/flowdesigner/FDOpenCV/CvWebcam.cc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CvWebcam.cc 11 Jul 2007 14:25:57 -0000 1.1
--- CvWebcam.cc 22 Aug 2007 15:52:01 -0000 1.2
***************
*** 26,31 ****
* @output_name VIDEO
* @output_description The loaded video data structure
! * @output_type CvVideo
! *
END*/
--- 26,31 ----
* @output_name VIDEO
* @output_description The loaded video data structure
! * @output_type CvVideo
! *
END*/
Index: CvRectangle.cc
===================================================================
RCS file: /cvsroot/flowdesigner/FDOpenCV/CvRectangle.cc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** CvRectangle.cc 10 Jul 2007 15:34:07 -0000 1.4
--- CvRectangle.cc 22 Aug 2007 15:52:00 -0000 1.5
***************
*** 24,28 ****
* @input_description the BGR color of the rectangle
* @input_type CvColor
! *
* @parameter_name X1
* @parameter_type int
--- 24,28 ----
* @input_description the BGR color of the rectangle
* @input_type CvColor
! *
* @parameter_name X1
* @parameter_type int
***************
*** 49,67 ****
* @parameter_value -1
* @parameter_description Thickness of lines that make up the rectangle. Negative values, make the function to draw a filled rectangle
! *
* @parameter_name LINE_TYPE
* @parameter_type string
* @parameter_value 8;4;CV_AA
* @parameter_description Type of the contour segments
! *
* @parameter_name SHIFT
* @parameter_type int
* @parameter_value 0
* @parameter_description Number of fractional bits in the point coordinates
! *
* @output_name IMAGEOUT
* @output_description The result image
! * @output_type CvImage
! *
END*/
inline std::string CINT(int value)
--- 49,67 ----
* @parameter_value -1
* @parameter_description Thickness of lines that make up the rectangle. Negative values, make the function to draw a filled rectangle
! *
* @parameter_name LINE_TYPE
* @parameter_type string
* @parameter_value 8;4;CV_AA
* @parameter_description Type of the contour segments
! *
* @parameter_name SHIFT
* @parameter_type int
* @parameter_value 0
* @parameter_description Number of fractional bits in the point coordinates
! *
* @output_name IMAGEOUT
* @output_description The result image
! * @output_type CvImage
! *
END*/
inline std::string CINT(int value)
Index: CvErode.cc
===================================================================
RCS file: /cvsroot/flowdesigner/FDOpenCV/CvErode.cc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** CvErode.cc 6 Aug 2007 19:22:04 -0000 1.4
--- CvErode.cc 22 Aug 2007 15:52:00 -0000 1.5
***************
*** 24,28 ****
* @input_description Input element
* @input_type CvStructuringElement
! *
* @output_name IMAGEOUT
* @output_description Output image
--- 24,28 ----
* @input_description Input element
* @input_type CvStructuringElement
! *
* @output_name IMAGEOUT
* @output_description Output image
Index: CvPrevHierarchy.cc
===================================================================
RCS file: /cvsroot/flowdesigner/FDOpenCV/CvPrevHierarchy.cc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** CvPrevHierarchy.cc 11 Jul 2007 17:51:34 -0000 1.3
--- CvPrevHierarchy.cc 22 Aug 2007 15:52:00 -0000 1.4
***************
*** 22,35 ****
* @output_name CONTOURSOUT
* @output_description The result contour
! * @output_type CvContours
*
* @output_name BOOL
* @output_description True if the previous hierarchy exist. If false, the first contour is return
! * @output_type bool
*
* @output_name NBELEMENTS
* @output_description Number of elements in the selected contour
! * @output_type int
! *
END*/
--- 22,35 ----
* @output_name CONTOURSOUT
* @output_description The result contour
! * @output_type CvContours
*
* @output_name BOOL
* @output_description True if the previous hierarchy exist. If false, the first contour is return
! * @output_type bool
*
* @output_name NBELEMENTS
* @output_description Number of elements in the selected contour
! * @output_type int
! *
END*/
Index: CvQueryFrame.cc
===================================================================
RCS file: /cvsroot/flowdesigner/FDOpenCV/CvQueryFrame.cc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** CvQueryFrame.cc 6 Aug 2007 20:28:27 -0000 1.4
--- CvQueryFrame.cc 22 Aug 2007 15:52:00 -0000 1.5
***************
*** 20,31 ****
* @input_description Video capturing structure
* @input_type CvVideo
! *
* @output_name IMAGE
* @output_description The result image
! * @output_type CvImage
*
* @output_name BOOL
* @output_description True if the video isn't finish
! * @output_type bool
*
END*/
--- 20,31 ----
* @input_description Video capturing structure
* @input_type CvVideo
! *
* @output_name IMAGE
* @output_description The result image
! * @output_type CvImage
*
* @output_name BOOL
* @output_description True if the video isn't finish
! * @output_type bool
*
END*/
Index: CvOpticalFlowLK.cc
===================================================================
RCS file: /cvsroot/flowdesigner/FDOpenCV/CvOpticalFlowLK.cc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CvOpticalFlowLK.cc 6 Aug 2007 20:42:43 -0000 1.2
--- CvOpticalFlowLK.cc 22 Aug 2007 15:52:00 -0000 1.3
***************
*** 34,45 ****
* @parameter_value 3
* @parameter_description Size of the averaging window used for grouping pixels (height)
! *
* @output_name VEL_X
* @output_description Horizontal component of the optical flow
! * @output_type CvImage
! *
* @output_name VEL_Y
* @output_description Vertical component of the optical flow
! * @output_type CvImage
*
END*/
--- 34,45 ----
* @parameter_value 3
* @parameter_description Size of the averaging window used for grouping pixels (height)
! *
* @output_name VEL_X
* @output_description Horizontal component of the optical flow
! * @output_type CvImage
! *
* @output_name VEL_Y
* @output_description Vertical component of the optical flow
! * @output_type CvImage
*
END*/
Index: CvMorphology.cc
===================================================================
RCS file: /cvsroot/flowdesigner/FDOpenCV/CvMorphology.cc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** CvMorphology.cc 6 Aug 2007 19:22:04 -0000 1.4
--- CvMorphology.cc 22 Aug 2007 15:52:00 -0000 1.5
***************
*** 34,42 ****
* @parameter_value 1
* @parameter_description Number of times erosion and dilation are applied
! *
* @output_name IMAGEOUT
* @output_description Destination image
! * @output_type CvImage
! *
END*/
--- 34,42 ----
* @parameter_value 1
* @parameter_description Number of times erosion and dilation are applied
! *
* @output_name IMAGEOUT
* @output_description Destination image
! * @output_type CvImage
! *
END*/
Index: CvNextContour.cc
===================================================================
RCS file: /cvsroot/flowdesigner/FDOpenCV/CvNextContour.cc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** CvNextContour.cc 11 Jul 2007 17:51:34 -0000 1.3
--- CvNextContour.cc 22 Aug 2007 15:52:00 -0000 1.4
***************
*** 23,38 ****
* @input_description If true, no change
* @input_type bool
! *
* @output_name CONTOURSOUT
* @output_description The result contour
! * @output_type CvContours
*
* @output_name BOOL
* @output_description true if the next contour exist. If false, the first contour is return
! * @output_type bool
*
* @output_name NBELEMENTS
* @output_description Number of elements in the selected contour
! * @output_type int
*
END*/
--- 23,38 ----
* @input_description If true, no change
* @input_type bool
! *
* @output_name CONTOURSOUT
* @output_description The result contour
! * @output_type CvContours
*
* @output_name BOOL
* @output_description true if the next contour exist. If false, the first contour is return
! * @output_type bool
*
* @output_name NBELEMENTS
* @output_description Number of elements in the selected contour
! * @output_type int
*
END*/
Index: CvAvg.cc
===================================================================
RCS file: /cvsroot/flowdesigner/FDOpenCV/CvAvg.cc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** CvAvg.cc 6 Aug 2007 18:54:08 -0000 1.3
--- CvAvg.cc 22 Aug 2007 15:52:00 -0000 1.4
***************
*** 23,31 ****
* @output_description Average (mean) of the channel 1 of the image.
* @output_type float
! *
* @output_name AVG_2
* @output_description Average (mean) of the channel 2 of the image.
* @output_type float
! *
* @output_name AVG_3
* @output_description Average (mean) of the channel 3 of the image.
--- 23,31 ----
* @output_description Average (mean) of the channel 1 of the image.
* @output_type float
! *
* @output_name AVG_2
* @output_description Average (mean) of the channel 2 of the image.
* @output_type float
! *
* @output_name AVG_3
* @output_description Average (mean) of the channel 3 of the image.
Index: CvDrawContours.cc
===================================================================
RCS file: /cvsroot/flowdesigner/FDOpenCV/CvDrawContours.cc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** CvDrawContours.cc 10 Jul 2007 15:34:05 -0000 1.4
--- CvDrawContours.cc 22 Aug 2007 15:52:00 -0000 1.5
***************
*** 56,60 ****
* @output_name IMAGEOUT
* @output_description The result image
! * @output_type CvImage
*
END*/
--- 56,60 ----
* @output_name IMAGEOUT
* @output_description The result image
! * @output_type CvImage
*
END*/
Index: CvPrevContour.cc
===================================================================
RCS file: /cvsroot/flowdesigner/FDOpenCV/CvPrevContour.cc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** CvPrevContour.cc 11 Jul 2007 17:51:34 -0000 1.3
--- CvPrevContour.cc 22 Aug 2007 15:52:00 -0000 1.4
***************
*** 19,35 ****
* @input_description The contour to handle
* @input_type CvContours
! *
* @output_name CONTOURSOUT
* @output_description The result contour
! * @output_type CvContours
*
* @output_name BOOL
* @output_description True if the previous contour exist. If false, the first contour is return
! * @output_type bool
*
* @output_name NBELEMENTS
* @output_description Number of elements in the selected contour
! * @output_type int
! *
END*/
--- 19,35 ----
* @input_description The contour to handle
* @input_type CvContours
! *
* @output_name CONTOURSOUT
* @output_description The result contour
! * @output_type CvContours
*
* @output_name BOOL
* @output_description True if the previous contour exist. If false, the first contour is return
! * @output_type bool
*
* @output_name NBELEMENTS
* @output_description Number of elements in the selected contour
! * @output_type int
! *
END*/
Index: CvShowImageQt.cc
===================================================================
RCS file: /cvsroot/flowdesigner/FDOpenCV/CvShowImageQt.cc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CvShowImageQt.cc 7 Aug 2007 17:49:44 -0000 1.1
--- CvShowImageQt.cc 22 Aug 2007 15:52:00 -0000 1.2
***************
*** 30,34 ****
* @parameter_value 1
* @parameter_description If it is set to 1, window size is automatically adjusted to fit the displayed image, while user can not change the window size manually.
! *
* @output_name IMAGEOUT
* @output_description Same as input image
--- 30,34 ----
* @parameter_value 1
* @parameter_description If it is set to 1, window size is automatically adjusted to fit the displayed image, while user can not change the window size manually.
! *
* @output_name IMAGEOUT
* @output_description Same as input image
|
