|
|
Boost-Commit : |
From: stipe_at_[hidden]
Date: 2007-12-23 13:21:45
Author: srajko
Date: 2007-12-23 13:21:45 EST (Sun, 23 Dec 2007)
New Revision: 42263
URL: http://svn.boost.org/trac/boost/changeset/42263
Log:
blueprint_example works again, started fltk_gui example
Added:
sandbox/SOC/2007/signals/libs/dataflow/example/fltk_gui/
sandbox/SOC/2007/signals/libs/dataflow/example/fltk_gui/Jamfile.v2 (contents, props changed)
sandbox/SOC/2007/signals/libs/dataflow/example/fltk_gui/fltk_gui_example.cpp (contents, props changed)
Text files modified:
sandbox/SOC/2007/signals/libs/dataflow/build/xcodeide/signal_network.xcodeproj/project.pbxproj | 14 +++++++++++++-
sandbox/SOC/2007/signals/libs/dataflow/example/Jamfile.v2 | 1 +
sandbox/SOC/2007/signals/libs/dataflow/example/blueprint/blueprint_example.cpp | 10 +++++-----
3 files changed, 19 insertions(+), 6 deletions(-)
Modified: sandbox/SOC/2007/signals/libs/dataflow/build/xcodeide/signal_network.xcodeproj/project.pbxproj
==============================================================================
--- sandbox/SOC/2007/signals/libs/dataflow/build/xcodeide/signal_network.xcodeproj/project.pbxproj (original)
+++ sandbox/SOC/2007/signals/libs/dataflow/build/xcodeide/signal_network.xcodeproj/project.pbxproj 2007-12-23 13:21:45 EST (Sun, 23 Dec 2007)
@@ -107,6 +107,8 @@
08BD9B090CEB9E3D0069AFE2 /* port.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = port.hpp; sourceTree = "<group>"; };
08C3EEA20C625AE30074AB9E /* simple_example.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = simple_example.cpp; sourceTree = "<group>"; };
08C675970C13A03E00D85379 /* Jamfile.v2 */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = Jamfile.v2; sourceTree = "<group>"; };
+ 08D2C7330D1DDE5C008388D7 /* Jamfile.v2 */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Jamfile.v2; sourceTree = "<group>"; };
+ 08D2C7390D1DDEB8008388D7 /* fltk_gui_example.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = fltk_gui_example.cpp; sourceTree = "<group>"; };
08DC14FC0C951C4800B96B2E /* Cone.cxx */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = Cone.cxx; sourceTree = "<group>"; };
08EBA7590CFF8B6D0080E225 /* example.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = example.cpp; sourceTree = "<group>"; };
08EF045E0CEBF1AD002ABBBC /* port_t.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = port_t.hpp; sourceTree = "<group>"; };
@@ -268,6 +270,7 @@
0800AC2F0C8CA99700994538 /* VTK */ = {
isa = PBXGroup;
children = (
+ 0800AC300C8CA99700994538 /* Jamfile.v2 */,
08F2C31B0CAD961F00F9100C /* vtk_dataflow_support.hpp */,
08F2464B0CA86D85001C3D41 /* Cone2.cxx */,
08F2464C0CA86D85001C3D41 /* Cone3.cxx */,
@@ -275,7 +278,6 @@
08F2464E0CA86D85001C3D41 /* Cone5.cxx */,
08F2464F0CA86D85001C3D41 /* Cone6.cxx */,
08DC14FC0C951C4800B96B2E /* Cone.cxx */,
- 0800AC300C8CA99700994538 /* Jamfile.v2 */,
);
path = VTK;
sourceTree = "<group>";
@@ -307,6 +309,7 @@
08668C4F0C19A16300ACB19A /* Jamfile.v2 */,
08EBA7590CFF8B6D0080E225 /* example.cpp */,
08FFDD6E0CEB709A009318A8 /* blueprint */,
+ 08D2C7320D1DDE41008388D7 /* fltk_gui */,
08F98B3F0CD018E7009D642B /* signals */,
0800AC2F0C8CA99700994538 /* VTK */,
08EFED440C1CD55100097C80 /* timing_example.cpp */,
@@ -340,6 +343,15 @@
path = ../../test;
sourceTree = SOURCE_ROOT;
};
+ 08D2C7320D1DDE41008388D7 /* fltk_gui */ = {
+ isa = PBXGroup;
+ children = (
+ 08D2C7330D1DDE5C008388D7 /* Jamfile.v2 */,
+ 08D2C7390D1DDEB8008388D7 /* fltk_gui_example.cpp */,
+ );
+ path = fltk_gui;
+ sourceTree = "<group>";
+ };
08EF9B200C5D506A00D4D206 /* signals */ = {
isa = PBXGroup;
children = (
Modified: sandbox/SOC/2007/signals/libs/dataflow/example/Jamfile.v2
==============================================================================
--- sandbox/SOC/2007/signals/libs/dataflow/example/Jamfile.v2 (original)
+++ sandbox/SOC/2007/signals/libs/dataflow/example/Jamfile.v2 2007-12-23 13:21:45 EST (Sun, 23 Dec 2007)
@@ -6,6 +6,7 @@
build-project VTK ;
build-project signals ;
build-project blueprint ;
+build-project fltk_gui ;
project dataflow/example
: requirements
Modified: sandbox/SOC/2007/signals/libs/dataflow/example/blueprint/blueprint_example.cpp
==============================================================================
--- sandbox/SOC/2007/signals/libs/dataflow/example/blueprint/blueprint_example.cpp (original)
+++ sandbox/SOC/2007/signals/libs/dataflow/example/blueprint/blueprint_example.cpp 2007-12-23 13:21:45 EST (Sun, 23 Dec 2007)
@@ -59,7 +59,7 @@
print_connectability_info("source", source, 0, "sink_float", sink_float, 1);
std::cout << std::endl;
-/* // Make some connections
+ // Make some connections
std::cout << "Making blueprint connections: source to sink, source_float to sink_float..." << std::endl;
network.add_connection(source, 0, sink, 1);
network.add_connection(source_float, 0, sink_float, 1);
@@ -82,7 +82,7 @@
std::cout << "Testing the original network..." << std::endl << std::endl;
test_network(network);
std::cout << "Testing the network copy..." << std::endl << std::endl;
- test_network(network_copy);*/
+ test_network(network_copy);
}
void print_port_info(const char *c_name, network_type::component_type c)
{
@@ -112,11 +112,11 @@
<< "connectable to " << dst_name << " port " << dst_port << std::endl;
}
-/* template<typename T>
+ template<typename T>
void output_component_value(
network_type &network, const char *c_name, typename network_type::component_type c)
{
- blueprint::component_t<signals::storage<void(T)> > value;
+ blueprint::component_t<signals::storage<void(T)>, df::signals::tag> value;
blueprint::extract(network[c].get_port(2), value.get_port(1));
std::cout << "\t\tvalue at " << c_name << ":"
@@ -150,7 +150,7 @@
// Output the values at the sinks:
output_component_values(network);
- }*/
+ }
};
int main()
Added: sandbox/SOC/2007/signals/libs/dataflow/example/fltk_gui/Jamfile.v2
==============================================================================
--- (empty file)
+++ sandbox/SOC/2007/signals/libs/dataflow/example/fltk_gui/Jamfile.v2 2007-12-23 13:21:45 EST (Sun, 23 Dec 2007)
@@ -0,0 +1,17 @@
+# Copyright 2007 Stjepan Rajko.
+# Distributed under the Boost Software License, Version 1.0. (See
+# accompanying file LICENSE_1_0.txt or copy at
+# http://www.boost.org/LICENSE_1_0.txt)
+
+lib fltk : : <name>fltk2 ;
+
+project dataflow/example/blueprint
+ : requirements
+ <include>../../../..
+ <library>/boost/signals//boost_signals/<link>static
+ <library>fltk
+ <define>BOOST_ALL_NO_LIB=1
+ <toolset>darwin:<linkflags>"-framework Carbon"
+ ;
+
+exe fltk_gui_example : fltk_gui_example.cpp ;
Added: sandbox/SOC/2007/signals/libs/dataflow/example/fltk_gui/fltk_gui_example.cpp
==============================================================================
--- (empty file)
+++ sandbox/SOC/2007/signals/libs/dataflow/example/fltk_gui/fltk_gui_example.cpp 2007-12-23 13:21:45 EST (Sun, 23 Dec 2007)
@@ -0,0 +1,32 @@
+// Copyright 2007 Stjepan Rajko.
+// Distributed under the Boost Software License, Version 1.0. (See
+// accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
+#include <fltk/Window.h>
+#include <fltk/run.h>
+#include <boost/dataflow/blueprint/network.hpp>
+
+#include <memory>
+
+class BlueprintWindow : public fltk::Window
+{
+ BlueprintWindow(int width, int height, const char *label = 0)
+ : fltk::Window(width, height, label)
+ {}
+};
+
+class BlueprintComponent : public fltk::Group
+{
+
+};
+
+int main()
+{
+ std::auto_ptr<fltk::Window> window(new fltk::Window(100, 100));
+
+ window->show();
+
+ fltk::run();
+}
+
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk