making intensity segmenter

1 files changed, 46 insertions, 44 deletions

diff --git a/rotord/src/rotor.cpp b/rotord/src/rotor.cpp
index d3a5486..a4ef055 100644
--- a/rotord/src/rotor.cpp
+++ b/rotord/src/rotor.cpp
@@ -19,60 +19,61 @@ Node_factory::Node_factory(){
 	//this can be hard coded also
 	
 	//
-	category["signals"]=vector<Node*>();
-	add_type("time",new Time(),category["signals"]);
-	add_type("track_time",new Track_time(),category["signals"]);
-	add_type("at_track_time",new At_track_time(),category["signals"]);
+	category["Signals"]=vector<Node*>();
+	add_type("time",new Time(),category["Signals"]);
+	add_type("track_time",new Track_time(),category["Signals"]);
+	add_type("at_track_time",new At_track_time(),category["Signals"]);
 	//
 	add_type("signal_output",new Signal_output());
 	add_type("testcard",new Testcard());
 	//
-	category["channels"]=vector<Node*>();
-	add_type("invert",new Invert(),category["channels"]);
-	add_type("monochrome",new Monochrome(),category["channels"]);
-	add_type("blend",new Blend(),category["channels"]);
-	add_type("image_arithmetic",new Image_arithmetic(),category["channels"]);
-	add_type("alpha_merge",new Alpha_merge(),category["channels"]);
-	add_type("difference_matte",new Difference_matte(),category["channels"]);
-	add_type("rgb_levels",new RGB_levels(),category["channels"]);
-	add_type("luma_levels",new Luma_levels(),category["channels"]);
+	category["Channels"]=vector<Node*>();
+	add_type("invert",new Invert(),category["Channels"]);
+	add_type("monochrome",new Monochrome(),category["Channels"]);
+	add_type("blend",new Blend(),category["Channels"]);
+	add_type("image_arithmetic",new Image_arithmetic(),category["Channels"]);
+	add_type("alpha_merge",new Alpha_merge(),category["Channels"]);
+	add_type("difference_matte",new Difference_matte(),category["Channels"]);
+	add_type("rgb_levels",new RGB_levels(),category["Channels"]);
+	add_type("luma_levels",new Luma_levels(),category["Channels"]);
 	
-	category["source"]=vector<Node*>();
-	add_type("signal_colour",new Signal_colour(),category["source"]);
-	add_type("signal_greyscale",new Signal_greyscale(),category["source"]);
-	add_type("shape",new Shape(),category["source"]);
-	add_type("text",new Text(),category["source"]);
-	add_type("waves",new Waves(),category["source"]);
-	add_type("still_image",new Still_image(),category["source"]);
-	add_type("video_loader",new Video_loader(),category["source"]);
-	add_type("svg",new Svg(),category["source"]);
+	category["Source"]=vector<Node*>();
+	add_type("signal_colour",new Signal_colour(),category["Source"]);
+	add_type("signal_greyscale",new Signal_greyscale(),category["Source"]);
+	add_type("shape",new Shape(),category["Source"]);
+	add_type("text",new Text(),category["Source"]);
+	add_type("waves",new Waves(),category["Source"]);
+	add_type("still_image",new Still_image(),category["Source"]);
+	add_type("video_loader",new Video_loader(),category["Source"]);
+	add_type("svg",new Svg(),category["Source"]);
 	
-	category["distort"]=vector<Node*>();
-	add_type("mirror",new Mirror(),category["distort"]);
-	add_type("transform",new Transform(),category["distort"]);
+	category["Distort"]=vector<Node*>();
+	add_type("mirror",new Mirror(),category["Distort"]);
+	add_type("transform",new Transform(),category["Distort"]);
 
-	category["editing"]=vector<Node*>();
-	add_type("video_cycler",new Video_cycler(),category["editing"]);
-	add_type("video_output",new Video_output(),category["editing"]);
-	add_type("act_segmenter",new Act_segmenter(),category["editing"]);
+	category["Editing"]=vector<Node*>();
+	add_type("video_cycler",new Video_cycler(),category["Editing"]);
+	add_type("video_output",new Video_output(),category["Editing"]);
+	add_type("act_segmenter",new Act_segmenter(),category["Editing"]);
 	
-	category["audio"]=vector<Node*>();
-	add_type("audio_analysis",new Audio_analysis(),category["audio"]);
-	add_type("audio_analysis2",new Audio_analysis2(),category["audio"]);
+	category["Audio"]=vector<Node*>();
+	add_type("audio_analysis",new Audio_analysis(),category["Audio"]);
+	add_type("audio_analysis2",new Audio_analysis2(),category["Audio"]);
+	add_type("intensity_segmenter",new Intensity_segmenter(),category["Audio"]);
 	
-	category["maths"]=vector<Node*>();
-	add_type("comparison",new Comparison(),category["maths"]); //TODO: alias to symbols
-	add_type("arithmetic",new Arithmetic(),category["maths"]); //TODO: alias to symbols
-	add_type("bang",new Is_new_integer(),category["maths"]);
-	add_type("on_off",new On_off(),category["maths"]);
-	add_type("random",new Random(),category["maths"]);
-	add_type("noise",new Noise(),category["maths"]);
+	category["Maths"]=vector<Node*>();
+	add_type("comparison",new Comparison(),category["Maths"]); //TODO: alias to symbols
+	add_type("arithmetic",new Arithmetic(),category["Maths"]); //TODO: alias to symbols
+	add_type("bang",new Is_new_integer(),category["Maths"]);
+	add_type("on_off",new On_off(),category["Maths"]);
+	add_type("random",new Random(),category["Maths"]);
+	add_type("noise",new Noise(),category["Maths"]);
 
-	category["fx"]=vector<Node*>();
-	add_type("blur",new Blur(),category["fx"]);
-	add_type("vhs",new VHS(),category["fx"]);
-	add_type("echo_trails",new Echo_trails(),category["fx"]);
-	add_type("video_feedback",new Video_feedback(),category["fx"]);
+	category["FX"]=vector<Node*>();
+	add_type("blur",new Blur(),category["FX"]);
+	add_type("vhs",new VHS(),category["FX"]);
+	add_type("echo_trails",new Echo_trails(),category["FX"]);
+	add_type("video_feedback",new Video_feedback(),category["FX"]);
 
 }
 bool Signal_input::connect(Node* source) {
@@ -209,6 +210,7 @@ void Node_factory::list_categories(Json::Value &JSON){
 		category["name"]=_category.first;
 		category["nodes"]=Json::arrayValue;
 		for (auto& _node: _category.second){
+			cerr<<"Adding "<<_category.first<<":"<<_node->type<<endl;
 			Json::Value node;
 			node["type"]=_node->type;
 			node["title"]=_node->title;