aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/gui/EdgeView.cpp6
-rw-r--r--src/gui/EdgeView.hpp6
-rw-r--r--src/gui/MachinaCanvas.cpp2
-rw-r--r--src/gui/MachinaCanvas.hpp4
-rw-r--r--src/gui/MachinaGUI.cpp20
-rw-r--r--src/gui/NodeView.cpp4
-rw-r--r--src/gui/NodeView.hpp4
-rw-r--r--src/gui/wscript4
8 files changed, 25 insertions, 25 deletions
diff --git a/src/gui/EdgeView.cpp b/src/gui/EdgeView.cpp
index f7c154b..5f57be6 100644
--- a/src/gui/EdgeView.cpp
+++ b/src/gui/EdgeView.cpp
@@ -15,7 +15,7 @@
* along with Machina. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "flowcanvas/Canvas.hpp"
+#include "ganv/Canvas.hpp"
#include "machina/Controller.hpp"
#include "machina/types.hpp"
@@ -60,13 +60,13 @@ inline static uint32_t edge_color(float prob)
/* end probability colour stuff */
-using namespace FlowCanvas;
+using namespace Ganv;
EdgeView::EdgeView(Canvas& canvas,
SharedPtr<NodeView> src,
SharedPtr<NodeView> dst,
SharedPtr<Machina::Client::ClientObject> edge)
- : FlowCanvas::Edge(canvas, src.get(), dst.get(), 0x9FA0A0F4, true)
+ : Ganv::Edge(canvas, src.get(), dst.get(), 0x9FA0A0F4, true)
, _edge(edge)
{
set_color(edge_color(probability()));
diff --git a/src/gui/EdgeView.hpp b/src/gui/EdgeView.hpp
index 00f9bdb..bb9b478 100644
--- a/src/gui/EdgeView.hpp
+++ b/src/gui/EdgeView.hpp
@@ -18,7 +18,7 @@
#ifndef MACHINA_EDGEVIEW_HPP
#define MACHINA_EDGEVIEW_HPP
-#include "flowcanvas/Edge.hpp"
+#include "ganv/Edge.hpp"
#include "client/ClientObject.hpp"
@@ -27,10 +27,10 @@
class NodeView;
class EdgeView
- : public FlowCanvas::Edge
+ : public Ganv::Edge
, public Machina::Client::ClientObject::View {
public:
- EdgeView(FlowCanvas::Canvas& canvas,
+ EdgeView(Ganv::Canvas& canvas,
SharedPtr<NodeView> src,
SharedPtr<NodeView> dst,
SharedPtr<Machina::Client::ClientObject> edge);
diff --git a/src/gui/MachinaCanvas.cpp b/src/gui/MachinaCanvas.cpp
index b399af3..f8c88ac 100644
--- a/src/gui/MachinaCanvas.cpp
+++ b/src/gui/MachinaCanvas.cpp
@@ -32,7 +32,7 @@
#include "NodeView.hpp"
using namespace Raul;
-using namespace FlowCanvas;
+using namespace Ganv;
using namespace Machina;
MachinaCanvas::MachinaCanvas(MachinaGUI* app, int width, int height)
diff --git a/src/gui/MachinaCanvas.hpp b/src/gui/MachinaCanvas.hpp
index e4b19b1..7a80d33 100644
--- a/src/gui/MachinaCanvas.hpp
+++ b/src/gui/MachinaCanvas.hpp
@@ -21,9 +21,9 @@
#include <string>
#include "raul/SharedPtr.hpp"
#include "raul/WeakPtr.hpp"
-#include "flowcanvas/Canvas.hpp"
+#include "ganv/Canvas.hpp"
-using namespace FlowCanvas;
+using namespace Ganv;
class MachinaGUI;
class NodeView;
diff --git a/src/gui/MachinaGUI.cpp b/src/gui/MachinaGUI.cpp
index 7992111..6291399 100644
--- a/src/gui/MachinaGUI.cpp
+++ b/src/gui/MachinaGUI.cpp
@@ -225,11 +225,11 @@ MachinaGUI::idle_callback()
}
static void
-erase_node(FlowCanvasNode* node, void* data)
+erase_node(GanvNode* node, void* data)
{
Machina::Controller* controller = (Machina::Controller*)data;
NodeView* const view = dynamic_cast<NodeView*>(
- Glib::wrap(FLOW_CANVAS_NODE(node)));
+ Glib::wrap(GANV_NODE(node)));
if (view) {
controller->erase(view->node()->id());
//_engine->machine()->remove_node(view->node());
@@ -595,22 +595,22 @@ MachinaGUI::show_toolbar_toggled()
}
static void
-show_node_label(FlowCanvasNode* node, void* data)
+show_node_label(GanvNode* node, void* data)
{
- bool show = *(bool*)data;
- FlowCanvas::Node* nodemm = Glib::wrap(node);
- NodeView* const nv = dynamic_cast<NodeView*>(nodemm);
+ bool show = *(bool*)data;
+ Ganv::Node* nodemm = Glib::wrap(node);
+ NodeView* const nv = dynamic_cast<NodeView*>(nodemm);
if (nv) {
nv->show_label(show);
}
}
static void
-show_edge_label(FlowCanvasEdge* edge, void* data)
+show_edge_label(GanvEdge* edge, void* data)
{
- bool show = *(bool*)data;
- FlowCanvas::Edge* edgemm = Glib::wrap(edge);
- EdgeView* const ev = dynamic_cast<EdgeView*>(edgemm);
+ bool show = *(bool*)data;
+ Ganv::Edge* edgemm = Glib::wrap(edge);
+ EdgeView* const ev = dynamic_cast<EdgeView*>(edgemm);
if (ev) {
ev->show_label(show);
}
diff --git a/src/gui/NodeView.cpp b/src/gui/NodeView.cpp
index 66c090f..5e8ceb4 100644
--- a/src/gui/NodeView.cpp
+++ b/src/gui/NodeView.cpp
@@ -30,11 +30,11 @@ using namespace std;
using Machina::URIs;
NodeView::NodeView(Gtk::Window* window,
- FlowCanvas::Canvas& canvas,
+ Ganv::Canvas& canvas,
SharedPtr<Machina::Client::ClientObject> node,
double x,
double y)
- : FlowCanvas::Circle(canvas, "", x, y, 20, false)
+ : Ganv::Circle(canvas, "", x, y, 20, false)
, _window(window)
, _node(node)
, _default_border_color(get_border_color())
diff --git a/src/gui/NodeView.hpp b/src/gui/NodeView.hpp
index 3c00b66..ba87370 100644
--- a/src/gui/NodeView.hpp
+++ b/src/gui/NodeView.hpp
@@ -18,14 +18,14 @@
#ifndef MACHINA_NODEVIEW_HPP
#define MACHINA_NODEVIEW_HPP
-#include "flowcanvas/Circle.hpp"
+#include "ganv/Circle.hpp"
#include "client/ClientObject.hpp"
#include "machina/types.hpp"
class NodeView
- : public FlowCanvas::Circle
+ : public Ganv::Circle
, public Machina::Client::ClientObject::View {
public:
NodeView(Gtk::Window* window,
diff --git a/src/gui/wscript b/src/gui/wscript
index 5b664cd..3e1ecff 100644
--- a/src/gui/wscript
+++ b/src/gui/wscript
@@ -17,7 +17,7 @@ def build(bld):
obj.target = 'machina_gui'
obj.use = 'libmachina_engine libmachina_client'
autowaf.use_lib(bld, obj, '''
- FLOWCANVAS
+ GANV
GLADEMM
GLIBMM
GNOMECANVAS
@@ -39,4 +39,4 @@ def build(bld):
obj.includes = ['.', '../..', '../engine']
obj.defines = 'VERSION="' + bld.env['MACHINA_VERSION'] + '"'
obj.use = 'libmachina_engine libmachina_gui'
- autowaf.use_lib(bld, obj, 'GTHREAD GLIBMM SORD RAUL MACHINA EUGENE FLOWCANVAS')
+ autowaf.use_lib(bld, obj, 'GTHREAD GLIBMM SORD RAUL MACHINA EUGENE GANV')
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-23 09:07:51 +0000