p
/
logdiag
1
1
Fork 0
Code Issues Pull Requests Releases 4 Wiki Activity
logdiag/liblogdiag/ld-diagram-view.c

2910 lines
72 KiB
C
Raw Permalink Normal View History

Started implementing the canvas and the document.
2010-09-17 18:48:02 +02:00
/*
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
* ld-diagram-view.c
Started implementing the canvas and the document.
2010-09-17 18:48:02 +02:00
*
* This file is a part of logdiag.
Fix and update LICENSE
2017-02-03 23:06:48 +01:00
* Copyright Přemysl Janouch 2010, 2011, 2012
Started implementing the canvas and the document.
2010-09-17 18:48:02 +02:00
*
* See the file LICENSE for licensing information.
*
*/
Implement more of LdCanvas. 1. Add methods for coordinate translation between cairo/GtkWidget coordinates and LdDocument coordinates. 2. Draw the grid correctly (also make it significantly faster). 3. Place the canvas into a GtkScrolledWindow and register the set_scroll_adjustments signal in the GtkWidget base class. 4. Allow scrolling inside of an area of 200 x 200 units (for now). In the future, it should be possible to go to infinity.
2010-12-07 00:59:05 +01:00
#include <math.h>
Simulate motion events when needed.
2011-01-10 04:24:16 +01:00
#include <string.h>
Make adding symbols to the diagram possible. This required creating a simple framework for operations to LdCanvas. It is probable that it's going to require some changes when other operations are added. The basic idea behind it seems to be good, though.
2011-01-04 09:54:05 +01:00
#include <gdk/gdkkeysyms.h>
Started implementing the canvas and the document.
2010-09-17 18:48:02 +02:00
Use a central header. $ time (make clean; make) Before: ~8.0 seconds After: ~8.1 seconds
2011-01-10 11:20:14 +01:00
#include "liblogdiag.h"
Started implementing the canvas and the document.
2010-09-17 18:48:02 +02:00
#include "config.h"
/**
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
* SECTION:ld-diagram-view
Fix gtk-doc comments.
2011-02-20 13:39:44 +01:00
* @short_description: A widget that displays diagrams
Rename LdDocument* to LdDiagram*. My bad; this name is much more appropriate.
2010-12-16 11:34:02 +01:00
* @see_also: #LdDiagram
Started implementing the canvas and the document.
2010-09-17 18:48:02 +02:00
*
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
* #LdDiagramView displays and enables the user to manipulate with
* an #LdDiagram.
Started implementing the canvas and the document.
2010-09-17 18:48:02 +02:00
*/
Implement more of LdCanvas. 1. Add methods for coordinate translation between cairo/GtkWidget coordinates and LdDocument coordinates. 2. Draw the grid correctly (also make it significantly faster). 3. Place the canvas into a GtkScrolledWindow and register the set_scroll_adjustments signal in the GtkWidget base class. 4. Allow scrolling inside of an area of 200 x 200 units (for now). In the future, it should be possible to go to infinity.
2010-12-07 00:59:05 +01:00
/* Milimetres per inch. */
#define MM_PER_INCH 25.4
Refactor queue_object_redraw().
2011-01-09 04:39:05 +01:00
/* The default screen resolution in DPI units. */
#define DEFAULT_SCREEN_RESOLUTION 96
Implement more of LdCanvas. 1. Add methods for coordinate translation between cairo/GtkWidget coordinates and LdDocument coordinates. 2. Draw the grid correctly (also make it significantly faster). 3. Place the canvas into a GtkScrolledWindow and register the set_scroll_adjustments signal in the GtkWidget base class. 4. Allow scrolling inside of an area of 200 x 200 units (for now). In the future, it should be possible to go to infinity.
2010-12-07 00:59:05 +01:00
Add a "zoom" property to LdCanvas.
2011-01-09 08:15:47 +01:00
/* The maximal, minimal and default values of zoom. */
#define ZOOM_MIN 0.01
#define ZOOM_MAX 100
#define ZOOM_DEFAULT 1
Implement zooming in LdWindowMain. Add convenience methods to LdCanvas.
2011-02-04 20:19:01 +01:00
/* Multiplication factor for zooming. */
#define ZOOM_STEP 1.4
Add a "zoom" property to LdCanvas.
2011-01-09 08:15:47 +01:00
Fix comments.
2011-01-09 06:46:48 +01:00
/* When drawing is requested, extend all sides of
Refactor queue_object_redraw().
2011-01-09 04:39:05 +01:00
* the rectangle to be drawn by this number of pixels.
*/
#define QUEUE_DRAW_EXTEND 3
/* Cursor tolerance for object borders. */
Allow object selection in LdCanvas. Refactor a part of LdCanvas in the process.
2011-01-07 04:52:44 +01:00
#define OBJECT_BORDER_TOLERANCE 3
Draw symbols from LdDocument in LdCanvas. Just the minimal implementation so far.
2010-12-10 22:44:12 +01:00
/* Tolerance on all sides of symbols for strokes. */
Allow object selection in LdCanvas. Refactor a part of LdCanvas in the process.
2011-01-07 04:52:44 +01:00
#define SYMBOL_CLIP_TOLERANCE 5
Draw symbols from LdDocument in LdCanvas. Just the minimal implementation so far.
2010-12-10 22:44:12 +01:00
Highlight symbol terminals on mouse hover.
2011-01-09 04:50:58 +01:00
/* Size of a highlighted terminal. */
#define TERMINAL_RADIUS 5
/* Tolerance around terminal points. */
#define TERMINAL_HOVER_TOLERANCE 8
Make adding symbols to the diagram possible. This required creating a simple framework for operations to LdCanvas. It is probable that it's going to require some changes when other operations are added. The basic idea behind it seems to be good, though.
2011-01-04 09:54:05 +01:00
/*
* OperationEnd:
*
* Called upon ending an operation.
*/
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
typedef void (*OperationEnd) (LdDiagramView *self);
Make adding symbols to the diagram possible. This required creating a simple framework for operations to LdCanvas. It is probable that it's going to require some changes when other operations are added. The basic idea behind it seems to be good, though.
2011-01-04 09:54:05 +01:00
Move lines around. No functional change.
2011-01-04 14:52:57 +01:00
enum
Make adding symbols to the diagram possible. This required creating a simple framework for operations to LdCanvas. It is probable that it's going to require some changes when other operations are added. The basic idea behind it seems to be good, though.
2011-01-04 09:54:05 +01:00
{
Move lines around. No functional change.
2011-01-04 14:52:57 +01:00
OPER_0,
Add scrolling using the middle mouse button. A bit of refactoring, too.
2011-06-09 13:54:37 +02:00
OPER_MOVE_VIEW,
Refactor ld-canvas.c, extend LdCanvas operations. Now objects can be selected and moved by dragging the mouse.
2011-02-05 16:36:04 +01:00
OPER_ADD_OBJECT,
Add support for LdDiagramConnection to LdCanvas. Heavy LdCanvas refactoring, some modifications to ld-types. It just wasn't possible for me to further work with an old, 2000 lines long file without shuffling everything around at the same time.
2011-02-07 01:10:17 +01:00
OPER_CONNECT,
Refactor ld-canvas.c, extend LdCanvas operations. Now objects can be selected and moved by dragging the mouse.
2011-02-05 16:36:04 +01:00
OPER_SELECT,
OPER_MOVE_SELECTION
Make adding symbols to the diagram possible. This required creating a simple framework for operations to LdCanvas. It is probable that it's going to require some changes when other operations are added. The basic idea behind it seems to be good, though.
2011-01-04 09:54:05 +01:00
};
Add scrolling using the middle mouse button. A bit of refactoring, too.
2011-06-09 13:54:37 +02:00
typedef struct
{
LdPoint last_pos;
}
MoveViewData;
Use "typedef struct" in ld-diagram-view.c.
2011-02-19 22:08:08 +01:00
typedef struct
Move lines around. No functional change.
2011-01-04 14:52:57 +01:00
{
LdDiagramObject *object;
gboolean visible;
Use "typedef struct" in ld-diagram-view.c.
2011-02-19 22:08:08 +01:00
}
AddObjectData;
Make adding symbols to the diagram possible. This required creating a simple framework for operations to LdCanvas. It is probable that it's going to require some changes when other operations are added. The basic idea behind it seems to be good, though.
2011-01-04 09:54:05 +01:00
Use "typedef struct" in ld-diagram-view.c.
2011-02-19 22:08:08 +01:00
typedef struct
Add support for LdDiagramConnection to LdCanvas. Heavy LdCanvas refactoring, some modifications to ld-types. It just wasn't possible for me to further work with an old, 2000 lines long file without shuffling everything around at the same time.
2011-02-07 01:10:17 +01:00
{
LdDiagramConnection *connection;
LdPoint origin;
Use "typedef struct" in ld-diagram-view.c.
2011-02-19 22:08:08 +01:00
}
ConnectData;
Add support for LdDiagramConnection to LdCanvas. Heavy LdCanvas refactoring, some modifications to ld-types. It just wasn't possible for me to further work with an old, 2000 lines long file without shuffling everything around at the same time.
2011-02-07 01:10:17 +01:00
Use "typedef struct" in ld-diagram-view.c.
2011-02-19 22:08:08 +01:00
typedef struct
Refactor ld-canvas.c, extend LdCanvas operations. Now objects can be selected and moved by dragging the mouse.
2011-02-05 16:36:04 +01:00
{
LdPoint drag_last_pos;
Use "typedef struct" in ld-diagram-view.c.
2011-02-19 22:08:08 +01:00
}
SelectData;
Refactor ld-canvas.c, extend LdCanvas operations. Now objects can be selected and moved by dragging the mouse.
2011-02-05 16:36:04 +01:00
Use "typedef struct" in ld-diagram-view.c.
2011-02-19 22:08:08 +01:00
typedef struct
Refactor ld-canvas.c, extend LdCanvas operations. Now objects can be selected and moved by dragging the mouse.
2011-02-05 16:36:04 +01:00
{
LdPoint move_origin;
Use "typedef struct" in ld-diagram-view.c.
2011-02-19 22:08:08 +01:00
}
MoveSelectionData;
Refactor ld-canvas.c, extend LdCanvas operations. Now objects can be selected and moved by dragging the mouse.
2011-02-05 16:36:04 +01:00
Draw selected objects with another color. Store all colors in LdCanvasPrivate and initialize them upon object creation. This creates a base for color themes. Make attempts to try adding an object that's not a part of the document to the selection issue a warning.
2011-01-05 01:11:03 +01:00
enum
{
COLOR_BASE,
COLOR_GRID,
COLOR_OBJECT,
COLOR_SELECTION,
Highlight symbol terminals on mouse hover.
2011-01-09 04:50:58 +01:00
COLOR_TERMINAL,
Draw selected objects with another color. Store all colors in LdCanvasPrivate and initialize them upon object creation. This creates a base for color themes. Make attempts to try adding an object that's not a part of the document to the selection issue a warning.
2011-01-05 01:11:03 +01:00
COLOR_COUNT
};
Use "typedef struct" in ld-diagram-view.c.
2011-02-19 22:08:08 +01:00
typedef struct
Draw selected objects with another color. Store all colors in LdCanvasPrivate and initialize them upon object creation. This creates a base for color themes. Make attempts to try adding an object that's not a part of the document to the selection issue a warning.
2011-01-05 01:11:03 +01:00
{
gdouble r;
gdouble g;
gdouble b;
gdouble a;
Use "typedef struct" in ld-diagram-view.c.
2011-02-19 22:08:08 +01:00
}
Color;
Draw selected objects with another color. Store all colors in LdCanvasPrivate and initialize them upon object creation. This creates a base for color themes. Make attempts to try adding an object that's not a part of the document to the selection issue a warning.
2011-01-05 01:11:03 +01:00
Started implementing the canvas and the document.
2010-09-17 18:48:02 +02:00
/*
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
* LdDiagramViewPrivate:
* @diagram: a diagram object assigned as a model.
* @library: a library object assigned as a model.
Fix program messages and gtk-doc comments.
2011-01-28 17:39:40 +01:00
* @adjustment_h: an adjustment object for the horizontal axis, if any.
* @adjustment_v: an adjustment object for the vertical axis, if any.
* @x: the X coordinate of the center of view.
* @y: the Y coordinate of the center of view.
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
* @zoom: the current zoom.
Add API for turning off the grid.
2011-03-06 15:56:41 +01:00
* @show_grid: whether to show the grid.
Add drag and drop support for symbols.
2012-10-07 08:34:32 +02:00
* @dnd_symbol: currently dragged symbol.
* @dnd_last_position: last cursor movement position.
* @dnd_left: whether the user has stopped dragging.
Refactor ld-canvas.c, extend LdCanvas operations. Now objects can be selected and moved by dragging the mouse.
2011-02-05 16:36:04 +01:00
* @terminal: position of the highlighted terminal.
Add support for LdDiagramConnection to LdCanvas. Heavy LdCanvas refactoring, some modifications to ld-types. It just wasn't possible for me to further work with an old, 2000 lines long file without shuffling everything around at the same time.
2011-02-07 01:10:17 +01:00
* @terminal_hovered: whether a terminal is hovered.
Refactor ld-canvas.c, extend LdCanvas operations. Now objects can be selected and moved by dragging the mouse.
2011-02-05 16:36:04 +01:00
* @drag_start_pos: position of the mouse pointer when dragging started.
* @drag_operation: the operation to start when dragging starts.
Fix motion simulation
2015-01-20 09:07:58 +01:00
* @simulation_lock: prevents endless looping of simulate_motion()
Fix program messages and gtk-doc comments.
2011-01-28 17:39:40 +01:00
* @operation: the current operation.
* @operation_data: data related to the current operation.
* @operation_end: a callback to end the operation.
* @palette: colors used by the widget.
Started implementing the canvas and the document.
2010-09-17 18:48:02 +02:00
*/
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
struct _LdDiagramViewPrivate
Started implementing the canvas and the document.
2010-09-17 18:48:02 +02:00
{
Rename LdDocument* to LdDiagram*. My bad; this name is much more appropriate.
2010-12-16 11:34:02 +01:00
LdDiagram *diagram;
Add a "library" property to LdCanvas. Also make the code reference properties properly.
2010-11-19 07:05:44 +01:00
LdLibrary *library;
Implement more of LdCanvas. 1. Add methods for coordinate translation between cairo/GtkWidget coordinates and LdDocument coordinates. 2. Draw the grid correctly (also make it significantly faster). 3. Place the canvas into a GtkScrolledWindow and register the set_scroll_adjustments signal in the GtkWidget base class. 4. Allow scrolling inside of an area of 200 x 200 units (for now). In the future, it should be possible to go to infinity.
2010-12-07 00:59:05 +01:00
GtkAdjustment *adjustment_h;
GtkAdjustment *adjustment_v;
GTK+ 3: Fix compilation, scrolling, drawing
2015-01-19 02:23:20 +01:00
GtkScrollablePolicy adjustment_policy_h;
GtkScrollablePolicy adjustment_policy_v;
Implement more of LdCanvas. 1. Add methods for coordinate translation between cairo/GtkWidget coordinates and LdDocument coordinates. 2. Draw the grid correctly (also make it significantly faster). 3. Place the canvas into a GtkScrolledWindow and register the set_scroll_adjustments signal in the GtkWidget base class. 4. Allow scrolling inside of an area of 200 x 200 units (for now). In the future, it should be possible to go to infinity.
2010-12-07 00:59:05 +01:00
gdouble x;
gdouble y;
gdouble zoom;
Make adding symbols to the diagram possible. This required creating a simple framework for operations to LdCanvas. It is probable that it's going to require some changes when other operations are added. The basic idea behind it seems to be good, though.
2011-01-04 09:54:05 +01:00
Add API for turning off the grid.
2011-03-06 15:56:41 +01:00
gboolean show_grid;
Add drag and drop support for symbols.
2012-10-07 08:34:32 +02:00
LdDiagramObject *dnd_symbol;
LdPoint dnd_last_position;
guint dnd_left : 1;
Highlight symbol terminals on mouse hover.
2011-01-09 04:50:58 +01:00
LdPoint terminal;
Add support for LdDiagramConnection to LdCanvas. Heavy LdCanvas refactoring, some modifications to ld-types. It just wasn't possible for me to further work with an old, 2000 lines long file without shuffling everything around at the same time.
2011-02-07 01:10:17 +01:00
gboolean terminal_hovered;
Highlight symbol terminals on mouse hover.
2011-01-09 04:50:58 +01:00
Refactor ld-canvas.c, extend LdCanvas operations. Now objects can be selected and moved by dragging the mouse.
2011-02-05 16:36:04 +01:00
LdPoint drag_start_pos;
gint drag_operation;
Fix motion simulation
2015-01-20 09:07:58 +01:00
gboolean simulation_lock;
Make adding symbols to the diagram possible. This required creating a simple framework for operations to LdCanvas. It is probable that it's going to require some changes when other operations are added. The basic idea behind it seems to be good, though.
2011-01-04 09:54:05 +01:00
gint operation;
union
{
Add scrolling using the middle mouse button. A bit of refactoring, too.
2011-06-09 13:54:37 +02:00
MoveViewData move_view;
Make adding symbols to the diagram possible. This required creating a simple framework for operations to LdCanvas. It is probable that it's going to require some changes when other operations are added. The basic idea behind it seems to be good, though.
2011-01-04 09:54:05 +01:00
AddObjectData add_object;
Add support for LdDiagramConnection to LdCanvas. Heavy LdCanvas refactoring, some modifications to ld-types. It just wasn't possible for me to further work with an old, 2000 lines long file without shuffling everything around at the same time.
2011-02-07 01:10:17 +01:00
ConnectData connect;
Refactor ld-canvas.c, extend LdCanvas operations. Now objects can be selected and moved by dragging the mouse.
2011-02-05 16:36:04 +01:00
SelectData select;
MoveSelectionData move_selection;
Make adding symbols to the diagram possible. This required creating a simple framework for operations to LdCanvas. It is probable that it's going to require some changes when other operations are added. The basic idea behind it seems to be good, though.
2011-01-04 09:54:05 +01:00
}
operation_data;
Move lines around. No functional change.
2011-01-04 14:52:57 +01:00
OperationEnd operation_end;
Draw selected objects with another color. Store all colors in LdCanvasPrivate and initialize them upon object creation. This creates a base for color themes. Make attempts to try adding an object that's not a part of the document to the selection issue a warning.
2011-01-05 01:11:03 +01:00
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
Color palette[COLOR_COUNT];
Started implementing the canvas and the document.
2010-09-17 18:48:02 +02:00
};
Make adding symbols to the diagram possible. This required creating a simple framework for operations to LdCanvas. It is probable that it's going to require some changes when other operations are added. The basic idea behind it seems to be good, though.
2011-01-04 09:54:05 +01:00
#define OPER_DATA(self, member) ((self)->priv->operation_data.member)
Draw selected objects with another color. Store all colors in LdCanvasPrivate and initialize them upon object creation. This creates a base for color themes. Make attempts to try adding an object that's not a part of the document to the selection issue a warning.
2011-01-05 01:11:03 +01:00
#define COLOR_GET(self, name) (&(self)->priv->palette[name])
Make adding symbols to the diagram possible. This required creating a simple framework for operations to LdCanvas. It is probable that it's going to require some changes when other operations are added. The basic idea behind it seems to be good, though.
2011-01-04 09:54:05 +01:00
Implement more of LdCanvas. 1. Add methods for coordinate translation between cairo/GtkWidget coordinates and LdDocument coordinates. 2. Draw the grid correctly (also make it significantly faster). 3. Place the canvas into a GtkScrolledWindow and register the set_scroll_adjustments signal in the GtkWidget base class. 4. Allow scrolling inside of an area of 200 x 200 units (for now). In the future, it should be possible to go to infinity.
2010-12-07 00:59:05 +01:00
/*
* DrawData:
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
* @self: our #LdDiagramView.
Fix program messages and gtk-doc comments.
2011-01-28 17:39:40 +01:00
* @cr: a cairo context to draw on.
* @exposed_rect: the area that is to be redrawn.
* @scale: computed size of one diagram unit in pixels.
Implement more of LdCanvas. 1. Add methods for coordinate translation between cairo/GtkWidget coordinates and LdDocument coordinates. 2. Draw the grid correctly (also make it significantly faster). 3. Place the canvas into a GtkScrolledWindow and register the set_scroll_adjustments signal in the GtkWidget base class. 4. Allow scrolling inside of an area of 200 x 200 units (for now). In the future, it should be possible to go to infinity.
2010-12-07 00:59:05 +01:00
*/
Use "typedef struct" in ld-diagram-view.c.
2011-02-19 22:08:08 +01:00
typedef struct
Implement more of LdCanvas. 1. Add methods for coordinate translation between cairo/GtkWidget coordinates and LdDocument coordinates. 2. Draw the grid correctly (also make it significantly faster). 3. Place the canvas into a GtkScrolledWindow and register the set_scroll_adjustments signal in the GtkWidget base class. 4. Allow scrolling inside of an area of 200 x 200 units (for now). In the future, it should be possible to go to infinity.
2010-12-07 00:59:05 +01:00
{
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
LdDiagramView *self;
Implement more of LdCanvas. 1. Add methods for coordinate translation between cairo/GtkWidget coordinates and LdDocument coordinates. 2. Draw the grid correctly (also make it significantly faster). 3. Place the canvas into a GtkScrolledWindow and register the set_scroll_adjustments signal in the GtkWidget base class. 4. Allow scrolling inside of an area of 200 x 200 units (for now). In the future, it should be possible to go to infinity.
2010-12-07 00:59:05 +01:00
cairo_t *cr;
Introduce LdRectangle, LdPoint and LdPointArray. Remove LdCanvasRect and LdSymbolArea.
2011-01-08 06:44:40 +01:00
LdRectangle exposed_rect;
Implement more of LdCanvas. 1. Add methods for coordinate translation between cairo/GtkWidget coordinates and LdDocument coordinates. 2. Draw the grid correctly (also make it significantly faster). 3. Place the canvas into a GtkScrolledWindow and register the set_scroll_adjustments signal in the GtkWidget base class. 4. Allow scrolling inside of an area of 200 x 200 units (for now). In the future, it should be possible to go to infinity.
2010-12-07 00:59:05 +01:00
gdouble scale;
Use "typedef struct" in ld-diagram-view.c.
2011-02-19 22:08:08 +01:00
}
DrawData;
Started implementing the canvas and the document.
2010-09-17 18:48:02 +02:00
Also find terminals on ends of connections.
2011-02-19 22:15:11 +01:00
/*
* CheckTerminalsData:
*/
typedef struct
{
gboolean found;
gdouble distance;
LdPoint point;
LdPoint terminal;
}
CheckTerminalsData;
Move lines around. No functional change.
2011-01-04 14:52:57 +01:00
enum
{
PROP_0,
GTK+ 3: Fix compilation, scrolling, drawing
2015-01-19 02:23:20 +01:00
PROP_HADJUSTMENT,
PROP_VADJUSTMENT,
PROP_HSCROLL_POLICY,
PROP_VSCROLL_POLICY,
Move lines around. No functional change.
2011-01-04 14:52:57 +01:00
PROP_DIAGRAM,
Add a "zoom" property to LdCanvas.
2011-01-09 08:15:47 +01:00
PROP_LIBRARY,
Add "x" and "y" properties to LdDiagramView. Plus a bit of refactoring.
2011-02-19 14:04:52 +01:00
PROP_X,
PROP_Y,
Add a "zoom" property to LdCanvas.
2011-01-09 08:15:47 +01:00
PROP_ZOOM
Move lines around. No functional change.
2011-01-04 14:52:57 +01:00
};
Make adding symbols to the diagram possible. This required creating a simple framework for operations to LdCanvas. It is probable that it's going to require some changes when other operations are added. The basic idea behind it seems to be good, though.
2011-01-04 09:54:05 +01:00
GTK+ 3: Fix compilation, scrolling, drawing
2015-01-19 02:23:20 +01:00
static void ld_diagram_view_scrollable_init (GtkScrollableInterface *iface);
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
static void ld_diagram_view_get_property (GObject *object, guint property_id,
Implement more of LdCanvas. 1. Add methods for coordinate translation between cairo/GtkWidget coordinates and LdDocument coordinates. 2. Draw the grid correctly (also make it significantly faster). 3. Place the canvas into a GtkScrolledWindow and register the set_scroll_adjustments signal in the GtkWidget base class. 4. Allow scrolling inside of an area of 200 x 200 units (for now). In the future, it should be possible to go to infinity.
2010-12-07 00:59:05 +01:00
GValue *value, GParamSpec *pspec);
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
static void ld_diagram_view_set_property (GObject *object, guint property_id,
Implement more of LdCanvas. 1. Add methods for coordinate translation between cairo/GtkWidget coordinates and LdDocument coordinates. 2. Draw the grid correctly (also make it significantly faster). 3. Place the canvas into a GtkScrolledWindow and register the set_scroll_adjustments signal in the GtkWidget base class. 4. Allow scrolling inside of an area of 200 x 200 units (for now). In the future, it should be possible to go to infinity.
2010-12-07 00:59:05 +01:00
const GValue *value, GParamSpec *pspec);
Fix assertion failures on quitting
2018-06-25 03:51:38 +02:00
static void ld_diagram_view_dispose (GObject *gobject);
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
static void ld_diagram_view_finalize (GObject *gobject);
Started implementing the canvas and the document.
2010-09-17 18:48:02 +02:00
GTK+ 3: Fix compilation, scrolling, drawing
2015-01-19 02:23:20 +01:00
static void set_hadjustment
(LdDiagramView *self, GtkAdjustment *hadjustment);
static void set_vadjustment
(LdDiagramView *self, GtkAdjustment *vadjustment);
Partial refactoring of LdCanvas. draw_symbol() had been doing too much.
2011-01-04 00:45:44 +01:00
static void on_adjustment_value_changed
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
(GtkAdjustment *adjustment, LdDiagramView *self);
Partial refactoring of LdCanvas. draw_symbol() had been doing too much.
2011-01-04 00:45:44 +01:00
static void on_size_allocate (GtkWidget *widget, GtkAllocation *allocation,
gpointer user_data);
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
static void update_adjustments (LdDiagramView *self);
static void ld_diagram_view_real_move (LdDiagramView *self,
gdouble dx, gdouble dy);
Implemented a skeleton of LdCanvas. It now paints itself white and draws a simple grid. Also an LdDocument can be assigned to it.
2010-09-19 09:10:16 +02:00
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
static void diagram_connect_signals (LdDiagramView *self);
static void diagram_disconnect_signals (LdDiagramView *self);
Redraw LdCanvas on LdDiagram changes.
2011-01-05 11:03:38 +01:00
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
static gdouble ld_diagram_view_get_base_unit_in_px (GtkWidget *self);
static gdouble ld_diagram_view_get_scale_in_px (LdDiagramView *self);
Implemented a skeleton of LdCanvas. It now paints itself white and draws a simple grid. Also an LdDocument can be assigned to it.
2010-09-19 09:10:16 +02:00
Add support for LdDiagramConnection to LdCanvas. Heavy LdCanvas refactoring, some modifications to ld-types. It just wasn't possible for me to further work with an old, 2000 lines long file without shuffling everything around at the same time.
2011-02-07 01:10:17 +01:00
/* Helper functions. */
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
static void color_set (Color *color,
Draw selected objects with another color. Store all colors in LdCanvasPrivate and initialize them upon object creation. This creates a base for color themes. Make attempts to try adding an object that's not a part of the document to the selection issue a warning.
2011-01-05 01:11:03 +01:00
gdouble r, gdouble g, gdouble b, gdouble a);
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
static void color_apply (Color *color, cairo_t *cr);
static guint32 color_to_cairo_argb (Color *color);
Draw selected objects with another color. Store all colors in LdCanvasPrivate and initialize them upon object creation. This creates a base for color themes. Make attempts to try adding an object that's not a part of the document to the selection issue a warning.
2011-01-05 01:11:03 +01:00
Add support for LdDiagramConnection to LdCanvas. Heavy LdCanvas refactoring, some modifications to ld-types. It just wasn't possible for me to further work with an old, 2000 lines long file without shuffling everything around at the same time.
2011-02-07 01:10:17 +01:00
static gdouble point_to_line_segment_distance
(const LdPoint *point, const LdPoint *p1, const LdPoint *p2);
/* Generic functions. */
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
static gboolean object_hit_test (LdDiagramView *self,
Add support for LdDiagramConnection to LdCanvas. Heavy LdCanvas refactoring, some modifications to ld-types. It just wasn't possible for me to further work with an old, 2000 lines long file without shuffling everything around at the same time.
2011-02-07 01:10:17 +01:00
LdDiagramObject *object, const LdPoint *point);
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
static gboolean get_object_clip_area (LdDiagramView *self,
Add support for LdDiagramConnection to LdCanvas. Heavy LdCanvas refactoring, some modifications to ld-types. It just wasn't possible for me to further work with an old, 2000 lines long file without shuffling everything around at the same time.
2011-02-07 01:10:17 +01:00
LdDiagramObject *object, LdRectangle *rect);
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
static void move_object_to_point (LdDiagramView *self, LdDiagramObject *object,
Add support for LdDiagramConnection to LdCanvas. Heavy LdCanvas refactoring, some modifications to ld-types. It just wasn't possible for me to further work with an old, 2000 lines long file without shuffling everything around at the same time.
2011-02-07 01:10:17 +01:00
const LdPoint *point);
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
static LdDiagramObject *get_object_at_point (LdDiagramView *self,
Add support for LdDiagramConnection to LdCanvas. Heavy LdCanvas refactoring, some modifications to ld-types. It just wasn't possible for me to further work with an old, 2000 lines long file without shuffling everything around at the same time.
2011-02-07 01:10:17 +01:00
const LdPoint *point);
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
static void move_selection (LdDiagramView *self, gdouble dx, gdouble dy);
static gboolean is_object_selected (LdDiagramView *self,
LdDiagramObject *object);
Add support for LdDiagramConnection to LdCanvas. Heavy LdCanvas refactoring, some modifications to ld-types. It just wasn't possible for me to further work with an old, 2000 lines long file without shuffling everything around at the same time.
2011-02-07 01:10:17 +01:00
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
static void queue_draw (LdDiagramView *self, LdRectangle *rect);
static void queue_object_draw (LdDiagramView *self, LdDiagramObject *object);
Add support for LdDiagramConnection to LdCanvas. Heavy LdCanvas refactoring, some modifications to ld-types. It just wasn't possible for me to further work with an old, 2000 lines long file without shuffling everything around at the same time.
2011-02-07 01:10:17 +01:00
Also find terminals on ends of connections.
2011-02-19 22:15:11 +01:00
/* Terminals. */
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
static void check_terminals (LdDiagramView *self, const LdPoint *point);
Also find terminals on ends of connections.
2011-02-19 22:15:11 +01:00
static void check_terminals_point (LdDiagramView *self, const LdPoint *point,
CheckTerminalsData *data);
void check_connection_terminals (LdDiagramView *self,
LdDiagramConnection *connection, CheckTerminalsData *data);
void check_symbol_terminals (LdDiagramView *self,
LdDiagramSymbol *diagram_symbol, CheckTerminalsData *data);
static void rotate_symbol_terminal (LdPoint *terminal, gint symbol_rotation);
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
static void hide_terminals (LdDiagramView *self);
static void queue_terminal_draw (LdDiagramView *self, LdPoint *terminal);
Make adding symbols to the diagram possible. This required creating a simple framework for operations to LdCanvas. It is probable that it's going to require some changes when other operations are added. The basic idea behind it seems to be good, though.
2011-01-04 09:54:05 +01:00
Add support for LdDiagramConnection to LdCanvas. Heavy LdCanvas refactoring, some modifications to ld-types. It just wasn't possible for me to further work with an old, 2000 lines long file without shuffling everything around at the same time.
2011-02-07 01:10:17 +01:00
/* Diagram symbol. */
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
static gboolean symbol_hit_test (LdDiagramView *self,
Add support for LdDiagramConnection to LdCanvas. Heavy LdCanvas refactoring, some modifications to ld-types. It just wasn't possible for me to further work with an old, 2000 lines long file without shuffling everything around at the same time.
2011-02-07 01:10:17 +01:00
LdDiagramSymbol *symbol, const LdPoint *point);
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
static gboolean get_symbol_clip_area (LdDiagramView *self,
Add support for LdDiagramConnection to LdCanvas. Heavy LdCanvas refactoring, some modifications to ld-types. It just wasn't possible for me to further work with an old, 2000 lines long file without shuffling everything around at the same time.
2011-02-07 01:10:17 +01:00
LdDiagramSymbol *symbol, LdRectangle *rect);
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
static gboolean get_symbol_area (LdDiagramView *self,
Add support for LdDiagramConnection to LdCanvas. Heavy LdCanvas refactoring, some modifications to ld-types. It just wasn't possible for me to further work with an old, 2000 lines long file without shuffling everything around at the same time.
2011-02-07 01:10:17 +01:00
LdDiagramSymbol *symbol, LdRectangle *rect);
Allow rotation of symbols. Bind this action to the right mouse button. Due to limitations of json-glib, we can't store rotation as an enum.
2011-02-14 10:14:28 +01:00
static void rotate_symbol_area (LdRectangle *area, gint rotation);
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
static void rotate_symbol (LdDiagramView *self, LdDiagramSymbol *symbol);
static LdSymbol *resolve_symbol (LdDiagramView *self,
Add support for LdDiagramConnection to LdCanvas. Heavy LdCanvas refactoring, some modifications to ld-types. It just wasn't possible for me to further work with an old, 2000 lines long file without shuffling everything around at the same time.
2011-02-07 01:10:17 +01:00
LdDiagramSymbol *diagram_symbol);
/* Diagram connection. */
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
static gboolean connection_hit_test (LdDiagramView *self,
Add support for LdDiagramConnection to LdCanvas. Heavy LdCanvas refactoring, some modifications to ld-types. It just wasn't possible for me to further work with an old, 2000 lines long file without shuffling everything around at the same time.
2011-02-07 01:10:17 +01:00
LdDiagramConnection *connection, const LdPoint *point);
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
static gboolean get_connection_clip_area (LdDiagramView *self,
Add support for LdDiagramConnection to LdCanvas. Heavy LdCanvas refactoring, some modifications to ld-types. It just wasn't possible for me to further work with an old, 2000 lines long file without shuffling everything around at the same time.
2011-02-07 01:10:17 +01:00
LdDiagramConnection *connection, LdRectangle *rect);
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
static gboolean get_connection_area (LdDiagramView *self,
Add support for LdDiagramConnection to LdCanvas. Heavy LdCanvas refactoring, some modifications to ld-types. It just wasn't possible for me to further work with an old, 2000 lines long file without shuffling everything around at the same time.
2011-02-07 01:10:17 +01:00
LdDiagramConnection *connection, LdRectangle *rect);
/* Operations. */
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
static void ld_diagram_view_real_cancel_operation (LdDiagramView *self);
Add scrolling using the middle mouse button. A bit of refactoring, too.
2011-06-09 13:54:37 +02:00
static void oper_move_view_begin (LdDiagramView *self, const LdPoint *point);
static void oper_move_view_motion (LdDiagramView *self, const LdPoint *point);
Change the cursor when scrolling the view. For consistency with other GTK+ applications.
2011-06-09 21:56:38 +02:00
static void oper_move_view_end (LdDiagramView *self);
Add scrolling using the middle mouse button. A bit of refactoring, too.
2011-06-09 13:54:37 +02:00
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
static void oper_add_object_end (LdDiagramView *self);
Refactor ld-canvas.c, extend LdCanvas operations. Now objects can be selected and moved by dragging the mouse.
2011-02-05 16:36:04 +01:00
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
static void oper_connect_begin (LdDiagramView *self, const LdPoint *point);
static void oper_connect_end (LdDiagramView *self);
static void oper_connect_motion (LdDiagramView *self, const LdPoint *point);
Refactor oper_connect_motion().
2011-02-20 12:41:45 +01:00
static LdPointArray *create_connection_path (const LdPoint *end_point);
Add support for LdDiagramConnection to LdCanvas. Heavy LdCanvas refactoring, some modifications to ld-types. It just wasn't possible for me to further work with an old, 2000 lines long file without shuffling everything around at the same time.
2011-02-07 01:10:17 +01:00
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
static void oper_select_begin (LdDiagramView *self, const LdPoint *point);
static void oper_select_end (LdDiagramView *self);
static void oper_select_get_rectangle (LdDiagramView *self, LdRectangle *rect);
static void oper_select_queue_draw (LdDiagramView *self);
Refactor ld-canvas.c, extend LdCanvas operations. Now objects can be selected and moved by dragging the mouse.
2011-02-05 16:36:04 +01:00
static void oper_select_draw (GtkWidget *widget, DrawData *data);
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
static void oper_select_motion (LdDiagramView *self, const LdPoint *point);
Refactor ld-canvas.c, extend LdCanvas operations. Now objects can be selected and moved by dragging the mouse.
2011-02-05 16:36:04 +01:00
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
static void oper_move_selection_begin (LdDiagramView *self,
const LdPoint *point);
static void oper_move_selection_end (LdDiagramView *self);
static void oper_move_selection_motion (LdDiagramView *self,
const LdPoint *point);
Refactor ld-canvas.c, extend LdCanvas operations. Now objects can be selected and moved by dragging the mouse.
2011-02-05 16:36:04 +01:00
Add support for LdDiagramConnection to LdCanvas. Heavy LdCanvas refactoring, some modifications to ld-types. It just wasn't possible for me to further work with an old, 2000 lines long file without shuffling everything around at the same time.
2011-02-07 01:10:17 +01:00
/* Events, rendering. */
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
static void simulate_motion (LdDiagramView *self);
Refactor ld-canvas.c, extend LdCanvas operations. Now objects can be selected and moved by dragging the mouse.
2011-02-05 16:36:04 +01:00
static gboolean on_motion_notify (GtkWidget *widget, GdkEventMotion *event,
gpointer user_data);
static gboolean on_leave_notify (GtkWidget *widget, GdkEventCrossing *event,
gpointer user_data);
static gboolean on_button_press (GtkWidget *widget, GdkEventButton *event,
gpointer user_data);
Add scrolling using the middle mouse button. A bit of refactoring, too.
2011-06-09 13:54:37 +02:00
static void on_left_button_press (LdDiagramView *self, GdkEventButton *event,
const LdPoint *point);
static void on_middle_button_press (LdDiagramView *self, GdkEventButton *event,
const LdPoint *point);
static void on_right_button_press (LdDiagramView *self, GdkEventButton *event,
const LdPoint *point);
Refactor ld-canvas.c, extend LdCanvas operations. Now objects can be selected and moved by dragging the mouse.
2011-02-05 16:36:04 +01:00
static gboolean on_button_release (GtkWidget *widget, GdkEventButton *event,
gpointer user_data);
static gboolean on_scroll (GtkWidget *widget, GdkEventScroll *event,
gpointer user_data);
Partial refactoring of LdCanvas. draw_symbol() had been doing too much.
2011-01-04 00:45:44 +01:00
Add drag and drop support for symbols.
2012-10-07 08:34:32 +02:00
static gboolean on_drag_motion (GtkWidget *widget, GdkDragContext *drag_ctx,
gint x, gint y, guint time, gpointer user_data);
static gboolean on_drag_drop (GtkWidget *widget, GdkDragContext *drag_ctx,
gint x, gint y, guint time, gpointer user_data);
static void on_drag_data_received (GtkWidget *widget, GdkDragContext *drag_ctx,
gint x, gint y, GtkSelectionData *data, guint info,
guint time, gpointer user_data);
static void on_drag_leave (GtkWidget *widget, GdkDragContext *drag_ctx,
guint time, gpointer user_data);
GTK+ 3: Fix compilation, scrolling, drawing
2015-01-19 02:23:20 +01:00
static gboolean on_draw (GtkWidget *widget, cairo_t *cr, gpointer user_data);
Implement more of LdCanvas. 1. Add methods for coordinate translation between cairo/GtkWidget coordinates and LdDocument coordinates. 2. Draw the grid correctly (also make it significantly faster). 3. Place the canvas into a GtkScrolledWindow and register the set_scroll_adjustments signal in the GtkWidget base class. 4. Allow scrolling inside of an area of 200 x 200 units (for now). In the future, it should be possible to go to infinity.
2010-12-07 00:59:05 +01:00
static void draw_grid (GtkWidget *widget, DrawData *data);
Rename LdDocument* to LdDiagram*. My bad; this name is much more appropriate.
2010-12-16 11:34:02 +01:00
static void draw_diagram (GtkWidget *widget, DrawData *data);
Highlight symbol terminals on mouse hover.
2011-01-09 04:50:58 +01:00
static void draw_terminal (GtkWidget *widget, DrawData *data);
Partial refactoring of LdCanvas. draw_symbol() had been doing too much.
2011-01-04 00:45:44 +01:00
static void draw_object (LdDiagramObject *diagram_object, DrawData *data);
Rename LdDocument* to LdDiagram*. My bad; this name is much more appropriate.
2010-12-16 11:34:02 +01:00
static void draw_symbol (LdDiagramSymbol *diagram_symbol, DrawData *data);
Add support for LdDiagramConnection to LdCanvas. Heavy LdCanvas refactoring, some modifications to ld-types. It just wasn't possible for me to further work with an old, 2000 lines long file without shuffling everything around at the same time.
2011-02-07 01:10:17 +01:00
static void draw_connection (LdDiagramConnection *connection, DrawData *data);
Implemented a skeleton of LdCanvas. It now paints itself white and draws a simple grid. Also an LdDocument can be assigned to it.
2010-09-19 09:10:16 +02:00
GTK+ 3: Fix compilation, scrolling, drawing
2015-01-19 02:23:20 +01:00
G_DEFINE_TYPE_WITH_CODE (LdDiagramView, ld_diagram_view, GTK_TYPE_DRAWING_AREA,
G_IMPLEMENT_INTERFACE (GTK_TYPE_SCROLLABLE,
ld_diagram_view_scrollable_init))
static void
ld_diagram_view_scrollable_init (GtkScrollableInterface *iface)
{
}
Move lines around. No functional change.
2011-01-04 14:52:57 +01:00
Started implementing the canvas and the document.
2010-09-17 18:48:02 +02:00
static void
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
ld_diagram_view_class_init (LdDiagramViewClass *klass)
Started implementing the canvas and the document.
2010-09-17 18:48:02 +02:00
{
GObjectClass *object_class;
Make adding symbols to the diagram possible. This required creating a simple framework for operations to LdCanvas. It is probable that it's going to require some changes when other operations are added. The basic idea behind it seems to be good, though.
2011-01-04 09:54:05 +01:00
GtkBindingSet *binding_set;
Implemented a skeleton of LdCanvas. It now paints itself white and draws a simple grid. Also an LdDocument can be assigned to it.
2010-09-19 09:10:16 +02:00
GParamSpec *pspec;
Started implementing the canvas and the document.
2010-09-17 18:48:02 +02:00
object_class = G_OBJECT_CLASS (klass);
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
object_class->get_property = ld_diagram_view_get_property;
object_class->set_property = ld_diagram_view_set_property;
Fix assertion failures on quitting
2018-06-25 03:51:38 +02:00
object_class->dispose = ld_diagram_view_dispose;
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
object_class->finalize = ld_diagram_view_finalize;
Started implementing the canvas and the document.
2010-09-17 18:48:02 +02:00
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
klass->cancel_operation = ld_diagram_view_real_cancel_operation;
klass->move = ld_diagram_view_real_move;
Make adding symbols to the diagram possible. This required creating a simple framework for operations to LdCanvas. It is probable that it's going to require some changes when other operations are added. The basic idea behind it seems to be good, though.
2011-01-04 09:54:05 +01:00
binding_set = gtk_binding_set_by_class (klass);
Switch to GTK3 via pkg-config, start the port
2015-01-19 00:02:48 +01:00
gtk_binding_entry_add_signal (binding_set, GDK_KEY_Escape, 0,
Make adding symbols to the diagram possible. This required creating a simple framework for operations to LdCanvas. It is probable that it's going to require some changes when other operations are added. The basic idea behind it seems to be good, though.
2011-01-04 09:54:05 +01:00
"cancel-operation", 0);
Switch to GTK3 via pkg-config, start the port
2015-01-19 00:02:48 +01:00
gtk_binding_entry_add_signal (binding_set, GDK_KEY_Left, 0,
Bind actions to cursor keys in LdCanvas. If there's a selection, move it. Otherwise move the viewport.
2011-02-01 14:43:02 +01:00
"move", 2, G_TYPE_DOUBLE, (gdouble) -1, G_TYPE_DOUBLE, (gdouble) 0);
Switch to GTK3 via pkg-config, start the port
2015-01-19 00:02:48 +01:00
gtk_binding_entry_add_signal (binding_set, GDK_KEY_Right, 0,
Bind actions to cursor keys in LdCanvas. If there's a selection, move it. Otherwise move the viewport.
2011-02-01 14:43:02 +01:00
"move", 2, G_TYPE_DOUBLE, (gdouble) 1, G_TYPE_DOUBLE, (gdouble) 0);
Switch to GTK3 via pkg-config, start the port
2015-01-19 00:02:48 +01:00
gtk_binding_entry_add_signal (binding_set, GDK_KEY_Up, 0,
Bind actions to cursor keys in LdCanvas. If there's a selection, move it. Otherwise move the viewport.
2011-02-01 14:43:02 +01:00
"move", 2, G_TYPE_DOUBLE, (gdouble) 0, G_TYPE_DOUBLE, (gdouble) -1);
Switch to GTK3 via pkg-config, start the port
2015-01-19 00:02:48 +01:00
gtk_binding_entry_add_signal (binding_set, GDK_KEY_Down, 0,
Bind actions to cursor keys in LdCanvas. If there's a selection, move it. Otherwise move the viewport.
2011-02-01 14:43:02 +01:00
"move", 2, G_TYPE_DOUBLE, (gdouble) 0, G_TYPE_DOUBLE, (gdouble) 1);
Rename local LdCanvas methods. Use a "real" prefix, as GTK+ does.
2010-12-12 17:30:28 +01:00
GTK+ 3: Fix compilation, scrolling, drawing
2015-01-19 02:23:20 +01:00
g_object_class_override_property (object_class,
PROP_HADJUSTMENT, "hadjustment");
g_object_class_override_property (object_class,
PROP_VADJUSTMENT, "vadjustment");
g_object_class_override_property (object_class,
PROP_HSCROLL_POLICY, "hscroll-policy");
g_object_class_override_property (object_class,
PROP_VSCROLL_POLICY, "vscroll-policy");
Implemented a skeleton of LdCanvas. It now paints itself white and draws a simple grid. Also an LdDocument can be assigned to it.
2010-09-19 09:10:16 +02:00
/**
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
* LdDiagramView:diagram:
Implemented a skeleton of LdCanvas. It now paints itself white and draws a simple grid. Also an LdDocument can be assigned to it.
2010-09-19 09:10:16 +02:00
*
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
* The underlying #LdDiagram object of this view.
Implemented a skeleton of LdCanvas. It now paints itself white and draws a simple grid. Also an LdDocument can be assigned to it.
2010-09-19 09:10:16 +02:00
*/
Rename LdDocument* to LdDiagram*. My bad; this name is much more appropriate.
2010-12-16 11:34:02 +01:00
pspec = g_param_spec_object ("diagram", "Diagram",
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
"The underlying diagram object of this view.",
Rename LdDocument* to LdDiagram*. My bad; this name is much more appropriate.
2010-12-16 11:34:02 +01:00
LD_TYPE_DIAGRAM, G_PARAM_READWRITE);
g_object_class_install_property (object_class, PROP_DIAGRAM, pspec);
Implemented a skeleton of LdCanvas. It now paints itself white and draws a simple grid. Also an LdDocument can be assigned to it.
2010-09-19 09:10:16 +02:00
Add a "library" property to LdCanvas. Also make the code reference properties properly.
2010-11-19 07:05:44 +01:00
/**
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
* LdDiagramView:library:
Add a "library" property to LdCanvas. Also make the code reference properties properly.
2010-11-19 07:05:44 +01:00
*
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
* The #LdLibrary from which symbols are retrieved.
Add a "library" property to LdCanvas. Also make the code reference properties properly.
2010-11-19 07:05:44 +01:00
*/
pspec = g_param_spec_object ("library", "Library",
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
"The library from which symbols are retrieved.",
Add a "library" property to LdCanvas. Also make the code reference properties properly.
2010-11-19 07:05:44 +01:00
LD_TYPE_LIBRARY, G_PARAM_READWRITE);
Fix the "library" property in LdCanvas.
2011-01-04 04:08:05 +01:00
g_object_class_install_property (object_class, PROP_LIBRARY, pspec);
Add a "library" property to LdCanvas. Also make the code reference properties properly.
2010-11-19 07:05:44 +01:00
Add "x" and "y" properties to LdDiagramView. Plus a bit of refactoring.
2011-02-19 14:04:52 +01:00
/**
* LdDiagramView:x:
*
* The X coordinate of the center of view.
*/
pspec = g_param_spec_double ("x", "X",
"The X coordinate of the center of view.",
-G_MAXDOUBLE, G_MAXDOUBLE, 0, G_PARAM_READWRITE);
g_object_class_install_property (object_class, PROP_X, pspec);
/**
* LdDiagramView:y:
*
* The Y coordinate of the center of view.
*/
pspec = g_param_spec_double ("y", "Y",
"The Y coordinate of the center of view.",
-G_MAXDOUBLE, G_MAXDOUBLE, 0, G_PARAM_READWRITE);
g_object_class_install_property (object_class, PROP_Y, pspec);
Add a "zoom" property to LdCanvas.
2011-01-09 08:15:47 +01:00
/**
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
* LdDiagramView:zoom:
Add a "zoom" property to LdCanvas.
2011-01-09 08:15:47 +01:00
*
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
* The zoom of this view.
Add a "zoom" property to LdCanvas.
2011-01-09 08:15:47 +01:00
*/
pspec = g_param_spec_double ("zoom", "Zoom",
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
"The zoom of this view.",
Add a "zoom" property to LdCanvas.
2011-01-09 08:15:47 +01:00
ZOOM_MIN, ZOOM_MAX, ZOOM_DEFAULT, G_PARAM_READWRITE);
g_object_class_install_property (object_class, PROP_ZOOM, pspec);
Make adding symbols to the diagram possible. This required creating a simple framework for operations to LdCanvas. It is probable that it's going to require some changes when other operations are added. The basic idea behind it seems to be good, though.
2011-01-04 09:54:05 +01:00
/**
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
* LdDiagramView::cancel-operation:
* @self: an #LdDiagramView object.
Make adding symbols to the diagram possible. This required creating a simple framework for operations to LdCanvas. It is probable that it's going to require some changes when other operations are added. The basic idea behind it seems to be good, though.
2011-01-04 09:54:05 +01:00
*
* Cancel any current operation.
*/
klass->cancel_operation_signal = g_signal_new
("cancel-operation", G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
G_STRUCT_OFFSET (LdDiagramViewClass, cancel_operation), NULL, NULL,
Make adding symbols to the diagram possible. This required creating a simple framework for operations to LdCanvas. It is probable that it's going to require some changes when other operations are added. The basic idea behind it seems to be good, though.
2011-01-04 09:54:05 +01:00
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0);
Bind actions to cursor keys in LdCanvas. If there's a selection, move it. Otherwise move the viewport.
2011-02-01 14:43:02 +01:00
/**
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
* LdDiagramView::move:
* @self: an #LdDiagramView object.
Bind actions to cursor keys in LdCanvas. If there's a selection, move it. Otherwise move the viewport.
2011-02-01 14:43:02 +01:00
* @dx: The difference by which to move on the horizontal axis.
* @dy: The difference by which to move on the vertical axis.
*
* Move the selection, if any, or the document.
*/
klass->move_signal = g_signal_new
("move", G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
G_STRUCT_OFFSET (LdDiagramViewClass, move), NULL, NULL,
Bind actions to cursor keys in LdCanvas. If there's a selection, move it. Otherwise move the viewport.
2011-02-01 14:43:02 +01:00
ld_marshal_VOID__DOUBLE_DOUBLE,
G_TYPE_NONE, 2, G_TYPE_DOUBLE, G_TYPE_DOUBLE);
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
g_type_class_add_private (klass, sizeof (LdDiagramViewPrivate));
Started implementing the canvas and the document.
2010-09-17 18:48:02 +02:00
}
static void
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
ld_diagram_view_init (LdDiagramView *self)
Started implementing the canvas and the document.
2010-09-17 18:48:02 +02:00
{
Add drag and drop support for symbols.
2012-10-07 08:34:32 +02:00
GtkTargetEntry target = {"ld-symbol", GTK_TARGET_SAME_APP, 0};
Started implementing the canvas and the document.
2010-09-17 18:48:02 +02:00
self->priv = G_TYPE_INSTANCE_GET_PRIVATE
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
(self, LD_TYPE_DIAGRAM_VIEW, LdDiagramViewPrivate);
Implemented a skeleton of LdCanvas. It now paints itself white and draws a simple grid. Also an LdDocument can be assigned to it.
2010-09-19 09:10:16 +02:00
GTK+ 3: Fix compilation, scrolling, drawing
2015-01-19 02:23:20 +01:00
self->priv->adjustment_policy_h = GTK_SCROLL_MINIMUM;
self->priv->adjustment_policy_v = GTK_SCROLL_MINIMUM;
Implement more of LdCanvas. 1. Add methods for coordinate translation between cairo/GtkWidget coordinates and LdDocument coordinates. 2. Draw the grid correctly (also make it significantly faster). 3. Place the canvas into a GtkScrolledWindow and register the set_scroll_adjustments signal in the GtkWidget base class. 4. Allow scrolling inside of an area of 200 x 200 units (for now). In the future, it should be possible to go to infinity.
2010-12-07 00:59:05 +01:00
self->priv->x = 0;
self->priv->y = 0;
Add a "zoom" property to LdCanvas.
2011-01-09 08:15:47 +01:00
self->priv->zoom = ZOOM_DEFAULT;
Implement more of LdCanvas. 1. Add methods for coordinate translation between cairo/GtkWidget coordinates and LdDocument coordinates. 2. Draw the grid correctly (also make it significantly faster). 3. Place the canvas into a GtkScrolledWindow and register the set_scroll_adjustments signal in the GtkWidget base class. 4. Allow scrolling inside of an area of 200 x 200 units (for now). In the future, it should be possible to go to infinity.
2010-12-07 00:59:05 +01:00
Add API for turning off the grid.
2011-03-06 15:56:41 +01:00
self->priv->show_grid = TRUE;
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
color_set (COLOR_GET (self, COLOR_BASE), 1, 1, 1, 1);
color_set (COLOR_GET (self, COLOR_GRID), 0.5, 0.5, 0.5, 1);
color_set (COLOR_GET (self, COLOR_OBJECT), 0, 0, 0, 1);
color_set (COLOR_GET (self, COLOR_SELECTION), 1, 0, 0, 1);
color_set (COLOR_GET (self, COLOR_TERMINAL), 1, 0.5, 0.5, 1);
Draw selected objects with another color. Store all colors in LdCanvasPrivate and initialize them upon object creation. This creates a base for color themes. Make attempts to try adding an object that's not a part of the document to the selection issue a warning.
2011-01-05 01:11:03 +01:00
Implement more of LdCanvas. 1. Add methods for coordinate translation between cairo/GtkWidget coordinates and LdDocument coordinates. 2. Draw the grid correctly (also make it significantly faster). 3. Place the canvas into a GtkScrolledWindow and register the set_scroll_adjustments signal in the GtkWidget base class. 4. Allow scrolling inside of an area of 200 x 200 units (for now). In the future, it should be possible to go to infinity.
2010-12-07 00:59:05 +01:00
g_signal_connect (self, "size-allocate",
G_CALLBACK (on_size_allocate), NULL);
GTK+ 3: Fix compilation, scrolling, drawing
2015-01-19 02:23:20 +01:00
g_signal_connect (self, "draw",
G_CALLBACK (on_draw), NULL);
LdWindowMain cleanup. * Restructure the initialization code. * Move LdCanvas event mask setting to ld-canvas.c. * Remove some redundant code. * Use consistent naming. * Update comments. Practically no functional change.
2010-12-12 17:56:59 +01:00
Make adding symbols to the diagram possible. This required creating a simple framework for operations to LdCanvas. It is probable that it's going to require some changes when other operations are added. The basic idea behind it seems to be good, though.
2011-01-04 09:54:05 +01:00
g_signal_connect (self, "motion-notify-event",
G_CALLBACK (on_motion_notify), NULL);
g_signal_connect (self, "leave-notify-event",
G_CALLBACK (on_leave_notify), NULL);
g_signal_connect (self, "button-press-event",
G_CALLBACK (on_button_press), NULL);
g_signal_connect (self, "button-release-event",
G_CALLBACK (on_button_release), NULL);
Make LdCanvas zoom on mouse wheel.
2011-01-08 12:05:59 +01:00
g_signal_connect (self, "scroll-event",
G_CALLBACK (on_scroll), NULL);
Make adding symbols to the diagram possible. This required creating a simple framework for operations to LdCanvas. It is probable that it's going to require some changes when other operations are added. The basic idea behind it seems to be good, though.
2011-01-04 09:54:05 +01:00
Add drag and drop support for symbols.
2012-10-07 08:34:32 +02:00
g_signal_connect (self, "drag-motion",
G_CALLBACK (on_drag_motion), NULL);
g_signal_connect (self, "drag-leave",
G_CALLBACK (on_drag_leave), NULL);
g_signal_connect (self, "drag-drop",
G_CALLBACK (on_drag_drop), NULL);
g_signal_connect (self, "drag-data-received",
G_CALLBACK (on_drag_data_received), NULL);
Make adding symbols to the diagram possible. This required creating a simple framework for operations to LdCanvas. It is probable that it's going to require some changes when other operations are added. The basic idea behind it seems to be good, though.
2011-01-04 09:54:05 +01:00
g_object_set (self, "can-focus", TRUE, NULL);
LdWindowMain cleanup. * Restructure the initialization code. * Move LdCanvas event mask setting to ld-canvas.c. * Remove some redundant code. * Use consistent naming. * Update comments. Practically no functional change.
2010-12-12 17:56:59 +01:00
gtk_widget_add_events (GTK_WIDGET (self),
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK
Make adding symbols to the diagram possible. This required creating a simple framework for operations to LdCanvas. It is probable that it's going to require some changes when other operations are added. The basic idea behind it seems to be good, though.
2011-01-04 09:54:05 +01:00
| GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
Fix zooming with mouse wheel
2015-01-20 08:03:02 +01:00
| GDK_SCROLL_MASK | GDK_LEAVE_NOTIFY_MASK);
Add drag and drop support for symbols.
2012-10-07 08:34:32 +02:00
gtk_drag_dest_set (GTK_WIDGET (self), 0, &target, 1, GDK_ACTION_COPY);
Started implementing the canvas and the document.
2010-09-17 18:48:02 +02:00
}
static void
Fix assertion failures on quitting
2018-06-25 03:51:38 +02:00
ld_diagram_view_dispose (GObject *gobject)
Started implementing the canvas and the document.
2010-09-17 18:48:02 +02:00
{
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
LdDiagramView *self;
Started implementing the canvas and the document.
2010-09-17 18:48:02 +02:00
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
self = LD_DIAGRAM_VIEW (gobject);
Started implementing the canvas and the document.
2010-09-17 18:48:02 +02:00
GTK+ 3: Fix compilation, scrolling, drawing
2015-01-19 02:23:20 +01:00
g_object_set (self, "hadjustment", NULL, NULL);
g_object_set (self, "vadjustment", NULL, NULL);
Implement more of LdCanvas. 1. Add methods for coordinate translation between cairo/GtkWidget coordinates and LdDocument coordinates. 2. Draw the grid correctly (also make it significantly faster). 3. Place the canvas into a GtkScrolledWindow and register the set_scroll_adjustments signal in the GtkWidget base class. 4. Allow scrolling inside of an area of 200 x 200 units (for now). In the future, it should be possible to go to infinity.
2010-12-07 00:59:05 +01:00
Fix assertion failures on quitting
2018-06-25 03:51:38 +02:00
/* Chain up to the parent class. */
G_OBJECT_CLASS (ld_diagram_view_parent_class)->dispose (gobject);
}
static void
ld_diagram_view_finalize (GObject *gobject)
{
LdDiagramView *self;
self = LD_DIAGRAM_VIEW (gobject);
Rename LdDocument* to LdDiagram*. My bad; this name is much more appropriate.
2010-12-16 11:34:02 +01:00
if (self->priv->diagram)
Redraw LdCanvas on LdDiagram changes.
2011-01-05 11:03:38 +01:00
{
diagram_disconnect_signals (self);
Rename LdDocument* to LdDiagram*. My bad; this name is much more appropriate.
2010-12-16 11:34:02 +01:00
g_object_unref (self->priv->diagram);
Redraw LdCanvas on LdDiagram changes.
2011-01-05 11:03:38 +01:00
}
Add a "library" property to LdCanvas. Also make the code reference properties properly.
2010-11-19 07:05:44 +01:00
if (self->priv->library)
g_object_unref (self->priv->library);
Add drag and drop support for symbols.
2012-10-07 08:34:32 +02:00
if (self->priv->dnd_symbol)
g_object_unref (self->priv->dnd_symbol);
Add a "library" property to LdCanvas. Also make the code reference properties properly.
2010-11-19 07:05:44 +01:00
Started implementing the canvas and the document.
2010-09-17 18:48:02 +02:00
/* Chain up to the parent class. */
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
G_OBJECT_CLASS (ld_diagram_view_parent_class)->finalize (gobject);
Started implementing the canvas and the document.
2010-09-17 18:48:02 +02:00
}
Implemented a skeleton of LdCanvas. It now paints itself white and draws a simple grid. Also an LdDocument can be assigned to it.
2010-09-19 09:10:16 +02:00
static void
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
ld_diagram_view_get_property (GObject *object, guint property_id,
Implemented a skeleton of LdCanvas. It now paints itself white and draws a simple grid. Also an LdDocument can be assigned to it.
2010-09-19 09:10:16 +02:00
GValue *value, GParamSpec *pspec)
{
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
LdDiagramView *self;
Implemented a skeleton of LdCanvas. It now paints itself white and draws a simple grid. Also an LdDocument can be assigned to it.
2010-09-19 09:10:16 +02:00
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
self = LD_DIAGRAM_VIEW (object);
Implemented a skeleton of LdCanvas. It now paints itself white and draws a simple grid. Also an LdDocument can be assigned to it.
2010-09-19 09:10:16 +02:00
switch (property_id)
{
GTK+ 3: Fix compilation, scrolling, drawing
2015-01-19 02:23:20 +01:00
case PROP_HADJUSTMENT:
g_value_set_object (value, self->priv->adjustment_h);
break;
case PROP_VADJUSTMENT:
g_value_set_object (value, self->priv->adjustment_v);
break;
case PROP_HSCROLL_POLICY:
g_value_set_enum (value, self->priv->adjustment_policy_h);
break;
case PROP_VSCROLL_POLICY:
g_value_set_enum (value, self->priv->adjustment_policy_v);
break;
Rename LdDocument* to LdDiagram*. My bad; this name is much more appropriate.
2010-12-16 11:34:02 +01:00
case PROP_DIAGRAM:
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
g_value_set_object (value, ld_diagram_view_get_diagram (self));
Implemented a skeleton of LdCanvas. It now paints itself white and draws a simple grid. Also an LdDocument can be assigned to it.
2010-09-19 09:10:16 +02:00
break;
Add a "library" property to LdCanvas. Also make the code reference properties properly.
2010-11-19 07:05:44 +01:00
case PROP_LIBRARY:
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
g_value_set_object (value, ld_diagram_view_get_library (self));
Add a "library" property to LdCanvas. Also make the code reference properties properly.
2010-11-19 07:05:44 +01:00
break;
Add "x" and "y" properties to LdDiagramView. Plus a bit of refactoring.
2011-02-19 14:04:52 +01:00
case PROP_X:
g_value_set_double (value, ld_diagram_view_get_x (self));
break;
case PROP_Y:
g_value_set_double (value, ld_diagram_view_get_y (self));
break;
Add a "zoom" property to LdCanvas.
2011-01-09 08:15:47 +01:00
case PROP_ZOOM:
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
g_value_set_double (value, ld_diagram_view_get_zoom (self));
Add a "zoom" property to LdCanvas.
2011-01-09 08:15:47 +01:00
break;
Implemented a skeleton of LdCanvas. It now paints itself white and draws a simple grid. Also an LdDocument can be assigned to it.
2010-09-19 09:10:16 +02:00
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
}
}
GTK+ 3: Fix compilation, scrolling, drawing
2015-01-19 02:23:20 +01:00
static void
set_hadjustment (LdDiagramView *self, GtkAdjustment *hadjustment)
{
GtkAllocation allocation;
gdouble scale, page_size;
/* TODO: Infinite area. */
if (hadjustment == self->priv->adjustment_h)
return;
gtk_widget_get_allocation (GTK_WIDGET (self), &allocation);
scale = ld_diagram_view_get_scale_in_px (self);
if (self->priv->adjustment_h)
{
g_signal_handlers_disconnect_by_func (self->priv->adjustment_h,
on_adjustment_value_changed, self);
g_object_unref (self->priv->adjustment_h);
self->priv->adjustment_h = NULL;
}
if (hadjustment)
{
g_object_ref (hadjustment);
g_signal_connect (hadjustment, "value-changed",
G_CALLBACK (on_adjustment_value_changed), self);
page_size = allocation.width / scale;
gtk_adjustment_configure (hadjustment,
-page_size / 2, -100, 100, 0.5, 5, page_size);
self->priv->adjustment_h = hadjustment;
}
}
static void
set_vadjustment (LdDiagramView *self, GtkAdjustment *vadjustment)
{
GtkAllocation allocation;
gdouble scale, page_size;
/* TODO: Infinite area. */
if (vadjustment == self->priv->adjustment_v)
return;
gtk_widget_get_allocation (GTK_WIDGET (self), &allocation);
scale = ld_diagram_view_get_scale_in_px (self);
if (self->priv->adjustment_v)
{
g_signal_handlers_disconnect_by_func (self->priv->adjustment_v,
on_adjustment_value_changed, self);
g_object_unref (self->priv->adjustment_v);
self->priv->adjustment_v = NULL;
}
if (vadjustment)
{
g_object_ref (vadjustment);
g_signal_connect (vadjustment, "value-changed",
G_CALLBACK (on_adjustment_value_changed), self);
page_size = allocation.height / scale;
gtk_adjustment_configure (vadjustment,
-page_size / 2, -100, 100, 0.5, 5, page_size);
self->priv->adjustment_v = vadjustment;
}
}
Implemented a skeleton of LdCanvas. It now paints itself white and draws a simple grid. Also an LdDocument can be assigned to it.
2010-09-19 09:10:16 +02:00
static void
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
ld_diagram_view_set_property (GObject *object, guint property_id,
Implemented a skeleton of LdCanvas. It now paints itself white and draws a simple grid. Also an LdDocument can be assigned to it.
2010-09-19 09:10:16 +02:00
const GValue *value, GParamSpec *pspec)
{
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
LdDiagramView *self;
Implemented a skeleton of LdCanvas. It now paints itself white and draws a simple grid. Also an LdDocument can be assigned to it.
2010-09-19 09:10:16 +02:00
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
self = LD_DIAGRAM_VIEW (object);
Implemented a skeleton of LdCanvas. It now paints itself white and draws a simple grid. Also an LdDocument can be assigned to it.
2010-09-19 09:10:16 +02:00
switch (property_id)
{
GTK+ 3: Fix compilation, scrolling, drawing
2015-01-19 02:23:20 +01:00
case PROP_HADJUSTMENT:
set_hadjustment (self, g_value_get_object (value));
break;
case PROP_VADJUSTMENT:
set_vadjustment (self, g_value_get_object (value));
break;
case PROP_HSCROLL_POLICY:
self->priv->adjustment_policy_h = g_value_get_enum (value);
break;
case PROP_VSCROLL_POLICY:
self->priv->adjustment_policy_v = g_value_get_enum (value);
break;
Rename LdDocument* to LdDiagram*. My bad; this name is much more appropriate.
2010-12-16 11:34:02 +01:00
case PROP_DIAGRAM:
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
ld_diagram_view_set_diagram (self,
LD_DIAGRAM (g_value_get_object (value)));
Implemented a skeleton of LdCanvas. It now paints itself white and draws a simple grid. Also an LdDocument can be assigned to it.
2010-09-19 09:10:16 +02:00
break;
Add a "library" property to LdCanvas. Also make the code reference properties properly.
2010-11-19 07:05:44 +01:00
case PROP_LIBRARY:
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
ld_diagram_view_set_library (self,
LD_LIBRARY (g_value_get_object (value)));
Add a "library" property to LdCanvas. Also make the code reference properties properly.
2010-11-19 07:05:44 +01:00
break;
Add "x" and "y" properties to LdDiagramView. Plus a bit of refactoring.
2011-02-19 14:04:52 +01:00
case PROP_X:
ld_diagram_view_set_x (self, g_value_get_double (value));
break;
case PROP_Y:
ld_diagram_view_set_y (self, g_value_get_double (value));
break;
Add a "zoom" property to LdCanvas.
2011-01-09 08:15:47 +01:00
case PROP_ZOOM:
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
ld_diagram_view_set_zoom (self, g_value_get_double (value));
Add a "zoom" property to LdCanvas.
2011-01-09 08:15:47 +01:00
break;
Implemented a skeleton of LdCanvas. It now paints itself white and draws a simple grid. Also an LdDocument can be assigned to it.
2010-09-19 09:10:16 +02:00
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
}
}
Implement more of LdCanvas. 1. Add methods for coordinate translation between cairo/GtkWidget coordinates and LdDocument coordinates. 2. Draw the grid correctly (also make it significantly faster). 3. Place the canvas into a GtkScrolledWindow and register the set_scroll_adjustments signal in the GtkWidget base class. 4. Allow scrolling inside of an area of 200 x 200 units (for now). In the future, it should be possible to go to infinity.
2010-12-07 00:59:05 +01:00
static void
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
on_adjustment_value_changed (GtkAdjustment *adjustment, LdDiagramView *self)
Implement more of LdCanvas. 1. Add methods for coordinate translation between cairo/GtkWidget coordinates and LdDocument coordinates. 2. Draw the grid correctly (also make it significantly faster). 3. Place the canvas into a GtkScrolledWindow and register the set_scroll_adjustments signal in the GtkWidget base class. 4. Allow scrolling inside of an area of 200 x 200 units (for now). In the future, it should be possible to go to infinity.
2010-12-07 00:59:05 +01:00
{
Get more GTK+ 3 ready and respect seals.
2012-08-31 15:23:02 +02:00
GtkAllocation allocation;
Implement more of LdCanvas. 1. Add methods for coordinate translation between cairo/GtkWidget coordinates and LdDocument coordinates. 2. Draw the grid correctly (also make it significantly faster). 3. Place the canvas into a GtkScrolledWindow and register the set_scroll_adjustments signal in the GtkWidget base class. 4. Allow scrolling inside of an area of 200 x 200 units (for now). In the future, it should be possible to go to infinity.
2010-12-07 00:59:05 +01:00
gdouble scale;
Get more GTK+ 3 ready and respect seals.
2012-08-31 15:23:02 +02:00
gtk_widget_get_allocation (GTK_WIDGET (self), &allocation);
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
scale = ld_diagram_view_get_scale_in_px (self);
Implement more of LdCanvas. 1. Add methods for coordinate translation between cairo/GtkWidget coordinates and LdDocument coordinates. 2. Draw the grid correctly (also make it significantly faster). 3. Place the canvas into a GtkScrolledWindow and register the set_scroll_adjustments signal in the GtkWidget base class. 4. Allow scrolling inside of an area of 200 x 200 units (for now). In the future, it should be possible to go to infinity.
2010-12-07 00:59:05 +01:00
if (adjustment == self->priv->adjustment_h)
Get more GTK+ 3 ready and respect seals.
2012-08-31 15:23:02 +02:00
ld_diagram_view_set_x (self, gtk_adjustment_get_value (adjustment)
+ allocation.width / scale / 2);
Implement more of LdCanvas. 1. Add methods for coordinate translation between cairo/GtkWidget coordinates and LdDocument coordinates. 2. Draw the grid correctly (also make it significantly faster). 3. Place the canvas into a GtkScrolledWindow and register the set_scroll_adjustments signal in the GtkWidget base class. 4. Allow scrolling inside of an area of 200 x 200 units (for now). In the future, it should be possible to go to infinity.
2010-12-07 00:59:05 +01:00
else if (adjustment == self->priv->adjustment_v)
Get more GTK+ 3 ready and respect seals.
2012-08-31 15:23:02 +02:00
ld_diagram_view_set_y (self, gtk_adjustment_get_value (adjustment)
+ allocation.height / scale / 2);
Implement more of LdCanvas. 1. Add methods for coordinate translation between cairo/GtkWidget coordinates and LdDocument coordinates. 2. Draw the grid correctly (also make it significantly faster). 3. Place the canvas into a GtkScrolledWindow and register the set_scroll_adjustments signal in the GtkWidget base class. 4. Allow scrolling inside of an area of 200 x 200 units (for now). In the future, it should be possible to go to infinity.
2010-12-07 00:59:05 +01:00
}
static void
on_size_allocate (GtkWidget *widget, GtkAllocation *allocation,
gpointer user_data)
{
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
LdDiagramView *self;
Implement more of LdCanvas. 1. Add methods for coordinate translation between cairo/GtkWidget coordinates and LdDocument coordinates. 2. Draw the grid correctly (also make it significantly faster). 3. Place the canvas into a GtkScrolledWindow and register the set_scroll_adjustments signal in the GtkWidget base class. 4. Allow scrolling inside of an area of 200 x 200 units (for now). In the future, it should be possible to go to infinity.
2010-12-07 00:59:05 +01:00
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
self = LD_DIAGRAM_VIEW (widget);
Implement more of LdCanvas. 1. Add methods for coordinate translation between cairo/GtkWidget coordinates and LdDocument coordinates. 2. Draw the grid correctly (also make it significantly faster). 3. Place the canvas into a GtkScrolledWindow and register the set_scroll_adjustments signal in the GtkWidget base class. 4. Allow scrolling inside of an area of 200 x 200 units (for now). In the future, it should be possible to go to infinity.
2010-12-07 00:59:05 +01:00
/* FIXME: If the new allocation is bigger, we may see more than
* what we're supposed to be able to see -> adjust X and Y.
*/
Make LdCanvas zoom on mouse wheel.
2011-01-08 12:05:59 +01:00
update_adjustments (self);
}
Win32 bugfixes. * Force redraw on LdCategorySymbolView size allocation. * Fix an infinite loop sometimes caused by update_adjustments().
2012-10-10 20:35:52 +02:00
static void
update_adjustment_value (LdDiagramView *self, GtkAdjustment *adjustment,
gdouble value, gdouble page_size)
{
gtk_adjustment_set_page_size (adjustment, page_size);
g_signal_handlers_block_by_func (adjustment,
on_adjustment_value_changed, self);
gtk_adjustment_set_value (adjustment, value - page_size / 2);
g_signal_handlers_unblock_by_func (adjustment,
on_adjustment_value_changed, self);
gtk_adjustment_changed (adjustment);
}
Make LdCanvas zoom on mouse wheel.
2011-01-08 12:05:59 +01:00
static void
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
update_adjustments (LdDiagramView *self)
Make LdCanvas zoom on mouse wheel.
2011-01-08 12:05:59 +01:00
{
Get more GTK+ 3 ready and respect seals.
2012-08-31 15:23:02 +02:00
GtkAllocation allocation;
Win32 bugfixes. * Force redraw on LdCategorySymbolView size allocation. * Fix an infinite loop sometimes caused by update_adjustments().
2012-10-10 20:35:52 +02:00
gdouble scale;
Make LdCanvas zoom on mouse wheel.
2011-01-08 12:05:59 +01:00
Get more GTK+ 3 ready and respect seals.
2012-08-31 15:23:02 +02:00
gtk_widget_get_allocation (GTK_WIDGET (self), &allocation);
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
scale = ld_diagram_view_get_scale_in_px (self);
Make LdCanvas zoom on mouse wheel.
2011-01-08 12:05:59 +01:00
Implement more of LdCanvas. 1. Add methods for coordinate translation between cairo/GtkWidget coordinates and LdDocument coordinates. 2. Draw the grid correctly (also make it significantly faster). 3. Place the canvas into a GtkScrolledWindow and register the set_scroll_adjustments signal in the GtkWidget base class. 4. Allow scrolling inside of an area of 200 x 200 units (for now). In the future, it should be possible to go to infinity.
2010-12-07 00:59:05 +01:00
if (self->priv->adjustment_h)
Win32 bugfixes. * Force redraw on LdCategorySymbolView size allocation. * Fix an infinite loop sometimes caused by update_adjustments().
2012-10-10 20:35:52 +02:00
update_adjustment_value (self, self->priv->adjustment_h,
self->priv->x, allocation.width / scale);
Implement more of LdCanvas. 1. Add methods for coordinate translation between cairo/GtkWidget coordinates and LdDocument coordinates. 2. Draw the grid correctly (also make it significantly faster). 3. Place the canvas into a GtkScrolledWindow and register the set_scroll_adjustments signal in the GtkWidget base class. 4. Allow scrolling inside of an area of 200 x 200 units (for now). In the future, it should be possible to go to infinity.
2010-12-07 00:59:05 +01:00
if (self->priv->adjustment_v)
Win32 bugfixes. * Force redraw on LdCategorySymbolView size allocation. * Fix an infinite loop sometimes caused by update_adjustments().
2012-10-10 20:35:52 +02:00
update_adjustment_value (self, self->priv->adjustment_v,
self->priv->y, allocation.height / scale);
Implement more of LdCanvas. 1. Add methods for coordinate translation between cairo/GtkWidget coordinates and LdDocument coordinates. 2. Draw the grid correctly (also make it significantly faster). 3. Place the canvas into a GtkScrolledWindow and register the set_scroll_adjustments signal in the GtkWidget base class. 4. Allow scrolling inside of an area of 200 x 200 units (for now). In the future, it should be possible to go to infinity.
2010-12-07 00:59:05 +01:00
}
Bind actions to cursor keys in LdCanvas. If there's a selection, move it. Otherwise move the viewport.
2011-02-01 14:43:02 +01:00
static void
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
ld_diagram_view_real_move (LdDiagramView *self, gdouble dx, gdouble dy)
Bind actions to cursor keys in LdCanvas. If there's a selection, move it. Otherwise move the viewport.
2011-02-01 14:43:02 +01:00
{
LdDiagram *diagram;
Refactor ld-canvas.c, extend LdCanvas operations. Now objects can be selected and moved by dragging the mouse.
2011-02-05 16:36:04 +01:00
diagram = self->priv->diagram;
if (!diagram)
return;
Bind actions to cursor keys in LdCanvas. If there's a selection, move it. Otherwise move the viewport.
2011-02-01 14:43:02 +01:00
Refactor ld-canvas.c, extend LdCanvas operations. Now objects can be selected and moved by dragging the mouse.
2011-02-05 16:36:04 +01:00
if (ld_diagram_get_selection (diagram))
move_selection (self, dx, dy);
Bind actions to cursor keys in LdCanvas. If there's a selection, move it. Otherwise move the viewport.
2011-02-01 14:43:02 +01:00
else
{
Add "x" and "y" properties to LdDiagramView. Plus a bit of refactoring.
2011-02-19 14:04:52 +01:00
ld_diagram_view_set_x (self, self->priv->x + dx);
ld_diagram_view_set_y (self, self->priv->y + dy);
Bind actions to cursor keys in LdCanvas. If there's a selection, move it. Otherwise move the viewport.
2011-02-01 14:43:02 +01:00
}
}
Partial refactoring of LdCanvas. draw_symbol() had been doing too much.
2011-01-04 00:45:44 +01:00
/* ===== Generic interface etc. ============================================ */
Started implementing the canvas and the document.
2010-09-17 18:48:02 +02:00
/**
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
* ld_diagram_view_new:
Started implementing the canvas and the document.
2010-09-17 18:48:02 +02:00
*
* Create an instance.
*/
Make ld_canvas_new() return a GtkWidget reference. For consistency with GTK+.
2011-01-24 17:22:37 +01:00
GtkWidget *
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
ld_diagram_view_new (void)
Started implementing the canvas and the document.
2010-09-17 18:48:02 +02:00
{
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
return g_object_new (LD_TYPE_DIAGRAM_VIEW, NULL);
Started implementing the canvas and the document.
2010-09-17 18:48:02 +02:00
}
Implemented a skeleton of LdCanvas. It now paints itself white and draws a simple grid. Also an LdDocument can be assigned to it.
2010-09-19 09:10:16 +02:00
/**
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
* ld_diagram_view_set_diagram:
* @self: an #LdDiagramView object.
* @diagram: the #LdDiagram to be assigned to the view.
Implemented a skeleton of LdCanvas. It now paints itself white and draws a simple grid. Also an LdDocument can be assigned to it.
2010-09-19 09:10:16 +02:00
*
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
* Assign an #LdDiagram object to the view.
Implemented a skeleton of LdCanvas. It now paints itself white and draws a simple grid. Also an LdDocument can be assigned to it.
2010-09-19 09:10:16 +02:00
*/
void
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
ld_diagram_view_set_diagram (LdDiagramView *self, LdDiagram *diagram)
Implemented a skeleton of LdCanvas. It now paints itself white and draws a simple grid. Also an LdDocument can be assigned to it.
2010-09-19 09:10:16 +02:00
{
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
g_return_if_fail (LD_IS_DIAGRAM_VIEW (self));
Rename LdDocument* to LdDiagram*. My bad; this name is much more appropriate.
2010-12-16 11:34:02 +01:00
g_return_if_fail (LD_IS_DIAGRAM (diagram));
Overall cleanup. * Add missing asserts to exported functions. * Unify formatting. * Fix the gtk-doc comment for ld_symbol_category_set_human_name(). * Make ld_library_load() reflect it's declaration. * Remove an unused variable in ld_library_load_cb(). * Change all char's to gchar's.
2010-12-16 05:18:41 +01:00
Rename LdDocument* to LdDiagram*. My bad; this name is much more appropriate.
2010-12-16 11:34:02 +01:00
if (self->priv->diagram)
Redraw LdCanvas on LdDiagram changes.
2011-01-05 11:03:38 +01:00
{
diagram_disconnect_signals (self);
Rename LdDocument* to LdDiagram*. My bad; this name is much more appropriate.
2010-12-16 11:34:02 +01:00
g_object_unref (self->priv->diagram);
Redraw LdCanvas on LdDiagram changes.
2011-01-05 11:03:38 +01:00
}
Add a "library" property to LdCanvas. Also make the code reference properties properly.
2010-11-19 07:05:44 +01:00
Rename LdDocument* to LdDiagram*. My bad; this name is much more appropriate.
2010-12-16 11:34:02 +01:00
self->priv->diagram = diagram;
Redraw LdCanvas on LdDiagram changes.
2011-01-05 11:03:38 +01:00
diagram_connect_signals (self);
Rename LdDocument* to LdDiagram*. My bad; this name is much more appropriate.
2010-12-16 11:34:02 +01:00
g_object_ref (diagram);
Add change notifications to properties. Also fix the "human-name" property in LdSymbolCategory and correct gtk-doc comments for coordinates properties accessors in LdDocumentObject.
2010-12-12 19:03:36 +01:00
Rename LdDocument* to LdDiagram*. My bad; this name is much more appropriate.
2010-12-16 11:34:02 +01:00
g_object_notify (G_OBJECT (self), "diagram");
Implemented a skeleton of LdCanvas. It now paints itself white and draws a simple grid. Also an LdDocument can be assigned to it.
2010-09-19 09:10:16 +02:00
}
/**
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
* ld_diagram_view_get_diagram:
* @self: an #LdDiagramView object.
Implemented a skeleton of LdCanvas. It now paints itself white and draws a simple grid. Also an LdDocument can be assigned to it.
2010-09-19 09:10:16 +02:00
*
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
* Get the #LdDiagram object assigned to this view.
Rename LdDocument* to LdDiagram*. My bad; this name is much more appropriate.
2010-12-16 11:34:02 +01:00
* The reference count on the diagram is not incremented.
Implemented a skeleton of LdCanvas. It now paints itself white and draws a simple grid. Also an LdDocument can be assigned to it.
2010-09-19 09:10:16 +02:00
*/
Rename LdDocument* to LdDiagram*. My bad; this name is much more appropriate.
2010-12-16 11:34:02 +01:00
LdDiagram *
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
ld_diagram_view_get_diagram (LdDiagramView *self)
Implemented a skeleton of LdCanvas. It now paints itself white and draws a simple grid. Also an LdDocument can be assigned to it.
2010-09-19 09:10:16 +02:00
{
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
g_return_val_if_fail (LD_IS_DIAGRAM_VIEW (self), NULL);
Rename LdDocument* to LdDiagram*. My bad; this name is much more appropriate.
2010-12-16 11:34:02 +01:00
return self->priv->diagram;
Implemented a skeleton of LdCanvas. It now paints itself white and draws a simple grid. Also an LdDocument can be assigned to it.
2010-09-19 09:10:16 +02:00
}
Redraw LdCanvas on LdDiagram changes.
2011-01-05 11:03:38 +01:00
static void
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
diagram_connect_signals (LdDiagramView *self)
Redraw LdCanvas on LdDiagram changes.
2011-01-05 11:03:38 +01:00
{
g_return_if_fail (LD_IS_DIAGRAM (self->priv->diagram));
g_signal_connect_swapped (self->priv->diagram, "changed",
G_CALLBACK (gtk_widget_queue_draw), self);
g_signal_connect_swapped (self->priv->diagram, "selection-changed",
G_CALLBACK (gtk_widget_queue_draw), self);
}
static void
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
diagram_disconnect_signals (LdDiagramView *self)
Redraw LdCanvas on LdDiagram changes.
2011-01-05 11:03:38 +01:00
{
g_return_if_fail (LD_IS_DIAGRAM (self->priv->diagram));
g_signal_handlers_disconnect_matched (self->priv->diagram,
G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, 0, 0, NULL,
gtk_widget_queue_draw, self);
}
Add a "library" property to LdCanvas. Also make the code reference properties properly.
2010-11-19 07:05:44 +01:00
/**
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
* ld_diagram_view_set_library:
* @self: an #LdDiagramView object.
* @library: the #LdLibrary to be assigned to the view.
Add a "library" property to LdCanvas. Also make the code reference properties properly.
2010-11-19 07:05:44 +01:00
*
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
* Assign an #LdLibrary object to the view.
Add a "library" property to LdCanvas. Also make the code reference properties properly.
2010-11-19 07:05:44 +01:00
*/
void
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
ld_diagram_view_set_library (LdDiagramView *self, LdLibrary *library)
Add a "library" property to LdCanvas. Also make the code reference properties properly.
2010-11-19 07:05:44 +01:00
{
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
g_return_if_fail (LD_IS_DIAGRAM_VIEW (self));
Overall cleanup. * Add missing asserts to exported functions. * Unify formatting. * Fix the gtk-doc comment for ld_symbol_category_set_human_name(). * Make ld_library_load() reflect it's declaration. * Remove an unused variable in ld_library_load_cb(). * Change all char's to gchar's.
2010-12-16 05:18:41 +01:00
g_return_if_fail (LD_IS_LIBRARY (library));
Add a "library" property to LdCanvas. Also make the code reference properties properly.
2010-11-19 07:05:44 +01:00
if (self->priv->library)
g_object_unref (self->priv->library);
self->priv->library = library;
g_object_ref (library);
Add change notifications to properties. Also fix the "human-name" property in LdSymbolCategory and correct gtk-doc comments for coordinates properties accessors in LdDocumentObject.
2010-12-12 19:03:36 +01:00
g_object_notify (G_OBJECT (self), "library");
Add a "library" property to LdCanvas. Also make the code reference properties properly.
2010-11-19 07:05:44 +01:00
}
/**
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
* ld_diagram_view_get_library:
* @self: an #LdDiagramView object.
Add a "library" property to LdCanvas. Also make the code reference properties properly.
2010-11-19 07:05:44 +01:00
*
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
* Get the #LdLibrary object assigned to this view.
Add a "library" property to LdCanvas. Also make the code reference properties properly.
2010-11-19 07:05:44 +01:00
* The reference count on the library is not incremented.
*/
LdLibrary *
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
ld_diagram_view_get_library (LdDiagramView *self)
Add a "library" property to LdCanvas. Also make the code reference properties properly.
2010-11-19 07:05:44 +01:00
{
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
g_return_val_if_fail (LD_IS_DIAGRAM_VIEW (self), NULL);
Add a "library" property to LdCanvas. Also make the code reference properties properly.
2010-11-19 07:05:44 +01:00
return self->priv->library;
}
Implement more of LdCanvas. 1. Add methods for coordinate translation between cairo/GtkWidget coordinates and LdDocument coordinates. 2. Draw the grid correctly (also make it significantly faster). 3. Place the canvas into a GtkScrolledWindow and register the set_scroll_adjustments signal in the GtkWidget base class. 4. Allow scrolling inside of an area of 200 x 200 units (for now). In the future, it should be possible to go to infinity.
2010-12-07 00:59:05 +01:00
/*
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
* ld_diagram_view_get_base_unit_in_px:
Fix program messages and gtk-doc comments.
2011-01-28 17:39:40 +01:00
* @self: a #GtkWidget object to retrieve DPI from (indirectly).
Implement more of LdCanvas. 1. Add methods for coordinate translation between cairo/GtkWidget coordinates and LdDocument coordinates. 2. Draw the grid correctly (also make it significantly faster). 3. Place the canvas into a GtkScrolledWindow and register the set_scroll_adjustments signal in the GtkWidget base class. 4. Allow scrolling inside of an area of 200 x 200 units (for now). In the future, it should be possible to go to infinity.
2010-12-07 00:59:05 +01:00
*
Fix program messages and gtk-doc comments.
2011-01-28 17:39:40 +01:00
* Return value: length of the base unit in pixels.
Implement more of LdCanvas. 1. Add methods for coordinate translation between cairo/GtkWidget coordinates and LdDocument coordinates. 2. Draw the grid correctly (also make it significantly faster). 3. Place the canvas into a GtkScrolledWindow and register the set_scroll_adjustments signal in the GtkWidget base class. 4. Allow scrolling inside of an area of 200 x 200 units (for now). In the future, it should be possible to go to infinity.
2010-12-07 00:59:05 +01:00
*/
static gdouble
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
ld_diagram_view_get_base_unit_in_px (GtkWidget *self)
Implement more of LdCanvas. 1. Add methods for coordinate translation between cairo/GtkWidget coordinates and LdDocument coordinates. 2. Draw the grid correctly (also make it significantly faster). 3. Place the canvas into a GtkScrolledWindow and register the set_scroll_adjustments signal in the GtkWidget base class. 4. Allow scrolling inside of an area of 200 x 200 units (for now). In the future, it should be possible to go to infinity.
2010-12-07 00:59:05 +01:00
{
Fix problems discovered while testing on Windows. * Set the working directory for glib-genmarshal correctly. * Use one more path suffix when searching for glibconfig.h. * Don't assume that gdk_screen_get_resolution() returns a useful value.
2010-12-20 05:20:21 +01:00
gdouble resolution;
Implement more of LdCanvas. 1. Add methods for coordinate translation between cairo/GtkWidget coordinates and LdDocument coordinates. 2. Draw the grid correctly (also make it significantly faster). 3. Place the canvas into a GtkScrolledWindow and register the set_scroll_adjustments signal in the GtkWidget base class. 4. Allow scrolling inside of an area of 200 x 200 units (for now). In the future, it should be possible to go to infinity.
2010-12-07 00:59:05 +01:00
g_return_val_if_fail (GTK_IS_WIDGET (self), 1);
Fix problems discovered while testing on Windows. * Set the working directory for glib-genmarshal correctly. * Use one more path suffix when searching for glibconfig.h. * Don't assume that gdk_screen_get_resolution() returns a useful value.
2010-12-20 05:20:21 +01:00
resolution = gdk_screen_get_resolution (gtk_widget_get_screen (self));
if (resolution == -1)
resolution = DEFAULT_SCREEN_RESOLUTION;
Implement more of LdCanvas. 1. Add methods for coordinate translation between cairo/GtkWidget coordinates and LdDocument coordinates. 2. Draw the grid correctly (also make it significantly faster). 3. Place the canvas into a GtkScrolledWindow and register the set_scroll_adjustments signal in the GtkWidget base class. 4. Allow scrolling inside of an area of 200 x 200 units (for now). In the future, it should be possible to go to infinity.
2010-12-07 00:59:05 +01:00
/* XXX: It might look better if the unit was rounded to a whole number. */
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
return resolution / MM_PER_INCH * LD_DIAGRAM_VIEW_BASE_UNIT_LENGTH;
Implement more of LdCanvas. 1. Add methods for coordinate translation between cairo/GtkWidget coordinates and LdDocument coordinates. 2. Draw the grid correctly (also make it significantly faster). 3. Place the canvas into a GtkScrolledWindow and register the set_scroll_adjustments signal in the GtkWidget base class. 4. Allow scrolling inside of an area of 200 x 200 units (for now). In the future, it should be possible to go to infinity.
2010-12-07 00:59:05 +01:00
}
/*
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
* ld_diagram_view_get_scale_in_px:
* @self: an #LdDiagramView object.
Implement more of LdCanvas. 1. Add methods for coordinate translation between cairo/GtkWidget coordinates and LdDocument coordinates. 2. Draw the grid correctly (also make it significantly faster). 3. Place the canvas into a GtkScrolledWindow and register the set_scroll_adjustments signal in the GtkWidget base class. 4. Allow scrolling inside of an area of 200 x 200 units (for now). In the future, it should be possible to go to infinity.
2010-12-07 00:59:05 +01:00
*
Fix program messages and gtk-doc comments.
2011-01-28 17:39:40 +01:00
* Return value: displayed length of the base unit in pixels.
Implement more of LdCanvas. 1. Add methods for coordinate translation between cairo/GtkWidget coordinates and LdDocument coordinates. 2. Draw the grid correctly (also make it significantly faster). 3. Place the canvas into a GtkScrolledWindow and register the set_scroll_adjustments signal in the GtkWidget base class. 4. Allow scrolling inside of an area of 200 x 200 units (for now). In the future, it should be possible to go to infinity.
2010-12-07 00:59:05 +01:00
*/
static gdouble
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
ld_diagram_view_get_scale_in_px (LdDiagramView *self)
Implement more of LdCanvas. 1. Add methods for coordinate translation between cairo/GtkWidget coordinates and LdDocument coordinates. 2. Draw the grid correctly (also make it significantly faster). 3. Place the canvas into a GtkScrolledWindow and register the set_scroll_adjustments signal in the GtkWidget base class. 4. Allow scrolling inside of an area of 200 x 200 units (for now). In the future, it should be possible to go to infinity.
2010-12-07 00:59:05 +01:00
{
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
g_return_val_if_fail (LD_IS_DIAGRAM_VIEW (self), 1);
Implement more of LdCanvas. 1. Add methods for coordinate translation between cairo/GtkWidget coordinates and LdDocument coordinates. 2. Draw the grid correctly (also make it significantly faster). 3. Place the canvas into a GtkScrolledWindow and register the set_scroll_adjustments signal in the GtkWidget base class. 4. Allow scrolling inside of an area of 200 x 200 units (for now). In the future, it should be possible to go to infinity.
2010-12-07 00:59:05 +01:00
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
return ld_diagram_view_get_base_unit_in_px (GTK_WIDGET (self))
Implement more of LdCanvas. 1. Add methods for coordinate translation between cairo/GtkWidget coordinates and LdDocument coordinates. 2. Draw the grid correctly (also make it significantly faster). 3. Place the canvas into a GtkScrolledWindow and register the set_scroll_adjustments signal in the GtkWidget base class. 4. Allow scrolling inside of an area of 200 x 200 units (for now). In the future, it should be possible to go to infinity.
2010-12-07 00:59:05 +01:00
* self->priv->zoom;
}
/**
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
* ld_diagram_view_widget_to_diagram_coords:
* @self: an #LdDiagramView object.
Fix program messages and gtk-doc comments.
2011-01-28 17:39:40 +01:00
* @wx: the X coordinate to be translated.
* @wy: the Y coordinate to be translated.
* @dx: (out): the translated X coordinate.
* @dy: (out): the translated Y coordinate.
Implement more of LdCanvas. 1. Add methods for coordinate translation between cairo/GtkWidget coordinates and LdDocument coordinates. 2. Draw the grid correctly (also make it significantly faster). 3. Place the canvas into a GtkScrolledWindow and register the set_scroll_adjustments signal in the GtkWidget base class. 4. Allow scrolling inside of an area of 200 x 200 units (for now). In the future, it should be possible to go to infinity.
2010-12-07 00:59:05 +01:00
*
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
* Translate widget coordinates into diagram coordinates.
Implement more of LdCanvas. 1. Add methods for coordinate translation between cairo/GtkWidget coordinates and LdDocument coordinates. 2. Draw the grid correctly (also make it significantly faster). 3. Place the canvas into a GtkScrolledWindow and register the set_scroll_adjustments signal in the GtkWidget base class. 4. Allow scrolling inside of an area of 200 x 200 units (for now). In the future, it should be possible to go to infinity.
2010-12-07 00:59:05 +01:00
*/
void
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
ld_diagram_view_widget_to_diagram_coords (LdDiagramView *self,
Split in-out parameters into separate in and out. In functions: ld_canvas_diagram_to_widget_coords() ld_canvas_widget_to_diagram_coords()
2011-01-03 05:57:22 +01:00
gdouble wx, gdouble wy, gdouble *dx, gdouble *dy)
Implement more of LdCanvas. 1. Add methods for coordinate translation between cairo/GtkWidget coordinates and LdDocument coordinates. 2. Draw the grid correctly (also make it significantly faster). 3. Place the canvas into a GtkScrolledWindow and register the set_scroll_adjustments signal in the GtkWidget base class. 4. Allow scrolling inside of an area of 200 x 200 units (for now). In the future, it should be possible to go to infinity.
2010-12-07 00:59:05 +01:00
{
Get more GTK+ 3 ready and respect seals.
2012-08-31 15:23:02 +02:00
GtkAllocation allocation;
Implement more of LdCanvas. 1. Add methods for coordinate translation between cairo/GtkWidget coordinates and LdDocument coordinates. 2. Draw the grid correctly (also make it significantly faster). 3. Place the canvas into a GtkScrolledWindow and register the set_scroll_adjustments signal in the GtkWidget base class. 4. Allow scrolling inside of an area of 200 x 200 units (for now). In the future, it should be possible to go to infinity.
2010-12-07 00:59:05 +01:00
gdouble scale;
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
g_return_if_fail (LD_IS_DIAGRAM_VIEW (self));
Split in-out parameters into separate in and out. In functions: ld_canvas_diagram_to_widget_coords() ld_canvas_widget_to_diagram_coords()
2011-01-03 05:57:22 +01:00
g_return_if_fail (dx != NULL);
g_return_if_fail (dy != NULL);
Implement more of LdCanvas. 1. Add methods for coordinate translation between cairo/GtkWidget coordinates and LdDocument coordinates. 2. Draw the grid correctly (also make it significantly faster). 3. Place the canvas into a GtkScrolledWindow and register the set_scroll_adjustments signal in the GtkWidget base class. 4. Allow scrolling inside of an area of 200 x 200 units (for now). In the future, it should be possible to go to infinity.
2010-12-07 00:59:05 +01:00
Get more GTK+ 3 ready and respect seals.
2012-08-31 15:23:02 +02:00
gtk_widget_get_allocation (GTK_WIDGET (self), &allocation);
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
scale = ld_diagram_view_get_scale_in_px (self);
Implement more of LdCanvas. 1. Add methods for coordinate translation between cairo/GtkWidget coordinates and LdDocument coordinates. 2. Draw the grid correctly (also make it significantly faster). 3. Place the canvas into a GtkScrolledWindow and register the set_scroll_adjustments signal in the GtkWidget base class. 4. Allow scrolling inside of an area of 200 x 200 units (for now). In the future, it should be possible to go to infinity.
2010-12-07 00:59:05 +01:00
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
/* We know diagram coordinates of the center of view, so we may
Implement more of LdCanvas. 1. Add methods for coordinate translation between cairo/GtkWidget coordinates and LdDocument coordinates. 2. Draw the grid correctly (also make it significantly faster). 3. Place the canvas into a GtkScrolledWindow and register the set_scroll_adjustments signal in the GtkWidget base class. 4. Allow scrolling inside of an area of 200 x 200 units (for now). In the future, it should be possible to go to infinity.
2010-12-07 00:59:05 +01:00
* translate the given X and Y coordinates to this center and then scale
LdCanvas maintenance. * Rename ld_canvas_translate_*_coordinates() to ld_canvas_*_to_*_coords(). * Add missing parameter assertions to those functions. * Rename local variables in draw_grid(). * Use gdk_cairo_rectangle() in expose-event handler. * Update comments.
2010-12-18 05:23:05 +01:00
* them by dividing them by the current scale.
Implement more of LdCanvas. 1. Add methods for coordinate translation between cairo/GtkWidget coordinates and LdDocument coordinates. 2. Draw the grid correctly (also make it significantly faster). 3. Place the canvas into a GtkScrolledWindow and register the set_scroll_adjustments signal in the GtkWidget base class. 4. Allow scrolling inside of an area of 200 x 200 units (for now). In the future, it should be possible to go to infinity.
2010-12-07 00:59:05 +01:00
*/
Get more GTK+ 3 ready and respect seals.
2012-08-31 15:23:02 +02:00
*dx = self->priv->x + (wx - (allocation.width * 0.5)) / scale;
*dy = self->priv->y + (wy - (allocation.height * 0.5)) / scale;
Implement more of LdCanvas. 1. Add methods for coordinate translation between cairo/GtkWidget coordinates and LdDocument coordinates. 2. Draw the grid correctly (also make it significantly faster). 3. Place the canvas into a GtkScrolledWindow and register the set_scroll_adjustments signal in the GtkWidget base class. 4. Allow scrolling inside of an area of 200 x 200 units (for now). In the future, it should be possible to go to infinity.
2010-12-07 00:59:05 +01:00
}
/**
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
* ld_diagram_view_diagram_to_widget_coords:
* @self: an #LdDiagramView object.
Fix program messages and gtk-doc comments.
2011-01-28 17:39:40 +01:00
* @dx: the X coordinate to be translated.
* @dy: the Y coordinate to be translated.
* @wx: (out): the translated X coordinate.
* @wy: (out): the translated Y coordinate.
Implement more of LdCanvas. 1. Add methods for coordinate translation between cairo/GtkWidget coordinates and LdDocument coordinates. 2. Draw the grid correctly (also make it significantly faster). 3. Place the canvas into a GtkScrolledWindow and register the set_scroll_adjustments signal in the GtkWidget base class. 4. Allow scrolling inside of an area of 200 x 200 units (for now). In the future, it should be possible to go to infinity.
2010-12-07 00:59:05 +01:00
*
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
* Translate diagram coordinates into widget coordinates.
Implement more of LdCanvas. 1. Add methods for coordinate translation between cairo/GtkWidget coordinates and LdDocument coordinates. 2. Draw the grid correctly (also make it significantly faster). 3. Place the canvas into a GtkScrolledWindow and register the set_scroll_adjustments signal in the GtkWidget base class. 4. Allow scrolling inside of an area of 200 x 200 units (for now). In the future, it should be possible to go to infinity.
2010-12-07 00:59:05 +01:00
*/
void
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
ld_diagram_view_diagram_to_widget_coords (LdDiagramView *self,
Split in-out parameters into separate in and out. In functions: ld_canvas_diagram_to_widget_coords() ld_canvas_widget_to_diagram_coords()
2011-01-03 05:57:22 +01:00
gdouble dx, gdouble dy, gdouble *wx, gdouble *wy)
Implement more of LdCanvas. 1. Add methods for coordinate translation between cairo/GtkWidget coordinates and LdDocument coordinates. 2. Draw the grid correctly (also make it significantly faster). 3. Place the canvas into a GtkScrolledWindow and register the set_scroll_adjustments signal in the GtkWidget base class. 4. Allow scrolling inside of an area of 200 x 200 units (for now). In the future, it should be possible to go to infinity.
2010-12-07 00:59:05 +01:00
{
Get more GTK+ 3 ready and respect seals.
2012-08-31 15:23:02 +02:00
GtkAllocation allocation;
Implement more of LdCanvas. 1. Add methods for coordinate translation between cairo/GtkWidget coordinates and LdDocument coordinates. 2. Draw the grid correctly (also make it significantly faster). 3. Place the canvas into a GtkScrolledWindow and register the set_scroll_adjustments signal in the GtkWidget base class. 4. Allow scrolling inside of an area of 200 x 200 units (for now). In the future, it should be possible to go to infinity.
2010-12-07 00:59:05 +01:00
gdouble scale;
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
g_return_if_fail (LD_IS_DIAGRAM_VIEW (self));
Split in-out parameters into separate in and out. In functions: ld_canvas_diagram_to_widget_coords() ld_canvas_widget_to_diagram_coords()
2011-01-03 05:57:22 +01:00
g_return_if_fail (wx != NULL);
g_return_if_fail (wy != NULL);
Implement more of LdCanvas. 1. Add methods for coordinate translation between cairo/GtkWidget coordinates and LdDocument coordinates. 2. Draw the grid correctly (also make it significantly faster). 3. Place the canvas into a GtkScrolledWindow and register the set_scroll_adjustments signal in the GtkWidget base class. 4. Allow scrolling inside of an area of 200 x 200 units (for now). In the future, it should be possible to go to infinity.
2010-12-07 00:59:05 +01:00
Get more GTK+ 3 ready and respect seals.
2012-08-31 15:23:02 +02:00
gtk_widget_get_allocation (GTK_WIDGET (self), &allocation);
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
scale = ld_diagram_view_get_scale_in_px (self);
Implement more of LdCanvas. 1. Add methods for coordinate translation between cairo/GtkWidget coordinates and LdDocument coordinates. 2. Draw the grid correctly (also make it significantly faster). 3. Place the canvas into a GtkScrolledWindow and register the set_scroll_adjustments signal in the GtkWidget base class. 4. Allow scrolling inside of an area of 200 x 200 units (for now). In the future, it should be possible to go to infinity.
2010-12-07 00:59:05 +01:00
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
/* Just the reversal of ld_diagram_view_widget_to_diagram_coords(). */
Get more GTK+ 3 ready and respect seals.
2012-08-31 15:23:02 +02:00
*wx = scale * (dx - self->priv->x) + 0.5 * allocation.width;
*wy = scale * (dy - self->priv->y) + 0.5 * allocation.height;
Implement more of LdCanvas. 1. Add methods for coordinate translation between cairo/GtkWidget coordinates and LdDocument coordinates. 2. Draw the grid correctly (also make it significantly faster). 3. Place the canvas into a GtkScrolledWindow and register the set_scroll_adjustments signal in the GtkWidget base class. 4. Allow scrolling inside of an area of 200 x 200 units (for now). In the future, it should be possible to go to infinity.
2010-12-07 00:59:05 +01:00
}
Add "x" and "y" properties to LdDiagramView. Plus a bit of refactoring.
2011-02-19 14:04:52 +01:00
/**
* ld_diagram_view_get_x:
* @self: an #LdDiagramView object.
*
* Return value: the X coordinate of the center of view.
*/
gdouble
ld_diagram_view_get_x (LdDiagramView *self)
{
g_return_val_if_fail (LD_IS_DIAGRAM_VIEW (self), 0);
return self->priv->x;
}
/**
* ld_diagram_view_set_x:
* @self: an #LdDiagramView object.
Fix gtk-doc comments.
2011-02-20 13:39:44 +01:00
* @x: the X coordinate.
Add "x" and "y" properties to LdDiagramView. Plus a bit of refactoring.
2011-02-19 14:04:52 +01:00
*
* Set the X coordinate of the center of view.
*/
void
ld_diagram_view_set_x (LdDiagramView *self, gdouble x)
{
g_return_if_fail (LD_IS_DIAGRAM_VIEW (self));
Fix motion simulation
2015-01-20 09:07:58 +01:00
if (self->priv->x == x)
return;
Add "x" and "y" properties to LdDiagramView. Plus a bit of refactoring.
2011-02-19 14:04:52 +01:00
/* TODO: Check boundaries. */
self->priv->x = x;
simulate_motion (self);
update_adjustments (self);
gtk_widget_queue_draw (GTK_WIDGET (self));
g_object_notify (G_OBJECT (self), "x");
}
/**
* ld_diagram_view_get_x:
* @self: an #LdDiagramView object.
*
* Return value: the X coordinate of the center of view.
*/
gdouble
ld_diagram_view_get_y (LdDiagramView *self)
{
g_return_val_if_fail (LD_IS_DIAGRAM_VIEW (self), 0);
return self->priv->y;
}
/**
* ld_diagram_view_set_y:
* @self: an #LdDiagramView object.
Fix gtk-doc comments.
2011-02-20 13:39:44 +01:00
* @y: the Y coordinate.
Add "x" and "y" properties to LdDiagramView. Plus a bit of refactoring.
2011-02-19 14:04:52 +01:00
*
* Set the Y coordinate of the center of view.
*/
void
ld_diagram_view_set_y (LdDiagramView *self, gdouble y)
{
g_return_if_fail (LD_IS_DIAGRAM_VIEW (self));
Fix motion simulation
2015-01-20 09:07:58 +01:00
if (self->priv->y == y)
return;
Add "x" and "y" properties to LdDiagramView. Plus a bit of refactoring.
2011-02-19 14:04:52 +01:00
/* TODO: Check boundaries. */
self->priv->y = y;
simulate_motion (self);
update_adjustments (self);
gtk_widget_queue_draw (GTK_WIDGET (self));
g_object_notify (G_OBJECT (self), "y");
}
Add a "zoom" property to LdCanvas.
2011-01-09 08:15:47 +01:00
/**
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
* ld_diagram_view_get_zoom:
* @self: an #LdDiagramView object.
Add a "zoom" property to LdCanvas.
2011-01-09 08:15:47 +01:00
*
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
* Return value: zoom of the view.
Add a "zoom" property to LdCanvas.
2011-01-09 08:15:47 +01:00
*/
gdouble
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
ld_diagram_view_get_zoom (LdDiagramView *self)
Add a "zoom" property to LdCanvas.
2011-01-09 08:15:47 +01:00
{
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
g_return_val_if_fail (LD_IS_DIAGRAM_VIEW (self), -1);
Add a "zoom" property to LdCanvas.
2011-01-09 08:15:47 +01:00
return self->priv->zoom;
}
/**
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
* ld_diagram_view_set_zoom:
* @self: an #LdDiagramView object.
Fix program messages and gtk-doc comments.
2011-01-28 17:39:40 +01:00
* @zoom: the zoom.
Add a "zoom" property to LdCanvas.
2011-01-09 08:15:47 +01:00
*
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
* Set zoom of the view.
Add a "zoom" property to LdCanvas.
2011-01-09 08:15:47 +01:00
*/
void
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
ld_diagram_view_set_zoom (LdDiagramView *self, gdouble zoom)
Add a "zoom" property to LdCanvas.
2011-01-09 08:15:47 +01:00
{
gdouble clamped_zoom;
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
g_return_if_fail (LD_IS_DIAGRAM_VIEW (self));
Add a "zoom" property to LdCanvas.
2011-01-09 08:15:47 +01:00
clamped_zoom = CLAMP (zoom, ZOOM_MIN, ZOOM_MAX);
if (self->priv->zoom == clamped_zoom)
return;
self->priv->zoom = clamped_zoom;
Simulate motion events when needed.
2011-01-10 04:24:16 +01:00
simulate_motion (self);
Add a "zoom" property to LdCanvas.
2011-01-09 08:15:47 +01:00
update_adjustments (self);
gtk_widget_queue_draw (GTK_WIDGET (self));
g_object_notify (G_OBJECT (self), "zoom");
}
Implement zooming in LdWindowMain. Add convenience methods to LdCanvas.
2011-02-04 20:19:01 +01:00
/**
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
* ld_diagram_view_can_zoom_in:
* @self: an #LdDiagramView object.
Implement zooming in LdWindowMain. Add convenience methods to LdCanvas.
2011-02-04 20:19:01 +01:00
*
* Return value: %TRUE if the view can be zoomed in.
*/
gboolean
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
ld_diagram_view_can_zoom_in (LdDiagramView *self)
Implement zooming in LdWindowMain. Add convenience methods to LdCanvas.
2011-02-04 20:19:01 +01:00
{
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
g_return_val_if_fail (LD_IS_DIAGRAM_VIEW (self), FALSE);
Implement zooming in LdWindowMain. Add convenience methods to LdCanvas.
2011-02-04 20:19:01 +01:00
return self->priv->zoom < ZOOM_MAX;
}
/**
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
* ld_diagram_view_can_zoom_out:
* @self: an #LdDiagramView object.
Implement zooming in LdWindowMain. Add convenience methods to LdCanvas.
2011-02-04 20:19:01 +01:00
*
* Return value: %TRUE if the view can be zoomed out.
*/
gboolean
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
ld_diagram_view_can_zoom_out (LdDiagramView *self)
Implement zooming in LdWindowMain. Add convenience methods to LdCanvas.
2011-02-04 20:19:01 +01:00
{
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
g_return_val_if_fail (LD_IS_DIAGRAM_VIEW (self), FALSE);
Implement zooming in LdWindowMain. Add convenience methods to LdCanvas.
2011-02-04 20:19:01 +01:00
return self->priv->zoom > ZOOM_MIN;
}
/**
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
* ld_diagram_view_zoom_in:
* @self: an #LdDiagramView object.
Implement zooming in LdWindowMain. Add convenience methods to LdCanvas.
2011-02-04 20:19:01 +01:00
*
* Zoom the view in.
*/
void
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
ld_diagram_view_zoom_in (LdDiagramView *self)
Implement zooming in LdWindowMain. Add convenience methods to LdCanvas.
2011-02-04 20:19:01 +01:00
{
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
g_return_if_fail (LD_IS_DIAGRAM_VIEW (self));
ld_diagram_view_set_zoom (self, self->priv->zoom * ZOOM_STEP);
Implement zooming in LdWindowMain. Add convenience methods to LdCanvas.
2011-02-04 20:19:01 +01:00
}
/**
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
* ld_diagram_view_zoom_out:
* @self: an #LdDiagramView object.
Implement zooming in LdWindowMain. Add convenience methods to LdCanvas.
2011-02-04 20:19:01 +01:00
*
* Zoom the view out.
*/
void
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
ld_diagram_view_zoom_out (LdDiagramView *self)
Implement zooming in LdWindowMain. Add convenience methods to LdCanvas.
2011-02-04 20:19:01 +01:00
{
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
g_return_if_fail (LD_IS_DIAGRAM_VIEW (self));
ld_diagram_view_set_zoom (self, self->priv->zoom / ZOOM_STEP);
Implement zooming in LdWindowMain. Add convenience methods to LdCanvas.
2011-02-04 20:19:01 +01:00
}
Add API for turning off the grid.
2011-03-06 15:56:41 +01:00
/**
* ld_diagram_view_get_show_grid:
* @self: an #LdDiagramView object.
*
* Return value: whether the grid is shown.
*/
gboolean
ld_diagram_view_get_show_grid (LdDiagramView *self)
{
g_return_val_if_fail (LD_IS_DIAGRAM_VIEW (self), FALSE);
return self->priv->show_grid;
}
/**
* ld_diagram_view_set_show_grid:
* @self: an #LdDiagramView object.
* @show_grid: whether to show the grid.
*
* Set whether the grid is shown.
*/
void
ld_diagram_view_set_show_grid (LdDiagramView *self, gboolean show_grid)
{
g_return_if_fail (LD_IS_DIAGRAM_VIEW (self));
self->priv->show_grid = show_grid;
gtk_widget_queue_draw (GTK_WIDGET (self));
}
Partial refactoring of LdCanvas. draw_symbol() had been doing too much.
2011-01-04 00:45:44 +01:00
Refactor ld-canvas.c, extend LdCanvas operations. Now objects can be selected and moved by dragging the mouse.
2011-02-05 16:36:04 +01:00
/* ===== Helper functions ================================================== */
Partial refactoring of LdCanvas. draw_symbol() had been doing too much.
2011-01-04 00:45:44 +01:00
Draw selected objects with another color. Store all colors in LdCanvasPrivate and initialize them upon object creation. This creates a base for color themes. Make attempts to try adding an object that's not a part of the document to the selection issue a warning.
2011-01-05 01:11:03 +01:00
static void
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
color_set (Color *color, gdouble r, gdouble g, gdouble b, gdouble a)
Draw selected objects with another color. Store all colors in LdCanvasPrivate and initialize them upon object creation. This creates a base for color themes. Make attempts to try adding an object that's not a part of the document to the selection issue a warning.
2011-01-05 01:11:03 +01:00
{
color->r = r;
color->g = g;
color->b = b;
color->a = a;
}
static void
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
color_apply (Color *color, cairo_t *cr)
Draw selected objects with another color. Store all colors in LdCanvasPrivate and initialize them upon object creation. This creates a base for color themes. Make attempts to try adding an object that's not a part of the document to the selection issue a warning.
2011-01-05 01:11:03 +01:00
{
cairo_set_source_rgba (cr, color->r, color->g, color->b, color->a);
}
Speed up drawing of the grid.
2011-02-10 06:03:41 +01:00
static guint32
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
color_to_cairo_argb (Color *color)
Speed up drawing of the grid.
2011-02-10 06:03:41 +01:00
{
return (guint) (color->a * 255) << 24
| (guint) (color->r * color->a * 255) << 16
| (guint) (color->g * color->a * 255) << 8
| (guint) (color->b * color->a * 255);
}
Add support for LdDiagramConnection to LdCanvas. Heavy LdCanvas refactoring, some modifications to ld-types. It just wasn't possible for me to further work with an old, 2000 lines long file without shuffling everything around at the same time.
2011-02-07 01:10:17 +01:00
static gdouble
point_to_line_segment_distance
(const LdPoint *point, const LdPoint *p1, const LdPoint *p2)
Refactor ld-canvas.c, extend LdCanvas operations. Now objects can be selected and moved by dragging the mouse.
2011-02-05 16:36:04 +01:00
{
Add support for LdDiagramConnection to LdCanvas. Heavy LdCanvas refactoring, some modifications to ld-types. It just wasn't possible for me to further work with an old, 2000 lines long file without shuffling everything around at the same time.
2011-02-07 01:10:17 +01:00
gdouble dx, dy, u;
Refactor ld-canvas.c, extend LdCanvas operations. Now objects can be selected and moved by dragging the mouse.
2011-02-05 16:36:04 +01:00
Add support for LdDiagramConnection to LdCanvas. Heavy LdCanvas refactoring, some modifications to ld-types. It just wasn't possible for me to further work with an old, 2000 lines long file without shuffling everything around at the same time.
2011-02-07 01:10:17 +01:00
dx = p2->x - p1->x;
dy = p2->y - p1->y;
Refactor ld-canvas.c, extend LdCanvas operations. Now objects can be selected and moved by dragging the mouse.
2011-02-05 16:36:04 +01:00
Add support for LdDiagramConnection to LdCanvas. Heavy LdCanvas refactoring, some modifications to ld-types. It just wasn't possible for me to further work with an old, 2000 lines long file without shuffling everything around at the same time.
2011-02-07 01:10:17 +01:00
if (dx == 0. && dy == 0.)
return ld_point_distance (point, p1->x, p1->y);
Refactor ld-canvas.c, extend LdCanvas operations. Now objects can be selected and moved by dragging the mouse.
2011-02-05 16:36:04 +01:00
Add support for LdDiagramConnection to LdCanvas. Heavy LdCanvas refactoring, some modifications to ld-types. It just wasn't possible for me to further work with an old, 2000 lines long file without shuffling everything around at the same time.
2011-02-07 01:10:17 +01:00
/* Find projection of the point onto the line. */
u = ((point->x - p1->x) * dx + (point->y - p1->y) * dy)
/ (dx * dx + dy * dy);
Refactor ld-canvas.c, extend LdCanvas operations. Now objects can be selected and moved by dragging the mouse.
2011-02-05 16:36:04 +01:00
Add support for LdDiagramConnection to LdCanvas. Heavy LdCanvas refactoring, some modifications to ld-types. It just wasn't possible for me to further work with an old, 2000 lines long file without shuffling everything around at the same time.
2011-02-07 01:10:17 +01:00
/* The projection is beyond the line segment. */
if (u < 0.)
return ld_point_distance (point, p1->x, p1->y);
else if (u > 1.)
return ld_point_distance (point, p2->x, p2->y);
/* The projection is on the line segment. */
return ld_point_distance (point, p1->x + u * dx, p1->y + u * dy);
}
/* ===== Generic functions ================================================= */
static gboolean
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
object_hit_test (LdDiagramView *self, LdDiagramObject *object,
const LdPoint *point)
Add support for LdDiagramConnection to LdCanvas. Heavy LdCanvas refactoring, some modifications to ld-types. It just wasn't possible for me to further work with an old, 2000 lines long file without shuffling everything around at the same time.
2011-02-07 01:10:17 +01:00
{
if (LD_IS_DIAGRAM_SYMBOL (object))
return symbol_hit_test (self,
LD_DIAGRAM_SYMBOL (object), point);
if (LD_IS_DIAGRAM_CONNECTION (object))
return connection_hit_test (self,
LD_DIAGRAM_CONNECTION (object), point);
return FALSE;
}
static gboolean
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
get_object_clip_area (LdDiagramView *self,
Add support for LdDiagramConnection to LdCanvas. Heavy LdCanvas refactoring, some modifications to ld-types. It just wasn't possible for me to further work with an old, 2000 lines long file without shuffling everything around at the same time.
2011-02-07 01:10:17 +01:00
LdDiagramObject *object, LdRectangle *rect)
{
if (LD_IS_DIAGRAM_SYMBOL (object))
return get_symbol_clip_area (self,
LD_DIAGRAM_SYMBOL (object), rect);
if (LD_IS_DIAGRAM_CONNECTION (object))
return get_connection_clip_area (self,
LD_DIAGRAM_CONNECTION (object), rect);
return FALSE;
Refactor ld-canvas.c, extend LdCanvas operations. Now objects can be selected and moved by dragging the mouse.
2011-02-05 16:36:04 +01:00
}
Make adding symbols to the diagram possible. This required creating a simple framework for operations to LdCanvas. It is probable that it's going to require some changes when other operations are added. The basic idea behind it seems to be good, though.
2011-01-04 09:54:05 +01:00
static void
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
move_object_to_point (LdDiagramView *self, LdDiagramObject *object,
Add support for LdDiagramConnection to LdCanvas. Heavy LdCanvas refactoring, some modifications to ld-types. It just wasn't possible for me to further work with an old, 2000 lines long file without shuffling everything around at the same time.
2011-02-07 01:10:17 +01:00
const LdPoint *point)
Make adding symbols to the diagram possible. This required creating a simple framework for operations to LdCanvas. It is probable that it's going to require some changes when other operations are added. The basic idea behind it seems to be good, though.
2011-01-04 09:54:05 +01:00
{
Add support for LdDiagramConnection to LdCanvas. Heavy LdCanvas refactoring, some modifications to ld-types. It just wasn't possible for me to further work with an old, 2000 lines long file without shuffling everything around at the same time.
2011-02-07 01:10:17 +01:00
gdouble diagram_x, diagram_y;
Make adding symbols to the diagram possible. This required creating a simple framework for operations to LdCanvas. It is probable that it's going to require some changes when other operations are added. The basic idea behind it seems to be good, though.
2011-01-04 09:54:05 +01:00
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
ld_diagram_view_widget_to_diagram_coords (self,
Add support for LdDiagramConnection to LdCanvas. Heavy LdCanvas refactoring, some modifications to ld-types. It just wasn't possible for me to further work with an old, 2000 lines long file without shuffling everything around at the same time.
2011-02-07 01:10:17 +01:00
point->x, point->y, &diagram_x, &diagram_y);
g_object_set (object,
"x", floor (diagram_x + 0.5),
"y", floor (diagram_y + 0.5),
NULL);
Make adding symbols to the diagram possible. This required creating a simple framework for operations to LdCanvas. It is probable that it's going to require some changes when other operations are added. The basic idea behind it seems to be good, though.
2011-01-04 09:54:05 +01:00
}
Allow object selection in LdCanvas. Refactor a part of LdCanvas in the process.
2011-01-07 04:52:44 +01:00
static LdDiagramObject *
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
get_object_at_point (LdDiagramView *self, const LdPoint *point)
Allow object selection in LdCanvas. Refactor a part of LdCanvas in the process.
2011-01-07 04:52:44 +01:00
{
Replace GSList with GList in LdDiagram. This has been an unnecessary limitation.
2011-01-09 05:58:34 +01:00
GList *objects, *iter;
Allow object selection in LdCanvas. Refactor a part of LdCanvas in the process.
2011-01-07 04:52:44 +01:00
/* Iterate from the top object downwards. */
Replace GSList with GList in LdDiagram. This has been an unnecessary limitation.
2011-01-09 05:58:34 +01:00
objects = (GList *) ld_diagram_get_objects (self->priv->diagram);
Revert the order of LdDiagram objects. Now they go from oldest to newest.
2011-01-16 14:33:52 +01:00
for (iter = g_list_last (objects); iter; iter = g_list_previous (iter))
Allow object selection in LdCanvas. Refactor a part of LdCanvas in the process.
2011-01-07 04:52:44 +01:00
{
LdDiagramObject *object;
object = LD_DIAGRAM_OBJECT (iter->data);
Add support for LdDiagramConnection to LdCanvas. Heavy LdCanvas refactoring, some modifications to ld-types. It just wasn't possible for me to further work with an old, 2000 lines long file without shuffling everything around at the same time.
2011-02-07 01:10:17 +01:00
if (object_hit_test (self, object, point))
Allow object selection in LdCanvas. Refactor a part of LdCanvas in the process.
2011-01-07 04:52:44 +01:00
return object;
}
return NULL;
}
Add support for LdDiagramConnection to LdCanvas. Heavy LdCanvas refactoring, some modifications to ld-types. It just wasn't possible for me to further work with an old, 2000 lines long file without shuffling everything around at the same time.
2011-02-07 01:10:17 +01:00
static void
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
move_selection (LdDiagramView *self, gdouble dx, gdouble dy)
Partial refactoring of LdCanvas. draw_symbol() had been doing too much.
2011-01-04 00:45:44 +01:00
{
Add support for LdDiagramConnection to LdCanvas. Heavy LdCanvas refactoring, some modifications to ld-types. It just wasn't possible for me to further work with an old, 2000 lines long file without shuffling everything around at the same time.
2011-02-07 01:10:17 +01:00
LdDiagram *diagram;
GList *selection, *iter;
Partial refactoring of LdCanvas. draw_symbol() had been doing too much.
2011-01-04 00:45:44 +01:00
Add support for LdDiagramConnection to LdCanvas. Heavy LdCanvas refactoring, some modifications to ld-types. It just wasn't possible for me to further work with an old, 2000 lines long file without shuffling everything around at the same time.
2011-02-07 01:10:17 +01:00
diagram = self->priv->diagram;
if (!diagram)
return;
Partial refactoring of LdCanvas. draw_symbol() had been doing too much.
2011-01-04 00:45:44 +01:00
Add support for LdDiagramConnection to LdCanvas. Heavy LdCanvas refactoring, some modifications to ld-types. It just wasn't possible for me to further work with an old, 2000 lines long file without shuffling everything around at the same time.
2011-02-07 01:10:17 +01:00
selection = ld_diagram_get_selection (diagram);
if (!selection)
return;
Partial refactoring of LdCanvas. draw_symbol() had been doing too much.
2011-01-04 00:45:44 +01:00
Add support for LdDiagramConnection to LdCanvas. Heavy LdCanvas refactoring, some modifications to ld-types. It just wasn't possible for me to further work with an old, 2000 lines long file without shuffling everything around at the same time.
2011-02-07 01:10:17 +01:00
ld_diagram_begin_user_action (diagram);
for (iter = selection; iter; iter = g_list_next (iter))
{
gdouble x, y;
Extend symbol area to whole pixels. This gives better cairo performance.
2011-02-06 12:36:11 +01:00
Add "x" and "y" properties to LdDiagramView. Plus a bit of refactoring.
2011-02-19 14:04:52 +01:00
queue_object_draw (self, iter->data);
Add support for LdDiagramConnection to LdCanvas. Heavy LdCanvas refactoring, some modifications to ld-types. It just wasn't possible for me to further work with an old, 2000 lines long file without shuffling everything around at the same time.
2011-02-07 01:10:17 +01:00
g_object_get (iter->data, "x", &x, "y", &y, NULL);
Add "x" and "y" properties to LdDiagramView. Plus a bit of refactoring.
2011-02-19 14:04:52 +01:00
Add support for LdDiagramConnection to LdCanvas. Heavy LdCanvas refactoring, some modifications to ld-types. It just wasn't possible for me to further work with an old, 2000 lines long file without shuffling everything around at the same time.
2011-02-07 01:10:17 +01:00
x += dx;
y += dy;
Add "x" and "y" properties to LdDiagramView. Plus a bit of refactoring.
2011-02-19 14:04:52 +01:00
Add support for LdDiagramConnection to LdCanvas. Heavy LdCanvas refactoring, some modifications to ld-types. It just wasn't possible for me to further work with an old, 2000 lines long file without shuffling everything around at the same time.
2011-02-07 01:10:17 +01:00
g_object_set (iter->data, "x", x, "y", y, NULL);
Add "x" and "y" properties to LdDiagramView. Plus a bit of refactoring.
2011-02-19 14:04:52 +01:00
queue_object_draw (self, iter->data);
Add support for LdDiagramConnection to LdCanvas. Heavy LdCanvas refactoring, some modifications to ld-types. It just wasn't possible for me to further work with an old, 2000 lines long file without shuffling everything around at the same time.
2011-02-07 01:10:17 +01:00
}
ld_diagram_end_user_action (diagram);
Partial refactoring of LdCanvas. draw_symbol() had been doing too much.
2011-01-04 00:45:44 +01:00
}
Allow object selection in LdCanvas. Refactor a part of LdCanvas in the process.
2011-01-07 04:52:44 +01:00
static gboolean
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
is_object_selected (LdDiagramView *self, LdDiagramObject *object)
Allow object selection in LdCanvas. Refactor a part of LdCanvas in the process.
2011-01-07 04:52:44 +01:00
{
Add support for LdDiagramConnection to LdCanvas. Heavy LdCanvas refactoring, some modifications to ld-types. It just wasn't possible for me to further work with an old, 2000 lines long file without shuffling everything around at the same time.
2011-02-07 01:10:17 +01:00
return g_list_find (ld_diagram_get_selection (self->priv->diagram),
object) != NULL;
Allow object selection in LdCanvas. Refactor a part of LdCanvas in the process.
2011-01-07 04:52:44 +01:00
}
Add support for LdDiagramConnection to LdCanvas. Heavy LdCanvas refactoring, some modifications to ld-types. It just wasn't possible for me to further work with an old, 2000 lines long file without shuffling everything around at the same time.
2011-02-07 01:10:17 +01:00
static void
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
queue_draw (LdDiagramView *self, LdRectangle *rect)
Allow object selection in LdCanvas. Refactor a part of LdCanvas in the process.
2011-01-07 04:52:44 +01:00
{
Add support for LdDiagramConnection to LdCanvas. Heavy LdCanvas refactoring, some modifications to ld-types. It just wasn't possible for me to further work with an old, 2000 lines long file without shuffling everything around at the same time.
2011-02-07 01:10:17 +01:00
LdRectangle area;
area = *rect;
ld_rectangle_extend (&area, QUEUE_DRAW_EXTEND);
gtk_widget_queue_draw_area (GTK_WIDGET (self),
area.x, area.y, area.width, area.height);
Allow object selection in LdCanvas. Refactor a part of LdCanvas in the process.
2011-01-07 04:52:44 +01:00
}
Add support for LdDiagramConnection to LdCanvas. Heavy LdCanvas refactoring, some modifications to ld-types. It just wasn't possible for me to further work with an old, 2000 lines long file without shuffling everything around at the same time.
2011-02-07 01:10:17 +01:00
static void
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
queue_object_draw (LdDiagramView *self, LdDiagramObject *object)
Allow object selection in LdCanvas. Refactor a part of LdCanvas in the process.
2011-01-07 04:52:44 +01:00
{
Introduce LdRectangle, LdPoint and LdPointArray. Remove LdCanvasRect and LdSymbolArea.
2011-01-08 06:44:40 +01:00
LdRectangle rect;
Allow object selection in LdCanvas. Refactor a part of LdCanvas in the process.
2011-01-07 04:52:44 +01:00
Add support for LdDiagramConnection to LdCanvas. Heavy LdCanvas refactoring, some modifications to ld-types. It just wasn't possible for me to further work with an old, 2000 lines long file without shuffling everything around at the same time.
2011-02-07 01:10:17 +01:00
if (!get_object_clip_area (self, object, &rect))
return;
queue_draw (self, &rect);
Allow object selection in LdCanvas. Refactor a part of LdCanvas in the process.
2011-01-07 04:52:44 +01:00
}
Add support for LdDiagramConnection to LdCanvas. Heavy LdCanvas refactoring, some modifications to ld-types. It just wasn't possible for me to further work with an old, 2000 lines long file without shuffling everything around at the same time.
2011-02-07 01:10:17 +01:00
Also find terminals on ends of connections.
2011-02-19 22:15:11 +01:00
/* ===== Terminals ========================================================= */
Add support for LdDiagramConnection to LdCanvas. Heavy LdCanvas refactoring, some modifications to ld-types. It just wasn't possible for me to further work with an old, 2000 lines long file without shuffling everything around at the same time.
2011-02-07 01:10:17 +01:00
Highlight symbol terminals on mouse hover.
2011-01-09 04:50:58 +01:00
static void
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
check_terminals (LdDiagramView *self, const LdPoint *point)
Highlight symbol terminals on mouse hover.
2011-01-09 04:50:58 +01:00
{
Replace GSList with GList in LdDiagram. This has been an unnecessary limitation.
2011-01-09 05:58:34 +01:00
GList *objects, *iter;
Also find terminals on ends of connections.
2011-02-19 22:15:11 +01:00
CheckTerminalsData data;
Ignore terminals when hovering above selection. Also fix checking for the shift key and rename the "object" variable to "object_at_cursor" in button handlers.
2011-06-08 07:51:01 +02:00
LdDiagramObject *object_at_cursor;
hide_terminals (self);
object_at_cursor = get_object_at_point (self, point);
if (object_at_cursor && is_object_selected (self, object_at_cursor))
return;
Also find terminals on ends of connections.
2011-02-19 22:15:11 +01:00
data.found = FALSE;
data.point = *point;
data.distance = TERMINAL_HOVER_TOLERANCE;
Highlight symbol terminals on mouse hover.
2011-01-09 04:50:58 +01:00
Replace GSList with GList in LdDiagram. This has been an unnecessary limitation.
2011-01-09 05:58:34 +01:00
objects = (GList *) ld_diagram_get_objects (self->priv->diagram);
for (iter = objects; iter; iter = g_list_next (iter))
Highlight symbol terminals on mouse hover.
2011-01-09 04:50:58 +01:00
{
Also find terminals on ends of connections.
2011-02-19 22:15:11 +01:00
if (LD_IS_DIAGRAM_CONNECTION (iter->data))
check_connection_terminals (self, iter->data, &data);
else if (LD_IS_DIAGRAM_SYMBOL (iter->data))
check_symbol_terminals (self, iter->data, &data);
Highlight symbol terminals on mouse hover.
2011-01-09 04:50:58 +01:00
}
Also find terminals on ends of connections.
2011-02-19 22:15:11 +01:00
if (data.found)
Highlight symbol terminals on mouse hover.
2011-01-09 04:50:58 +01:00
{
Add support for LdDiagramConnection to LdCanvas. Heavy LdCanvas refactoring, some modifications to ld-types. It just wasn't possible for me to further work with an old, 2000 lines long file without shuffling everything around at the same time.
2011-02-07 01:10:17 +01:00
self->priv->terminal_hovered = TRUE;
Also find terminals on ends of connections.
2011-02-19 22:15:11 +01:00
self->priv->terminal = data.terminal;
queue_terminal_draw (self, &data.terminal);
}
}
static void
check_terminals_point (LdDiagramView *self, const LdPoint *point,
CheckTerminalsData *data)
{
LdPoint widget_coords;
gdouble distance;
ld_diagram_view_diagram_to_widget_coords (self,
point->x, point->y, &widget_coords.x, &widget_coords.y);
distance = ld_point_distance (&widget_coords,
data->point.x, data->point.y);
if (distance <= data->distance)
{
data->distance = distance;
data->terminal = *point;
data->found = TRUE;
}
}
void
check_connection_terminals (LdDiagramView *self,
LdDiagramConnection *connection, CheckTerminalsData *data)
{
LdPointArray *points;
gdouble object_x, object_y;
guint last;
g_object_get (connection, "x", &object_x, "y", &object_y, NULL);
points = ld_diagram_connection_get_points (connection);
if (points->length < 2)
{
ld_point_array_free (points);
return;
}
points->points[0].x += object_x;
points->points[0].y += object_y;
check_terminals_point (self, &points->points[0], data);
last = points->length - 1;
points->points[last].x += object_x;
points->points[last].y += object_y;
check_terminals_point (self, &points->points[last], data);
ld_point_array_free (points);
}
void
check_symbol_terminals (LdDiagramView *self,
LdDiagramSymbol *diagram_symbol, CheckTerminalsData *data)
{
gdouble object_x, object_y;
LdSymbol *symbol;
const LdPointArray *terminals;
guint i;
gint rotation;
symbol = resolve_symbol (self, diagram_symbol);
if (!symbol)
return;
g_object_get (diagram_symbol, "x", &object_x, "y", &object_y,
"rotation", &rotation, NULL);
terminals = ld_symbol_get_terminals (symbol);
for (i = 0; i < terminals->length; i++)
{
LdPoint cur_term;
cur_term = terminals->points[i];
rotate_symbol_terminal (&cur_term, rotation);
cur_term.x += object_x;
cur_term.y += object_y;
check_terminals_point (self, &cur_term, data);
Highlight symbol terminals on mouse hover.
2011-01-09 04:50:58 +01:00
}
Add hide_terminals() to LdCanvas.
2011-01-09 08:10:20 +01:00
}
Allow rotation of symbols. Bind this action to the right mouse button. Due to limitations of json-glib, we can't store rotation as an enum.
2011-02-14 10:14:28 +01:00
static void
Also find terminals on ends of connections.
2011-02-19 22:15:11 +01:00
rotate_symbol_terminal (LdPoint *terminal, gint symbol_rotation)
Allow rotation of symbols. Bind this action to the right mouse button. Due to limitations of json-glib, we can't store rotation as an enum.
2011-02-14 10:14:28 +01:00
{
gdouble temp;
switch (symbol_rotation)
{
case LD_DIAGRAM_SYMBOL_ROTATION_90:
temp = terminal->y;
terminal->y = terminal->x;
terminal->x = -temp;
break;
case LD_DIAGRAM_SYMBOL_ROTATION_180:
terminal->y = -terminal->y;
terminal->x = -terminal->x;
break;
case LD_DIAGRAM_SYMBOL_ROTATION_270:
temp = terminal->x;
terminal->x = terminal->y;
terminal->y = -temp;
break;
}
}
Add hide_terminals() to LdCanvas.
2011-01-09 08:10:20 +01:00
static void
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
hide_terminals (LdDiagramView *self)
Add hide_terminals() to LdCanvas.
2011-01-09 08:10:20 +01:00
{
Add support for LdDiagramConnection to LdCanvas. Heavy LdCanvas refactoring, some modifications to ld-types. It just wasn't possible for me to further work with an old, 2000 lines long file without shuffling everything around at the same time.
2011-02-07 01:10:17 +01:00
if (self->priv->terminal_hovered)
Add hide_terminals() to LdCanvas.
2011-01-09 08:10:20 +01:00
{
Add support for LdDiagramConnection to LdCanvas. Heavy LdCanvas refactoring, some modifications to ld-types. It just wasn't possible for me to further work with an old, 2000 lines long file without shuffling everything around at the same time.
2011-02-07 01:10:17 +01:00
self->priv->terminal_hovered = FALSE;
Add hide_terminals() to LdCanvas.
2011-01-09 08:10:20 +01:00
queue_terminal_draw (self, &self->priv->terminal);
}
Highlight symbol terminals on mouse hover.
2011-01-09 04:50:58 +01:00
}
Make adding symbols to the diagram possible. This required creating a simple framework for operations to LdCanvas. It is probable that it's going to require some changes when other operations are added. The basic idea behind it seems to be good, though.
2011-01-04 09:54:05 +01:00
static void
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
queue_terminal_draw (LdDiagramView *self, LdPoint *terminal)
Add support for LdDiagramConnection to LdCanvas. Heavy LdCanvas refactoring, some modifications to ld-types. It just wasn't possible for me to further work with an old, 2000 lines long file without shuffling everything around at the same time.
2011-02-07 01:10:17 +01:00
{
LdRectangle rect;
LdPoint widget_coords;
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
ld_diagram_view_diagram_to_widget_coords (self,
Add support for LdDiagramConnection to LdCanvas. Heavy LdCanvas refactoring, some modifications to ld-types. It just wasn't possible for me to further work with an old, 2000 lines long file without shuffling everything around at the same time.
2011-02-07 01:10:17 +01:00
terminal->x, terminal->y, &widget_coords.x, &widget_coords.y);
rect.x = widget_coords.x - TERMINAL_RADIUS;
rect.y = widget_coords.y - TERMINAL_RADIUS;
rect.width = 2 * TERMINAL_RADIUS;
rect.height = 2 * TERMINAL_RADIUS;
queue_draw (self, &rect);
}
/* ===== Diagram symbol ==================================================== */
static gboolean
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
symbol_hit_test (LdDiagramView *self, LdDiagramSymbol *symbol,
const LdPoint *point)
Add support for LdDiagramConnection to LdCanvas. Heavy LdCanvas refactoring, some modifications to ld-types. It just wasn't possible for me to further work with an old, 2000 lines long file without shuffling everything around at the same time.
2011-02-07 01:10:17 +01:00
{
LdRectangle rect;
if (!get_symbol_area (self, symbol, &rect))
return FALSE;
ld_rectangle_extend (&rect, OBJECT_BORDER_TOLERANCE);
return ld_rectangle_contains_point (&rect, point);
}
static gboolean
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
get_symbol_clip_area (LdDiagramView *self,
Add support for LdDiagramConnection to LdCanvas. Heavy LdCanvas refactoring, some modifications to ld-types. It just wasn't possible for me to further work with an old, 2000 lines long file without shuffling everything around at the same time.
2011-02-07 01:10:17 +01:00
LdDiagramSymbol *symbol, LdRectangle *rect)
Refactor queue_object_redraw().
2011-01-09 04:39:05 +01:00
{
Add support for LdDiagramConnection to LdCanvas. Heavy LdCanvas refactoring, some modifications to ld-types. It just wasn't possible for me to further work with an old, 2000 lines long file without shuffling everything around at the same time.
2011-02-07 01:10:17 +01:00
LdRectangle object_rect;
if (!get_symbol_area (self, symbol, &object_rect))
return FALSE;
*rect = object_rect;
ld_rectangle_extend (rect, SYMBOL_CLIP_TOLERANCE);
return TRUE;
}
static gboolean
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
get_symbol_area (LdDiagramView *self, LdDiagramSymbol *symbol,
LdRectangle *rect)
Add support for LdDiagramConnection to LdCanvas. Heavy LdCanvas refactoring, some modifications to ld-types. It just wasn't possible for me to further work with an old, 2000 lines long file without shuffling everything around at the same time.
2011-02-07 01:10:17 +01:00
{
gdouble object_x, object_y;
LdSymbol *library_symbol;
Refactor queue_object_redraw().
2011-01-09 04:39:05 +01:00
LdRectangle area;
Add support for LdDiagramConnection to LdCanvas. Heavy LdCanvas refactoring, some modifications to ld-types. It just wasn't possible for me to further work with an old, 2000 lines long file without shuffling everything around at the same time.
2011-02-07 01:10:17 +01:00
gdouble x1, x2;
gdouble y1, y2;
Allow rotation of symbols. Bind this action to the right mouse button. Due to limitations of json-glib, we can't store rotation as an enum.
2011-02-14 10:14:28 +01:00
gint rotation;
Refactor queue_object_redraw().
2011-01-09 04:39:05 +01:00
Allow rotation of symbols. Bind this action to the right mouse button. Due to limitations of json-glib, we can't store rotation as an enum.
2011-02-14 10:14:28 +01:00
g_object_get (symbol, "x", &object_x, "y", &object_y,
"rotation", &rotation, NULL);
Add support for LdDiagramConnection to LdCanvas. Heavy LdCanvas refactoring, some modifications to ld-types. It just wasn't possible for me to further work with an old, 2000 lines long file without shuffling everything around at the same time.
2011-02-07 01:10:17 +01:00
library_symbol = resolve_symbol (self, symbol);
if (library_symbol)
ld_symbol_get_area (library_symbol, &area);
else
return FALSE;
Allow rotation of symbols. Bind this action to the right mouse button. Due to limitations of json-glib, we can't store rotation as an enum.
2011-02-14 10:14:28 +01:00
rotate_symbol_area (&area, rotation);
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
ld_diagram_view_diagram_to_widget_coords (self,
Add support for LdDiagramConnection to LdCanvas. Heavy LdCanvas refactoring, some modifications to ld-types. It just wasn't possible for me to further work with an old, 2000 lines long file without shuffling everything around at the same time.
2011-02-07 01:10:17 +01:00
object_x + area.x,
object_y + area.y,
&x1, &y1);
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
ld_diagram_view_diagram_to_widget_coords (self,
Add support for LdDiagramConnection to LdCanvas. Heavy LdCanvas refactoring, some modifications to ld-types. It just wasn't possible for me to further work with an old, 2000 lines long file without shuffling everything around at the same time.
2011-02-07 01:10:17 +01:00
object_x + area.x + area.width,
object_y + area.y + area.height,
&x2, &y2);
x1 = floor (x1);
y1 = floor (y1);
x2 = ceil (x2);
y2 = ceil (y2);
rect->x = x1;
rect->y = y1;
rect->width = x2 - x1;
rect->height = y2 - y1;
return TRUE;
Refactor queue_object_redraw().
2011-01-09 04:39:05 +01:00
}
Allow rotation of symbols. Bind this action to the right mouse button. Due to limitations of json-glib, we can't store rotation as an enum.
2011-02-14 10:14:28 +01:00
static void
rotate_symbol_area (LdRectangle *area, gint rotation)
{
gdouble temp;
switch (rotation)
{
case LD_DIAGRAM_SYMBOL_ROTATION_90:
temp = area->y;
area->y = area->x;
area->x = -(temp + area->height);
break;
case LD_DIAGRAM_SYMBOL_ROTATION_180:
area->y = -(area->y + area->height);
area->x = -(area->x + area->width);
break;
case LD_DIAGRAM_SYMBOL_ROTATION_270:
temp = area->x;
area->x = area->y;
area->y = -(temp + area->width);
break;
}
switch (rotation)
{
case LD_DIAGRAM_SYMBOL_ROTATION_90:
case LD_DIAGRAM_SYMBOL_ROTATION_270:
temp = area->width;
area->width = area->height;
area->height = temp;
break;
}
}
static void
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
rotate_symbol (LdDiagramView *self, LdDiagramSymbol *symbol)
Allow rotation of symbols. Bind this action to the right mouse button. Due to limitations of json-glib, we can't store rotation as an enum.
2011-02-14 10:14:28 +01:00
{
gint rotation;
g_object_get (symbol, "rotation", &rotation, NULL);
queue_object_draw (self, LD_DIAGRAM_OBJECT (symbol));
switch (rotation)
{
case LD_DIAGRAM_SYMBOL_ROTATION_0:
rotation = LD_DIAGRAM_SYMBOL_ROTATION_90;
break;
case LD_DIAGRAM_SYMBOL_ROTATION_90:
rotation = LD_DIAGRAM_SYMBOL_ROTATION_180;
break;
case LD_DIAGRAM_SYMBOL_ROTATION_180:
rotation = LD_DIAGRAM_SYMBOL_ROTATION_270;
break;
case LD_DIAGRAM_SYMBOL_ROTATION_270:
rotation = LD_DIAGRAM_SYMBOL_ROTATION_0;
break;
}
g_object_set (symbol, "rotation", rotation, NULL);
queue_object_draw (self, LD_DIAGRAM_OBJECT (symbol));
}
Add support for LdDiagramConnection to LdCanvas. Heavy LdCanvas refactoring, some modifications to ld-types. It just wasn't possible for me to further work with an old, 2000 lines long file without shuffling everything around at the same time.
2011-02-07 01:10:17 +01:00
static LdSymbol *
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
resolve_symbol (LdDiagramView *self, LdDiagramSymbol *diagram_symbol)
Make adding symbols to the diagram possible. This required creating a simple framework for operations to LdCanvas. It is probable that it's going to require some changes when other operations are added. The basic idea behind it seems to be good, though.
2011-01-04 09:54:05 +01:00
{
Add support for LdDiagramConnection to LdCanvas. Heavy LdCanvas refactoring, some modifications to ld-types. It just wasn't possible for me to further work with an old, 2000 lines long file without shuffling everything around at the same time.
2011-02-07 01:10:17 +01:00
LdSymbol *symbol;
gchar *klass;
if (!self->priv->library)
return NULL;
klass = ld_diagram_symbol_get_class (diagram_symbol);
symbol = ld_library_find_symbol (self->priv->library, klass);
g_free (klass);
return symbol;
}
/* ===== Diagram connection ================================================ */
static gboolean
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
connection_hit_test (LdDiagramView *self, LdDiagramConnection *connection,
Add support for LdDiagramConnection to LdCanvas. Heavy LdCanvas refactoring, some modifications to ld-types. It just wasn't possible for me to further work with an old, 2000 lines long file without shuffling everything around at the same time.
2011-02-07 01:10:17 +01:00
const LdPoint *point)
{
gdouble object_x, object_y, length;
LdPointArray *points;
guint i;
g_object_get (connection, "x", &object_x, "y", &object_y, NULL);
points = ld_diagram_connection_get_points (connection);
if (points->length < 2)
Make adding symbols to the diagram possible. This required creating a simple framework for operations to LdCanvas. It is probable that it's going to require some changes when other operations are added. The basic idea behind it seems to be good, though.
2011-01-04 09:54:05 +01:00
{
Add support for LdDiagramConnection to LdCanvas. Heavy LdCanvas refactoring, some modifications to ld-types. It just wasn't possible for me to further work with an old, 2000 lines long file without shuffling everything around at the same time.
2011-02-07 01:10:17 +01:00
ld_point_array_free (points);
return FALSE;
}
Make adding symbols to the diagram possible. This required creating a simple framework for operations to LdCanvas. It is probable that it's going to require some changes when other operations are added. The basic idea behind it seems to be good, though.
2011-01-04 09:54:05 +01:00
Add support for LdDiagramConnection to LdCanvas. Heavy LdCanvas refactoring, some modifications to ld-types. It just wasn't possible for me to further work with an old, 2000 lines long file without shuffling everything around at the same time.
2011-02-07 01:10:17 +01:00
for (i = 0; i < points->length; i++)
{
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
ld_diagram_view_diagram_to_widget_coords (self,
Add support for LdDiagramConnection to LdCanvas. Heavy LdCanvas refactoring, some modifications to ld-types. It just wasn't possible for me to further work with an old, 2000 lines long file without shuffling everything around at the same time.
2011-02-07 01:10:17 +01:00
points->points[i].x + object_x,
points->points[i].y + object_y,
&points->points[i].x,
&points->points[i].y);
if (!i)
continue;
length = point_to_line_segment_distance
(point, &points->points[i - 1], &points->points[i]);
if (length <= OBJECT_BORDER_TOLERANCE)
{
ld_point_array_free (points);
return TRUE;
}
Make adding symbols to the diagram possible. This required creating a simple framework for operations to LdCanvas. It is probable that it's going to require some changes when other operations are added. The basic idea behind it seems to be good, though.
2011-01-04 09:54:05 +01:00
}
Add support for LdDiagramConnection to LdCanvas. Heavy LdCanvas refactoring, some modifications to ld-types. It just wasn't possible for me to further work with an old, 2000 lines long file without shuffling everything around at the same time.
2011-02-07 01:10:17 +01:00
ld_point_array_free (points);
return FALSE;
Make adding symbols to the diagram possible. This required creating a simple framework for operations to LdCanvas. It is probable that it's going to require some changes when other operations are added. The basic idea behind it seems to be good, though.
2011-01-04 09:54:05 +01:00
}
Add support for LdDiagramConnection to LdCanvas. Heavy LdCanvas refactoring, some modifications to ld-types. It just wasn't possible for me to further work with an old, 2000 lines long file without shuffling everything around at the same time.
2011-02-07 01:10:17 +01:00
static gboolean
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
get_connection_clip_area (LdDiagramView *self,
Add support for LdDiagramConnection to LdCanvas. Heavy LdCanvas refactoring, some modifications to ld-types. It just wasn't possible for me to further work with an old, 2000 lines long file without shuffling everything around at the same time.
2011-02-07 01:10:17 +01:00
LdDiagramConnection *connection, LdRectangle *rect)
Highlight symbol terminals on mouse hover.
2011-01-09 04:50:58 +01:00
{
Add support for LdDiagramConnection to LdCanvas. Heavy LdCanvas refactoring, some modifications to ld-types. It just wasn't possible for me to further work with an old, 2000 lines long file without shuffling everything around at the same time.
2011-02-07 01:10:17 +01:00
return get_connection_area (self, connection, rect);
}
Highlight symbol terminals on mouse hover.
2011-01-09 04:50:58 +01:00
Add support for LdDiagramConnection to LdCanvas. Heavy LdCanvas refactoring, some modifications to ld-types. It just wasn't possible for me to further work with an old, 2000 lines long file without shuffling everything around at the same time.
2011-02-07 01:10:17 +01:00
static gboolean
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
get_connection_area (LdDiagramView *self,
Add support for LdDiagramConnection to LdCanvas. Heavy LdCanvas refactoring, some modifications to ld-types. It just wasn't possible for me to further work with an old, 2000 lines long file without shuffling everything around at the same time.
2011-02-07 01:10:17 +01:00
LdDiagramConnection *connection, LdRectangle *rect)
{
gdouble x_origin, y_origin;
gdouble x, y, x_min, x_max, y_min, y_max;
LdPointArray *points;
guint i;
points = ld_diagram_connection_get_points (connection);
if (!points->length)
{
ld_point_array_free (points);
return FALSE;
}
g_object_get (connection, "x", &x_origin, "y", &y_origin, NULL);
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
ld_diagram_view_diagram_to_widget_coords (self,
Add support for LdDiagramConnection to LdCanvas. Heavy LdCanvas refactoring, some modifications to ld-types. It just wasn't possible for me to further work with an old, 2000 lines long file without shuffling everything around at the same time.
2011-02-07 01:10:17 +01:00
x_origin + points->points[0].x,
y_origin + points->points[0].y,
&x, &y);
x_max = x_min = x;
y_max = y_min = y;
for (i = 1; i < points->length; i++)
{
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
ld_diagram_view_diagram_to_widget_coords (self,
Add support for LdDiagramConnection to LdCanvas. Heavy LdCanvas refactoring, some modifications to ld-types. It just wasn't possible for me to further work with an old, 2000 lines long file without shuffling everything around at the same time.
2011-02-07 01:10:17 +01:00
x_origin + points->points[i].x,
y_origin + points->points[i].y,
&x, &y);
if (x < x_min)
x_min = x;
else if (x > x_max)
x_max = x;
if (y < y_min)
y_min = y;
else if (y > y_max)
y_max = y;
}
rect->x = x_min;
rect->y = y_min;
rect->width = x_max - x_min;
rect->height = y_max - y_min;
ld_point_array_free (points);
return TRUE;
Highlight symbol terminals on mouse hover.
2011-01-09 04:50:58 +01:00
}
Refactor ld-canvas.c, extend LdCanvas operations. Now objects can be selected and moved by dragging the mouse.
2011-02-05 16:36:04 +01:00
/* ===== Operations ======================================================== */
static void
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
ld_diagram_view_real_cancel_operation (LdDiagramView *self)
Refactor ld-canvas.c, extend LdCanvas operations. Now objects can be selected and moved by dragging the mouse.
2011-02-05 16:36:04 +01:00
{
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
g_return_if_fail (LD_IS_DIAGRAM_VIEW (self));
Refactor ld-canvas.c, extend LdCanvas operations. Now objects can be selected and moved by dragging the mouse.
2011-02-05 16:36:04 +01:00
if (self->priv->operation)
{
if (self->priv->operation_end)
self->priv->operation_end (self);
self->priv->operation = OPER_0;
self->priv->operation_end = NULL;
}
}
Add scrolling using the middle mouse button. A bit of refactoring, too.
2011-06-09 13:54:37 +02:00
static void
oper_move_view_begin (LdDiagramView *self, const LdPoint *point)
{
MoveViewData *data;
Change the cursor when scrolling the view. For consistency with other GTK+ applications.
2011-06-09 21:56:38 +02:00
GdkCursor *move_cursor;
Add scrolling using the middle mouse button. A bit of refactoring, too.
2011-06-09 13:54:37 +02:00
g_signal_emit (self,
LD_DIAGRAM_VIEW_GET_CLASS (self)->cancel_operation_signal, 0);
self->priv->operation = OPER_MOVE_VIEW;
Change the cursor when scrolling the view. For consistency with other GTK+ applications.
2011-06-09 21:56:38 +02:00
self->priv->operation_end = oper_move_view_end;
Add scrolling using the middle mouse button. A bit of refactoring, too.
2011-06-09 13:54:37 +02:00
data = &OPER_DATA (self, move_view);
data->last_pos = *point;
Change the cursor when scrolling the view. For consistency with other GTK+ applications.
2011-06-09 21:56:38 +02:00
move_cursor = gdk_cursor_new (GDK_FLEUR);
Get more GTK+ 3 ready and respect seals.
2012-08-31 15:23:02 +02:00
gdk_window_set_cursor
(gtk_widget_get_window (GTK_WIDGET (self)), move_cursor);
Switch to GTK3 via pkg-config, start the port
2015-01-19 00:02:48 +01:00
g_object_unref (move_cursor);
Add scrolling using the middle mouse button. A bit of refactoring, too.
2011-06-09 13:54:37 +02:00
}
static void
oper_move_view_motion (LdDiagramView *self, const LdPoint *point)
{
MoveViewData *data;
gdouble factor;
data = &OPER_DATA (self, move_view);
factor = ld_diagram_view_get_scale_in_px (self);
ld_diagram_view_set_x (self, self->priv->x
+ (data->last_pos.x - point->x) / factor);
ld_diagram_view_set_y (self, self->priv->y
+ (data->last_pos.y - point->y) / factor);
data->last_pos = *point;
}
Change the cursor when scrolling the view. For consistency with other GTK+ applications.
2011-06-09 21:56:38 +02:00
static void
oper_move_view_end (LdDiagramView *self)
{
Get more GTK+ 3 ready and respect seals.
2012-08-31 15:23:02 +02:00
gdk_window_set_cursor (gtk_widget_get_window (GTK_WIDGET (self)), NULL);
Change the cursor when scrolling the view. For consistency with other GTK+ applications.
2011-06-09 21:56:38 +02:00
}
Refactor ld-canvas.c, extend LdCanvas operations. Now objects can be selected and moved by dragging the mouse.
2011-02-05 16:36:04 +01:00
/**
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
* ld_diagram_view_add_object_begin:
* @self: an #LdDiagramView object.
Refactor ld-canvas.c, extend LdCanvas operations. Now objects can be selected and moved by dragging the mouse.
2011-02-05 16:36:04 +01:00
* @object: (transfer full): the object to be added to the diagram.
*
* Begin an operation for adding an object into the diagram.
*/
void
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
ld_diagram_view_add_object_begin (LdDiagramView *self, LdDiagramObject *object)
Refactor ld-canvas.c, extend LdCanvas operations. Now objects can be selected and moved by dragging the mouse.
2011-02-05 16:36:04 +01:00
{
AddObjectData *data;
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
g_return_if_fail (LD_IS_DIAGRAM_VIEW (self));
Refactor ld-canvas.c, extend LdCanvas operations. Now objects can be selected and moved by dragging the mouse.
2011-02-05 16:36:04 +01:00
g_return_if_fail (LD_IS_DIAGRAM_OBJECT (object));
Emit "cancel-operation", don't call the handler.
2011-02-14 08:46:41 +01:00
g_signal_emit (self,
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
LD_DIAGRAM_VIEW_GET_CLASS (self)->cancel_operation_signal, 0);
Refactor ld-canvas.c, extend LdCanvas operations. Now objects can be selected and moved by dragging the mouse.
2011-02-05 16:36:04 +01:00
self->priv->operation = OPER_ADD_OBJECT;
self->priv->operation_end = oper_add_object_end;
data = &OPER_DATA (self, add_object);
data->object = object;
}
static void
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
oper_add_object_end (LdDiagramView *self)
Refactor ld-canvas.c, extend LdCanvas operations. Now objects can be selected and moved by dragging the mouse.
2011-02-05 16:36:04 +01:00
{
AddObjectData *data;
data = &OPER_DATA (self, add_object);
if (data->object)
{
queue_object_draw (self, data->object);
g_object_unref (data->object);
data->object = NULL;
}
}
static void
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
oper_connect_begin (LdDiagramView *self, const LdPoint *point)
Add support for LdDiagramConnection to LdCanvas. Heavy LdCanvas refactoring, some modifications to ld-types. It just wasn't possible for me to further work with an old, 2000 lines long file without shuffling everything around at the same time.
2011-02-07 01:10:17 +01:00
{
ConnectData *data;
Emit "cancel-operation", don't call the handler.
2011-02-14 08:46:41 +01:00
g_signal_emit (self,
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
LD_DIAGRAM_VIEW_GET_CLASS (self)->cancel_operation_signal, 0);
Add support for LdDiagramConnection to LdCanvas. Heavy LdCanvas refactoring, some modifications to ld-types. It just wasn't possible for me to further work with an old, 2000 lines long file without shuffling everything around at the same time.
2011-02-07 01:10:17 +01:00
self->priv->operation = OPER_CONNECT;
self->priv->operation_end = oper_connect_end;
data = &OPER_DATA (self, connect);
data->connection = ld_diagram_connection_new (NULL);
data->origin = self->priv->terminal;
g_object_set (data->connection,
"x", data->origin.x,
"y", data->origin.y,
NULL);
self->priv->terminal_hovered = FALSE;
oper_connect_motion (self, point);
}
static void
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
oper_connect_end (LdDiagramView *self)
Add support for LdDiagramConnection to LdCanvas. Heavy LdCanvas refactoring, some modifications to ld-types. It just wasn't possible for me to further work with an old, 2000 lines long file without shuffling everything around at the same time.
2011-02-07 01:10:17 +01:00
{
ConnectData *data;
data = &OPER_DATA (self, connect);
queue_object_draw (self, LD_DIAGRAM_OBJECT (data->connection));
ld_diagram_insert_object (self->priv->diagram,
LD_DIAGRAM_OBJECT (data->connection), -1);
g_object_unref (data->connection);
}
static void
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
oper_connect_motion (LdDiagramView *self, const LdPoint *point)
Add support for LdDiagramConnection to LdCanvas. Heavy LdCanvas refactoring, some modifications to ld-types. It just wasn't possible for me to further work with an old, 2000 lines long file without shuffling everything around at the same time.
2011-02-07 01:10:17 +01:00
{
ConnectData *data;
LdPointArray *points;
Refactor oper_connect_motion().
2011-02-20 12:41:45 +01:00
LdPoint end_point;
Add support for LdDiagramConnection to LdCanvas. Heavy LdCanvas refactoring, some modifications to ld-types. It just wasn't possible for me to further work with an old, 2000 lines long file without shuffling everything around at the same time.
2011-02-07 01:10:17 +01:00
gdouble diagram_x, diagram_y;
data = &OPER_DATA (self, connect);
Glue to terminal points when creating connections.
2011-03-06 13:54:01 +01:00
check_terminals (self, point);
if (self->priv->terminal.x == data->origin.x
&& self->priv->terminal.y == data->origin.y)
self->priv->terminal_hovered = FALSE;
if (self->priv->terminal_hovered)
{
end_point.x = self->priv->terminal.x - data->origin.x;
end_point.y = self->priv->terminal.y - data->origin.y;
}
else
{
ld_diagram_view_widget_to_diagram_coords (self,
point->x, point->y, &diagram_x, &diagram_y);
end_point.x = floor (diagram_x - data->origin.x + 0.5);
end_point.y = floor (diagram_y - data->origin.y + 0.5);
}
Add support for LdDiagramConnection to LdCanvas. Heavy LdCanvas refactoring, some modifications to ld-types. It just wasn't possible for me to further work with an old, 2000 lines long file without shuffling everything around at the same time.
2011-02-07 01:10:17 +01:00
Refactor oper_connect_motion().
2011-02-20 12:41:45 +01:00
points = create_connection_path (&end_point);
Add support for LdDiagramConnection to LdCanvas. Heavy LdCanvas refactoring, some modifications to ld-types. It just wasn't possible for me to further work with an old, 2000 lines long file without shuffling everything around at the same time.
2011-02-07 01:10:17 +01:00
queue_object_draw (self, LD_DIAGRAM_OBJECT (data->connection));
ld_diagram_connection_set_points (data->connection, points);
ld_point_array_free (points);
Refactor oper_connect_motion().
2011-02-20 12:41:45 +01:00
queue_object_draw (self, LD_DIAGRAM_OBJECT (data->connection));
Add support for LdDiagramConnection to LdCanvas. Heavy LdCanvas refactoring, some modifications to ld-types. It just wasn't possible for me to further work with an old, 2000 lines long file without shuffling everything around at the same time.
2011-02-07 01:10:17 +01:00
}
Refactor oper_connect_motion().
2011-02-20 12:41:45 +01:00
/* create_connection_path:
* @end_point: the end point of the path. The start point is always at {0, 0}.
*
* Create an orthogonal path between two points.
*/
static LdPointArray *
create_connection_path (const LdPoint *end_point)
{
LdPointArray *points;
if (end_point->x == 0 || end_point->y == 0)
{
points = ld_point_array_sized_new (2);
points->length = 2;
points->points[0].x = 0;
points->points[0].y = 0;
points->points[1] = *end_point;
return points;
}
points = ld_point_array_sized_new (4);
points->length = 4;
points->points[0].x = 0;
points->points[0].y = 0;
points->points[3] = *end_point;
if (ABS (end_point->x) > ABS (end_point->y))
{
points->points[1].x = end_point->x / 2;
points->points[1].y = 0;
points->points[2].x = end_point->x / 2;
points->points[2].y = end_point->y;
}
else
{
points->points[1].x = 0;
points->points[1].y = end_point->y / 2;
points->points[2].x = end_point->x;
points->points[2].y = end_point->y / 2;
}
return points;
}
Add support for LdDiagramConnection to LdCanvas. Heavy LdCanvas refactoring, some modifications to ld-types. It just wasn't possible for me to further work with an old, 2000 lines long file without shuffling everything around at the same time.
2011-02-07 01:10:17 +01:00
static void
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
oper_select_begin (LdDiagramView *self, const LdPoint *point)
Refactor ld-canvas.c, extend LdCanvas operations. Now objects can be selected and moved by dragging the mouse.
2011-02-05 16:36:04 +01:00
{
SelectData *data;
Emit "cancel-operation", don't call the handler.
2011-02-14 08:46:41 +01:00
g_signal_emit (self,
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
LD_DIAGRAM_VIEW_GET_CLASS (self)->cancel_operation_signal, 0);
Refactor ld-canvas.c, extend LdCanvas operations. Now objects can be selected and moved by dragging the mouse.
2011-02-05 16:36:04 +01:00
self->priv->operation = OPER_SELECT;
self->priv->operation_end = oper_select_end;
data = &OPER_DATA (self, select);
data->drag_last_pos.x = self->priv->drag_start_pos.x;
data->drag_last_pos.y = self->priv->drag_start_pos.y;
Add support for LdDiagramConnection to LdCanvas. Heavy LdCanvas refactoring, some modifications to ld-types. It just wasn't possible for me to further work with an old, 2000 lines long file without shuffling everything around at the same time.
2011-02-07 01:10:17 +01:00
oper_select_motion (self, point);
Refactor ld-canvas.c, extend LdCanvas operations. Now objects can be selected and moved by dragging the mouse.
2011-02-05 16:36:04 +01:00
}
static void
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
oper_select_end (LdDiagramView *self)
Refactor ld-canvas.c, extend LdCanvas operations. Now objects can be selected and moved by dragging the mouse.
2011-02-05 16:36:04 +01:00
{
oper_select_queue_draw (self);
}
static void
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
oper_select_get_rectangle (LdDiagramView *self, LdRectangle *rect)
Refactor ld-canvas.c, extend LdCanvas operations. Now objects can be selected and moved by dragging the mouse.
2011-02-05 16:36:04 +01:00
{
SelectData *data;
data = &OPER_DATA (self, select);
rect->x = MIN (self->priv->drag_start_pos.x, data->drag_last_pos.x);
rect->y = MIN (self->priv->drag_start_pos.y, data->drag_last_pos.y);
rect->width = ABS (self->priv->drag_start_pos.x - data->drag_last_pos.x);
rect->height = ABS (self->priv->drag_start_pos.y - data->drag_last_pos.y);
}
static void
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
oper_select_queue_draw (LdDiagramView *self)
Refactor ld-canvas.c, extend LdCanvas operations. Now objects can be selected and moved by dragging the mouse.
2011-02-05 16:36:04 +01:00
{
LdRectangle rect;
oper_select_get_rectangle (self, &rect);
queue_draw (self, &rect);
}
static void
oper_select_draw (GtkWidget *widget, DrawData *data)
{
static const double dashes[] = {3, 5};
SelectData *select_data;
g_return_if_fail (data->self->priv->operation == OPER_SELECT);
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
color_apply (COLOR_GET (data->self, COLOR_GRID), data->cr);
Refactor ld-canvas.c, extend LdCanvas operations. Now objects can be selected and moved by dragging the mouse.
2011-02-05 16:36:04 +01:00
cairo_set_line_width (data->cr, 1);
cairo_set_line_cap (data->cr, CAIRO_LINE_CAP_SQUARE);
cairo_set_dash (data->cr, dashes, G_N_ELEMENTS (dashes), 0);
select_data = &OPER_DATA (data->self, select);
cairo_rectangle (data->cr,
data->self->priv->drag_start_pos.x - 0.5,
data->self->priv->drag_start_pos.y - 0.5,
select_data->drag_last_pos.x - data->self->priv->drag_start_pos.x + 1,
select_data->drag_last_pos.y - data->self->priv->drag_start_pos.y + 1);
cairo_stroke (data->cr);
}
static void
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
oper_select_motion (LdDiagramView *self, const LdPoint *point)
Refactor ld-canvas.c, extend LdCanvas operations. Now objects can be selected and moved by dragging the mouse.
2011-02-05 16:36:04 +01:00
{
SelectData *data;
GList *objects, *iter;
Add support for LdDiagramConnection to LdCanvas. Heavy LdCanvas refactoring, some modifications to ld-types. It just wasn't possible for me to further work with an old, 2000 lines long file without shuffling everything around at the same time.
2011-02-07 01:10:17 +01:00
LdRectangle selection_rect, rect;
Refactor ld-canvas.c, extend LdCanvas operations. Now objects can be selected and moved by dragging the mouse.
2011-02-05 16:36:04 +01:00
data = &OPER_DATA (self, select);
oper_select_queue_draw (self);
Add support for LdDiagramConnection to LdCanvas. Heavy LdCanvas refactoring, some modifications to ld-types. It just wasn't possible for me to further work with an old, 2000 lines long file without shuffling everything around at the same time.
2011-02-07 01:10:17 +01:00
data->drag_last_pos = *point;
Refactor ld-canvas.c, extend LdCanvas operations. Now objects can be selected and moved by dragging the mouse.
2011-02-05 16:36:04 +01:00
oper_select_queue_draw (self);
oper_select_get_rectangle (self, &selection_rect);
objects = (GList *) ld_diagram_get_objects (self->priv->diagram);
for (iter = objects; iter; iter = g_list_next (iter))
{
LdDiagramObject *object;
object = LD_DIAGRAM_OBJECT (iter->data);
Add support for LdDiagramConnection to LdCanvas. Heavy LdCanvas refactoring, some modifications to ld-types. It just wasn't possible for me to further work with an old, 2000 lines long file without shuffling everything around at the same time.
2011-02-07 01:10:17 +01:00
if (LD_IS_DIAGRAM_SYMBOL (object))
{
if (!get_symbol_area (self,
LD_DIAGRAM_SYMBOL (object), &rect))
continue;
}
else if (LD_IS_DIAGRAM_CONNECTION (object))
{
if (!get_connection_area (self,
LD_DIAGRAM_CONNECTION (object), &rect))
continue;
}
Refactor ld-canvas.c, extend LdCanvas operations. Now objects can be selected and moved by dragging the mouse.
2011-02-05 16:36:04 +01:00
Add support for LdDiagramConnection to LdCanvas. Heavy LdCanvas refactoring, some modifications to ld-types. It just wasn't possible for me to further work with an old, 2000 lines long file without shuffling everything around at the same time.
2011-02-07 01:10:17 +01:00
ld_rectangle_extend (&rect, OBJECT_BORDER_TOLERANCE);
if (ld_rectangle_contains (&selection_rect, &rect))
Refactor ld-canvas.c, extend LdCanvas operations. Now objects can be selected and moved by dragging the mouse.
2011-02-05 16:36:04 +01:00
ld_diagram_select (self->priv->diagram, object);
else
ld_diagram_unselect (self->priv->diagram, object);
}
}
static void
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
oper_move_selection_begin (LdDiagramView *self, const LdPoint *point)
Refactor ld-canvas.c, extend LdCanvas operations. Now objects can be selected and moved by dragging the mouse.
2011-02-05 16:36:04 +01:00
{
MoveSelectionData *data;
Emit "cancel-operation", don't call the handler.
2011-02-14 08:46:41 +01:00
g_signal_emit (self,
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
LD_DIAGRAM_VIEW_GET_CLASS (self)->cancel_operation_signal, 0);
Refactor ld-canvas.c, extend LdCanvas operations. Now objects can be selected and moved by dragging the mouse.
2011-02-05 16:36:04 +01:00
self->priv->operation = OPER_MOVE_SELECTION;
self->priv->operation_end = oper_move_selection_end;
ld_diagram_begin_user_action (self->priv->diagram);
data = &OPER_DATA (self, move_selection);
Add support for LdDiagramConnection to LdCanvas. Heavy LdCanvas refactoring, some modifications to ld-types. It just wasn't possible for me to further work with an old, 2000 lines long file without shuffling everything around at the same time.
2011-02-07 01:10:17 +01:00
data->move_origin = self->priv->drag_start_pos;
Refactor ld-canvas.c, extend LdCanvas operations. Now objects can be selected and moved by dragging the mouse.
2011-02-05 16:36:04 +01:00
Add support for LdDiagramConnection to LdCanvas. Heavy LdCanvas refactoring, some modifications to ld-types. It just wasn't possible for me to further work with an old, 2000 lines long file without shuffling everything around at the same time.
2011-02-07 01:10:17 +01:00
oper_move_selection_motion (self, point);
Refactor ld-canvas.c, extend LdCanvas operations. Now objects can be selected and moved by dragging the mouse.
2011-02-05 16:36:04 +01:00
}
static void
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
oper_move_selection_end (LdDiagramView *self)
Refactor ld-canvas.c, extend LdCanvas operations. Now objects can be selected and moved by dragging the mouse.
2011-02-05 16:36:04 +01:00
{
ld_diagram_end_user_action (self->priv->diagram);
}
static void
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
oper_move_selection_motion (LdDiagramView *self, const LdPoint *point)
Refactor ld-canvas.c, extend LdCanvas operations. Now objects can be selected and moved by dragging the mouse.
2011-02-05 16:36:04 +01:00
{
MoveSelectionData *data;
Use correct rounding when moving selection.
2011-02-05 20:17:39 +01:00
gdouble scale, dx, dy, move_x, move_y;
Refactor ld-canvas.c, extend LdCanvas operations. Now objects can be selected and moved by dragging the mouse.
2011-02-05 16:36:04 +01:00
gdouble move = FALSE;
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
scale = ld_diagram_view_get_scale_in_px (self);
Refactor ld-canvas.c, extend LdCanvas operations. Now objects can be selected and moved by dragging the mouse.
2011-02-05 16:36:04 +01:00
data = &OPER_DATA (self, move_selection);
Add support for LdDiagramConnection to LdCanvas. Heavy LdCanvas refactoring, some modifications to ld-types. It just wasn't possible for me to further work with an old, 2000 lines long file without shuffling everything around at the same time.
2011-02-07 01:10:17 +01:00
dx = point->x - data->move_origin.x;
dy = point->y - data->move_origin.y;
Use correct rounding when moving selection.
2011-02-05 20:17:39 +01:00
move_x = dx < 0 ? ceil (dx / scale) : floor (dx / scale);
move_y = dy < 0 ? ceil (dy / scale) : floor (dy / scale);
Refactor ld-canvas.c, extend LdCanvas operations. Now objects can be selected and moved by dragging the mouse.
2011-02-05 16:36:04 +01:00
if (ABS (move_x) >= 1)
{
data->move_origin.x += move_x * scale;
move = TRUE;
}
if (ABS (move_y) >= 1)
{
data->move_origin.y += move_y * scale;
move = TRUE;
}
if (move)
move_selection (self, move_x, move_y);
}
/* ===== Events, rendering ================================================= */
Simulate motion events when needed.
2011-01-10 04:24:16 +01:00
static void
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
simulate_motion (LdDiagramView *self)
Simulate motion events when needed.
2011-01-10 04:24:16 +01:00
{
GdkEventMotion event;
GtkWidget *widget;
Get more GTK+ 3 ready and respect seals.
2012-08-31 15:23:02 +02:00
GdkWindow *window;
Fix motion simulation
2015-01-20 09:07:58 +01:00
GdkDevice *pointer;
Simulate motion events when needed.
2011-01-10 04:24:16 +01:00
gint x, y;
GdkModifierType state;
Fix motion simulation
2015-01-20 09:07:58 +01:00
if (self->priv->simulation_lock)
return;
Simulate motion events when needed.
2011-01-10 04:24:16 +01:00
widget = GTK_WIDGET (self);
Get more GTK+ 3 ready and respect seals.
2012-08-31 15:23:02 +02:00
window = gtk_widget_get_window (widget);
Simulate motion events when needed.
2011-01-10 04:24:16 +01:00
Fix motion simulation
2015-01-20 09:07:58 +01:00
pointer = gdk_device_manager_get_client_pointer
(gdk_display_get_device_manager (gtk_widget_get_display (widget)));
if (gdk_device_get_window_at_position (pointer, &x, &y) != window)
Simulate motion events when needed.
2011-01-10 04:24:16 +01:00
return;
Fix motion simulation
2015-01-20 09:07:58 +01:00
gdk_device_get_state (pointer, window, NULL, &state);
Simulate motion events when needed.
2011-01-10 04:24:16 +01:00
memset (&event, 0, sizeof (event));
event.type = GDK_MOTION_NOTIFY;
Get more GTK+ 3 ready and respect seals.
2012-08-31 15:23:02 +02:00
event.window = window;
Simulate motion events when needed.
2011-01-10 04:24:16 +01:00
event.x = x;
event.y = y;
event.state = state;
on_motion_notify (widget, &event, NULL);
}
Make adding symbols to the diagram possible. This required creating a simple framework for operations to LdCanvas. It is probable that it's going to require some changes when other operations are added. The basic idea behind it seems to be good, though.
2011-01-04 09:54:05 +01:00
static gboolean
on_motion_notify (GtkWidget *widget, GdkEventMotion *event, gpointer user_data)
{
Add support for LdDiagramConnection to LdCanvas. Heavy LdCanvas refactoring, some modifications to ld-types. It just wasn't possible for me to further work with an old, 2000 lines long file without shuffling everything around at the same time.
2011-02-07 01:10:17 +01:00
LdPoint point;
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
LdDiagramView *self;
Refactor ld-canvas.c, extend LdCanvas operations. Now objects can be selected and moved by dragging the mouse.
2011-02-05 16:36:04 +01:00
AddObjectData *add_data;
Make adding symbols to the diagram possible. This required creating a simple framework for operations to LdCanvas. It is probable that it's going to require some changes when other operations are added. The basic idea behind it seems to be good, though.
2011-01-04 09:54:05 +01:00
Add support for LdDiagramConnection to LdCanvas. Heavy LdCanvas refactoring, some modifications to ld-types. It just wasn't possible for me to further work with an old, 2000 lines long file without shuffling everything around at the same time.
2011-02-07 01:10:17 +01:00
point.x = event->x;
point.y = event->y;
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
self = LD_DIAGRAM_VIEW (widget);
Fix motion simulation
2015-01-20 09:07:58 +01:00
/* Prevent endless looping when any of the following code changes our
* properties, for example during OPER_MOVE_VIEW.
*/
self->priv->simulation_lock = TRUE;
Make adding symbols to the diagram possible. This required creating a simple framework for operations to LdCanvas. It is probable that it's going to require some changes when other operations are added. The basic idea behind it seems to be good, though.
2011-01-04 09:54:05 +01:00
switch (self->priv->operation)
{
Add scrolling using the middle mouse button. A bit of refactoring, too.
2011-06-09 13:54:37 +02:00
case OPER_MOVE_VIEW:
oper_move_view_motion (self, &point);
break;
Make adding symbols to the diagram possible. This required creating a simple framework for operations to LdCanvas. It is probable that it's going to require some changes when other operations are added. The basic idea behind it seems to be good, though.
2011-01-04 09:54:05 +01:00
case OPER_ADD_OBJECT:
Refactor ld-canvas.c, extend LdCanvas operations. Now objects can be selected and moved by dragging the mouse.
2011-02-05 16:36:04 +01:00
add_data = &OPER_DATA (self, add_object);
add_data->visible = TRUE;
Make adding symbols to the diagram possible. This required creating a simple framework for operations to LdCanvas. It is probable that it's going to require some changes when other operations are added. The basic idea behind it seems to be good, though.
2011-01-04 09:54:05 +01:00
Refactor ld-canvas.c, extend LdCanvas operations. Now objects can be selected and moved by dragging the mouse.
2011-02-05 16:36:04 +01:00
queue_object_draw (self, add_data->object);
Add support for LdDiagramConnection to LdCanvas. Heavy LdCanvas refactoring, some modifications to ld-types. It just wasn't possible for me to further work with an old, 2000 lines long file without shuffling everything around at the same time.
2011-02-07 01:10:17 +01:00
move_object_to_point (self, add_data->object, &point);
Refactor ld-canvas.c, extend LdCanvas operations. Now objects can be selected and moved by dragging the mouse.
2011-02-05 16:36:04 +01:00
queue_object_draw (self, add_data->object);
break;
Add support for LdDiagramConnection to LdCanvas. Heavy LdCanvas refactoring, some modifications to ld-types. It just wasn't possible for me to further work with an old, 2000 lines long file without shuffling everything around at the same time.
2011-02-07 01:10:17 +01:00
case OPER_CONNECT:
oper_connect_motion (self, &point);
break;
Refactor ld-canvas.c, extend LdCanvas operations. Now objects can be selected and moved by dragging the mouse.
2011-02-05 16:36:04 +01:00
case OPER_SELECT:
Add support for LdDiagramConnection to LdCanvas. Heavy LdCanvas refactoring, some modifications to ld-types. It just wasn't possible for me to further work with an old, 2000 lines long file without shuffling everything around at the same time.
2011-02-07 01:10:17 +01:00
oper_select_motion (self, &point);
Refactor ld-canvas.c, extend LdCanvas operations. Now objects can be selected and moved by dragging the mouse.
2011-02-05 16:36:04 +01:00
break;
case OPER_MOVE_SELECTION:
Add support for LdDiagramConnection to LdCanvas. Heavy LdCanvas refactoring, some modifications to ld-types. It just wasn't possible for me to further work with an old, 2000 lines long file without shuffling everything around at the same time.
2011-02-07 01:10:17 +01:00
oper_move_selection_motion (self, &point);
Make adding symbols to the diagram possible. This required creating a simple framework for operations to LdCanvas. It is probable that it's going to require some changes when other operations are added. The basic idea behind it seems to be good, though.
2011-01-04 09:54:05 +01:00
break;
Highlight symbol terminals on mouse hover.
2011-01-09 04:50:58 +01:00
case OPER_0:
Refactor ld-canvas.c, extend LdCanvas operations. Now objects can be selected and moved by dragging the mouse.
2011-02-05 16:36:04 +01:00
if (event->state & GDK_BUTTON1_MASK
&& (event->x != self->priv->drag_start_pos.x
Add scrolling using the middle mouse button. A bit of refactoring, too.
2011-06-09 13:54:37 +02:00
|| event->y != self->priv->drag_start_pos.y))
Refactor ld-canvas.c, extend LdCanvas operations. Now objects can be selected and moved by dragging the mouse.
2011-02-05 16:36:04 +01:00
{
switch (self->priv->drag_operation)
{
Add support for LdDiagramConnection to LdCanvas. Heavy LdCanvas refactoring, some modifications to ld-types. It just wasn't possible for me to further work with an old, 2000 lines long file without shuffling everything around at the same time.
2011-02-07 01:10:17 +01:00
case OPER_CONNECT:
oper_connect_begin (self, &point);
break;
Refactor ld-canvas.c, extend LdCanvas operations. Now objects can be selected and moved by dragging the mouse.
2011-02-05 16:36:04 +01:00
case OPER_SELECT:
Add support for LdDiagramConnection to LdCanvas. Heavy LdCanvas refactoring, some modifications to ld-types. It just wasn't possible for me to further work with an old, 2000 lines long file without shuffling everything around at the same time.
2011-02-07 01:10:17 +01:00
oper_select_begin (self, &point);
Refactor ld-canvas.c, extend LdCanvas operations. Now objects can be selected and moved by dragging the mouse.
2011-02-05 16:36:04 +01:00
break;
case OPER_MOVE_SELECTION:
Add support for LdDiagramConnection to LdCanvas. Heavy LdCanvas refactoring, some modifications to ld-types. It just wasn't possible for me to further work with an old, 2000 lines long file without shuffling everything around at the same time.
2011-02-07 01:10:17 +01:00
oper_move_selection_begin (self, &point);
Refactor ld-canvas.c, extend LdCanvas operations. Now objects can be selected and moved by dragging the mouse.
2011-02-05 16:36:04 +01:00
break;
}
}
Add support for LdDiagramConnection to LdCanvas. Heavy LdCanvas refactoring, some modifications to ld-types. It just wasn't possible for me to further work with an old, 2000 lines long file without shuffling everything around at the same time.
2011-02-07 01:10:17 +01:00
check_terminals (self, &point);
Highlight symbol terminals on mouse hover.
2011-01-09 04:50:58 +01:00
break;
Make adding symbols to the diagram possible. This required creating a simple framework for operations to LdCanvas. It is probable that it's going to require some changes when other operations are added. The basic idea behind it seems to be good, though.
2011-01-04 09:54:05 +01:00
}
Fix motion simulation
2015-01-20 09:07:58 +01:00
self->priv->simulation_lock = FALSE;
Make adding symbols to the diagram possible. This required creating a simple framework for operations to LdCanvas. It is probable that it's going to require some changes when other operations are added. The basic idea behind it seems to be good, though.
2011-01-04 09:54:05 +01:00
return FALSE;
}
static gboolean
on_leave_notify (GtkWidget *widget, GdkEventCrossing *event, gpointer user_data)
{
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
LdDiagramView *self;
Make adding symbols to the diagram possible. This required creating a simple framework for operations to LdCanvas. It is probable that it's going to require some changes when other operations are added. The basic idea behind it seems to be good, though.
2011-01-04 09:54:05 +01:00
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
self = LD_DIAGRAM_VIEW (widget);
Make adding symbols to the diagram possible. This required creating a simple framework for operations to LdCanvas. It is probable that it's going to require some changes when other operations are added. The basic idea behind it seems to be good, though.
2011-01-04 09:54:05 +01:00
switch (self->priv->operation)
{
AddObjectData *data;
case OPER_ADD_OBJECT:
data = &OPER_DATA (self, add_object);
data->visible = FALSE;
Refactor queue_object_redraw().
2011-01-09 04:39:05 +01:00
queue_object_draw (self, data->object);
Make adding symbols to the diagram possible. This required creating a simple framework for operations to LdCanvas. It is probable that it's going to require some changes when other operations are added. The basic idea behind it seems to be good, though.
2011-01-04 09:54:05 +01:00
break;
}
return FALSE;
}
static gboolean
on_button_press (GtkWidget *widget, GdkEventButton *event, gpointer user_data)
{
Add support for LdDiagramConnection to LdCanvas. Heavy LdCanvas refactoring, some modifications to ld-types. It just wasn't possible for me to further work with an old, 2000 lines long file without shuffling everything around at the same time.
2011-02-07 01:10:17 +01:00
LdPoint point;
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
LdDiagramView *self;
Add support for LdDiagramConnection to LdCanvas. Heavy LdCanvas refactoring, some modifications to ld-types. It just wasn't possible for me to further work with an old, 2000 lines long file without shuffling everything around at the same time.
2011-02-07 01:10:17 +01:00
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
self = LD_DIAGRAM_VIEW (widget);
Ignore double/triple clicks in LdDiagramView. Fixes fast rotating.
2012-10-08 00:11:34 +02:00
if (!self->priv->diagram
|| event->type != GDK_BUTTON_PRESS)
Refactor ld-canvas.c, extend LdCanvas operations. Now objects can be selected and moved by dragging the mouse.
2011-02-05 16:36:04 +01:00
return FALSE;
Add scrolling using the middle mouse button. A bit of refactoring, too.
2011-06-09 13:54:37 +02:00
point.x = event->x;
point.y = event->y;
switch (event->button)
Allow rotation of symbols. Bind this action to the right mouse button. Due to limitations of json-glib, we can't store rotation as an enum.
2011-02-14 10:14:28 +01:00
{
Add scrolling using the middle mouse button. A bit of refactoring, too.
2011-06-09 13:54:37 +02:00
case 1:
on_left_button_press (self, event, &point);
break;
case 2:
on_middle_button_press (self, event, &point);
break;
case 3:
on_right_button_press (self, event, &point);
break;
Allow rotation of symbols. Bind this action to the right mouse button. Due to limitations of json-glib, we can't store rotation as an enum.
2011-02-14 10:14:28 +01:00
}
Add scrolling using the middle mouse button. A bit of refactoring, too.
2011-06-09 13:54:37 +02:00
return FALSE;
}
Allow rotation of symbols. Bind this action to the right mouse button. Due to limitations of json-glib, we can't store rotation as an enum.
2011-02-14 10:14:28 +01:00
Add scrolling using the middle mouse button. A bit of refactoring, too.
2011-06-09 13:54:37 +02:00
static void
on_left_button_press (LdDiagramView *self, GdkEventButton *event,
const LdPoint *point)
{
AddObjectData *data;
LdDiagramObject *object_at_cursor;
if (!gtk_widget_has_focus (GTK_WIDGET (self)))
gtk_widget_grab_focus (GTK_WIDGET (self));
Allow rotation of symbols. Bind this action to the right mouse button. Due to limitations of json-glib, we can't store rotation as an enum.
2011-02-14 10:14:28 +01:00
Refactor ld-canvas.c, extend LdCanvas operations. Now objects can be selected and moved by dragging the mouse.
2011-02-05 16:36:04 +01:00
self->priv->drag_operation = OPER_0;
Make adding symbols to the diagram possible. This required creating a simple framework for operations to LdCanvas. It is probable that it's going to require some changes when other operations are added. The basic idea behind it seems to be good, though.
2011-01-04 09:54:05 +01:00
switch (self->priv->operation)
{
case OPER_ADD_OBJECT:
data = &OPER_DATA (self, add_object);
Refactor queue_object_redraw().
2011-01-09 04:39:05 +01:00
queue_object_draw (self, data->object);
Add scrolling using the middle mouse button. A bit of refactoring, too.
2011-06-09 13:54:37 +02:00
move_object_to_point (self, data->object, point);
Refactor ld-canvas.c, extend LdCanvas operations. Now objects can be selected and moved by dragging the mouse.
2011-02-05 16:36:04 +01:00
ld_diagram_insert_object (self->priv->diagram, data->object, -1);
Make adding symbols to the diagram possible. This required creating a simple framework for operations to LdCanvas. It is probable that it's going to require some changes when other operations are added. The basic idea behind it seems to be good, though.
2011-01-04 09:54:05 +01:00
/* XXX: "cancel" causes confusion. */
Emit "cancel-operation", don't call the handler.
2011-02-14 08:46:41 +01:00
g_signal_emit (self,
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
LD_DIAGRAM_VIEW_GET_CLASS (self)->cancel_operation_signal, 0);
Make adding symbols to the diagram possible. This required creating a simple framework for operations to LdCanvas. It is probable that it's going to require some changes when other operations are added. The basic idea behind it seems to be good, though.
2011-01-04 09:54:05 +01:00
break;
Allow object selection in LdCanvas. Refactor a part of LdCanvas in the process.
2011-01-07 04:52:44 +01:00
case OPER_0:
Add scrolling using the middle mouse button. A bit of refactoring, too.
2011-06-09 13:54:37 +02:00
self->priv->drag_start_pos = *point;
object_at_cursor = get_object_at_point (self, point);
Allow object selection in LdCanvas. Refactor a part of LdCanvas in the process.
2011-01-07 04:52:44 +01:00
Ignore terminals when hovering above selection. Also fix checking for the shift key and rename the "object" variable to "object_at_cursor" in button handlers.
2011-06-08 07:51:01 +02:00
if (self->priv->terminal_hovered
&& (!ld_diagram_get_selection (self->priv->diagram)
|| !object_at_cursor
|| !is_object_selected (self, object_at_cursor)))
Add support for LdDiagramConnection to LdCanvas. Heavy LdCanvas refactoring, some modifications to ld-types. It just wasn't possible for me to further work with an old, 2000 lines long file without shuffling everything around at the same time.
2011-02-07 01:10:17 +01:00
{
Ignore terminals when hovering above selection. Also fix checking for the shift key and rename the "object" variable to "object_at_cursor" in button handlers.
2011-06-08 07:51:01 +02:00
if (ld_diagram_get_selection (self->priv->diagram))
ld_diagram_unselect_all (self->priv->diagram);
Add support for LdDiagramConnection to LdCanvas. Heavy LdCanvas refactoring, some modifications to ld-types. It just wasn't possible for me to further work with an old, 2000 lines long file without shuffling everything around at the same time.
2011-02-07 01:10:17 +01:00
Ignore terminals when hovering above selection. Also fix checking for the shift key and rename the "object" variable to "object_at_cursor" in button handlers.
2011-06-08 07:51:01 +02:00
self->priv->drag_operation = OPER_CONNECT;
Refactor ld-canvas.c, extend LdCanvas operations. Now objects can be selected and moved by dragging the mouse.
2011-02-05 16:36:04 +01:00
}
Ignore terminals when hovering above selection. Also fix checking for the shift key and rename the "object" variable to "object_at_cursor" in button handlers.
2011-06-08 07:51:01 +02:00
else if (object_at_cursor)
Refactor ld-canvas.c, extend LdCanvas operations. Now objects can be selected and moved by dragging the mouse.
2011-02-05 16:36:04 +01:00
{
Ignore terminals when hovering above selection. Also fix checking for the shift key and rename the "object" variable to "object_at_cursor" in button handlers.
2011-06-08 07:51:01 +02:00
if (!is_object_selected (self, object_at_cursor))
{
if (!(event->state & GDK_SHIFT_MASK))
ld_diagram_unselect_all (self->priv->diagram);
ld_diagram_select (self->priv->diagram, object_at_cursor);
}
Refactor ld-canvas.c, extend LdCanvas operations. Now objects can be selected and moved by dragging the mouse.
2011-02-05 16:36:04 +01:00
self->priv->drag_operation = OPER_MOVE_SELECTION;
Allow object selection in LdCanvas. Refactor a part of LdCanvas in the process.
2011-01-07 04:52:44 +01:00
}
Refactor ld-canvas.c, extend LdCanvas operations. Now objects can be selected and moved by dragging the mouse.
2011-02-05 16:36:04 +01:00
else
Ignore terminals when hovering above selection. Also fix checking for the shift key and rename the "object" variable to "object_at_cursor" in button handlers.
2011-06-08 07:51:01 +02:00
{
ld_diagram_unselect_all (self->priv->diagram);
self->priv->drag_operation = OPER_SELECT;
}
Allow object selection in LdCanvas. Refactor a part of LdCanvas in the process.
2011-01-07 04:52:44 +01:00
break;
Make adding symbols to the diagram possible. This required creating a simple framework for operations to LdCanvas. It is probable that it's going to require some changes when other operations are added. The basic idea behind it seems to be good, though.
2011-01-04 09:54:05 +01:00
}
Add scrolling using the middle mouse button. A bit of refactoring, too.
2011-06-09 13:54:37 +02:00
}
static void
on_middle_button_press (LdDiagramView *self, GdkEventButton *event,
const LdPoint *point)
{
if (self->priv->operation == OPER_0)
oper_move_view_begin (self, point);
}
static void
on_right_button_press (LdDiagramView *self, GdkEventButton *event,
const LdPoint *point)
{
AddObjectData *data;
LdDiagramObject *object_at_cursor;
switch (self->priv->operation)
{
case OPER_ADD_OBJECT:
data = &OPER_DATA (self, add_object);
rotate_symbol (self, LD_DIAGRAM_SYMBOL (data->object));
break;
case OPER_0:
object_at_cursor = get_object_at_point (self, point);
if (object_at_cursor && LD_IS_DIAGRAM_SYMBOL (object_at_cursor))
rotate_symbol (self, LD_DIAGRAM_SYMBOL (object_at_cursor));
break;
}
Make adding symbols to the diagram possible. This required creating a simple framework for operations to LdCanvas. It is probable that it's going to require some changes when other operations are added. The basic idea behind it seems to be good, though.
2011-01-04 09:54:05 +01:00
}
static gboolean
on_button_release (GtkWidget *widget, GdkEventButton *event, gpointer user_data)
{
Add support for LdDiagramConnection to LdCanvas. Heavy LdCanvas refactoring, some modifications to ld-types. It just wasn't possible for me to further work with an old, 2000 lines long file without shuffling everything around at the same time.
2011-02-07 01:10:17 +01:00
LdPoint point;
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
LdDiagramView *self;
Ignore terminals when hovering above selection. Also fix checking for the shift key and rename the "object" variable to "object_at_cursor" in button handlers.
2011-06-08 07:51:01 +02:00
LdDiagramObject *object_at_cursor;
Refactor ld-canvas.c, extend LdCanvas operations. Now objects can be selected and moved by dragging the mouse.
2011-02-05 16:36:04 +01:00
Add scrolling using the middle mouse button. A bit of refactoring, too.
2011-06-09 13:54:37 +02:00
self = LD_DIAGRAM_VIEW (widget);
if (!self->priv->diagram)
Refactor ld-canvas.c, extend LdCanvas operations. Now objects can be selected and moved by dragging the mouse.
2011-02-05 16:36:04 +01:00
return FALSE;
Add support for LdDiagramConnection to LdCanvas. Heavy LdCanvas refactoring, some modifications to ld-types. It just wasn't possible for me to further work with an old, 2000 lines long file without shuffling everything around at the same time.
2011-02-07 01:10:17 +01:00
point.x = event->x;
point.y = event->y;
Add scrolling using the middle mouse button. A bit of refactoring, too.
2011-06-09 13:54:37 +02:00
if (event->button == 2
&& self->priv->operation == OPER_MOVE_VIEW)
{
g_signal_emit (self,
LD_DIAGRAM_VIEW_GET_CLASS (self)->cancel_operation_signal, 0);
return FALSE;
}
if (event->button != 1)
Refactor ld-canvas.c, extend LdCanvas operations. Now objects can be selected and moved by dragging the mouse.
2011-02-05 16:36:04 +01:00
return FALSE;
switch (self->priv->operation)
{
case OPER_SELECT:
case OPER_MOVE_SELECTION:
Add support for LdDiagramConnection to LdCanvas. Heavy LdCanvas refactoring, some modifications to ld-types. It just wasn't possible for me to further work with an old, 2000 lines long file without shuffling everything around at the same time.
2011-02-07 01:10:17 +01:00
case OPER_CONNECT:
Emit "cancel-operation", don't call the handler.
2011-02-14 08:46:41 +01:00
g_signal_emit (self,
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
LD_DIAGRAM_VIEW_GET_CLASS (self)->cancel_operation_signal, 0);
Refactor ld-canvas.c, extend LdCanvas operations. Now objects can be selected and moved by dragging the mouse.
2011-02-05 16:36:04 +01:00
break;
case OPER_0:
Ignore terminals when hovering above selection. Also fix checking for the shift key and rename the "object" variable to "object_at_cursor" in button handlers.
2011-06-08 07:51:01 +02:00
object_at_cursor = get_object_at_point (self, &point);
if (object_at_cursor && is_object_selected (self, object_at_cursor))
Refactor ld-canvas.c, extend LdCanvas operations. Now objects can be selected and moved by dragging the mouse.
2011-02-05 16:36:04 +01:00
{
if (!(event->state & GDK_SHIFT_MASK))
ld_diagram_unselect_all (self->priv->diagram);
Ignore terminals when hovering above selection. Also fix checking for the shift key and rename the "object" variable to "object_at_cursor" in button handlers.
2011-06-08 07:51:01 +02:00
ld_diagram_select (self->priv->diagram, object_at_cursor);
Refactor ld-canvas.c, extend LdCanvas operations. Now objects can be selected and moved by dragging the mouse.
2011-02-05 16:36:04 +01:00
}
break;
}
Make adding symbols to the diagram possible. This required creating a simple framework for operations to LdCanvas. It is probable that it's going to require some changes when other operations are added. The basic idea behind it seems to be good, though.
2011-01-04 09:54:05 +01:00
return FALSE;
}
Make LdCanvas zoom on mouse wheel.
2011-01-08 12:05:59 +01:00
static gboolean
on_scroll (GtkWidget *widget, GdkEventScroll *event, gpointer user_data)
{
When zooming, focus on the cursor.
2011-01-09 05:32:08 +01:00
gdouble prev_x, prev_y;
gdouble new_x, new_y;
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
LdDiagramView *self;
Make LdCanvas zoom on mouse wheel.
2011-01-08 12:05:59 +01:00
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
self = LD_DIAGRAM_VIEW (widget);
When zooming, focus on the cursor.
2011-01-09 05:32:08 +01:00
Disallow wheel zooming when holding mouse buttons.
2011-06-09 13:42:43 +02:00
if (self->priv->operation != OPER_0
&& self->priv->operation != OPER_ADD_OBJECT)
return TRUE;
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
ld_diagram_view_widget_to_diagram_coords (self,
When zooming, focus on the cursor.
2011-01-09 05:32:08 +01:00
event->x, event->y, &prev_x, &prev_y);
Make LdCanvas zoom on mouse wheel.
2011-01-08 12:05:59 +01:00
switch (event->direction)
{
case GDK_SCROLL_UP:
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
ld_diagram_view_zoom_in (self);
Make LdCanvas zoom on mouse wheel.
2011-01-08 12:05:59 +01:00
break;
case GDK_SCROLL_DOWN:
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
ld_diagram_view_zoom_out (self);
Make LdCanvas zoom on mouse wheel.
2011-01-08 12:05:59 +01:00
break;
default:
return FALSE;
}
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
ld_diagram_view_widget_to_diagram_coords (self,
When zooming, focus on the cursor.
2011-01-09 05:32:08 +01:00
event->x, event->y, &new_x, &new_y);
/* Focus on the point under the cursor. */
Add "x" and "y" properties to LdDiagramView. Plus a bit of refactoring.
2011-02-19 14:04:52 +01:00
ld_diagram_view_set_x (self, self->priv->x + prev_x - new_x);
ld_diagram_view_set_y (self, self->priv->y + prev_y - new_y);
When zooming, focus on the cursor.
2011-01-09 05:32:08 +01:00
Make LdCanvas zoom on mouse wheel.
2011-01-08 12:05:59 +01:00
return TRUE;
}
Add drag and drop support for symbols.
2012-10-07 08:34:32 +02:00
static gboolean
on_drag_motion (GtkWidget *widget, GdkDragContext *drag_ctx,
gint x, gint y, guint time, gpointer user_data)
{
LdDiagramView *self;
GdkAtom target;
self = LD_DIAGRAM_VIEW (widget);
target = gtk_drag_dest_find_target (widget, drag_ctx, NULL);
if (target == GDK_NONE)
{
gdk_drag_status (drag_ctx, 0, time);
return TRUE;
}
gdk_drag_status (drag_ctx,
gdk_drag_context_get_suggested_action (drag_ctx), time);
/* Discard leftovers from any previous unsuccessful drag. */
if (self->priv->dnd_left)
{
g_object_unref (self->priv->dnd_symbol);
self->priv->dnd_symbol = NULL;
self->priv->dnd_left = FALSE;
}
self->priv->dnd_last_position.x = x;
self->priv->dnd_last_position.y = y;
if (!self->priv->dnd_symbol)
gtk_drag_get_data (widget, drag_ctx, target, time);
else
{
queue_object_draw (self, self->priv->dnd_symbol);
move_object_to_point (self, self->priv->dnd_symbol,
&self->priv->dnd_last_position);
queue_object_draw (self, self->priv->dnd_symbol);
}
return TRUE;
}
static void
on_drag_data_received (GtkWidget *widget, GdkDragContext *drag_ctx,
gint x, gint y, GtkSelectionData *data, guint info, guint time,
gpointer user_data)
{
LdDiagramView *self;
LdDiagramSymbol *symbol;
const gchar *klass;
self = LD_DIAGRAM_VIEW (widget);
g_return_if_fail (gtk_selection_data_get_length (data) >= 0);
g_return_if_fail (self->priv->dnd_symbol == NULL);
klass = (const gchar *) gtk_selection_data_get_data (data);
symbol = ld_diagram_symbol_new (NULL);
ld_diagram_symbol_set_class (symbol, klass);
self->priv->dnd_symbol = LD_DIAGRAM_OBJECT (symbol);
move_object_to_point (self, self->priv->dnd_symbol,
&self->priv->dnd_last_position);
queue_object_draw (self, self->priv->dnd_symbol);
}
static void
on_drag_leave (GtkWidget *widget, GdkDragContext *drag_ctx,
guint time, gpointer user_data)
{
LdDiagramView *self;
self = LD_DIAGRAM_VIEW (widget);
self->priv->dnd_left = TRUE;
queue_object_draw (self, self->priv->dnd_symbol);
}
static gboolean
on_drag_drop (GtkWidget *widget, GdkDragContext *drag_ctx,
gint x, gint y, guint time, gpointer user_data)
{
LdDiagramView *self;
gboolean del;
del = gdk_drag_context_get_suggested_action (drag_ctx)
== GDK_ACTION_MOVE;
self = LD_DIAGRAM_VIEW (widget);
if (!self->priv->dnd_symbol)
gtk_drag_finish (drag_ctx, FALSE, del, time);
else
{
gtk_drag_finish (drag_ctx, TRUE, del, time);
ld_diagram_insert_object (self->priv->diagram,
self->priv->dnd_symbol, -1);
g_object_unref (self->priv->dnd_symbol);
self->priv->dnd_symbol = NULL;
self->priv->dnd_left = FALSE;
}
return TRUE;
}
Implemented a skeleton of LdCanvas. It now paints itself white and draws a simple grid. Also an LdDocument can be assigned to it.
2010-09-19 09:10:16 +02:00
static gboolean
GTK+ 3: Fix compilation, scrolling, drawing
2015-01-19 02:23:20 +01:00
on_draw (GtkWidget *widget, cairo_t *cr, gpointer user_data)
Implemented a skeleton of LdCanvas. It now paints itself white and draws a simple grid. Also an LdDocument can be assigned to it.
2010-09-19 09:10:16 +02:00
{
Implement more of LdCanvas. 1. Add methods for coordinate translation between cairo/GtkWidget coordinates and LdDocument coordinates. 2. Draw the grid correctly (also make it significantly faster). 3. Place the canvas into a GtkScrolledWindow and register the set_scroll_adjustments signal in the GtkWidget base class. 4. Allow scrolling inside of an area of 200 x 200 units (for now). In the future, it should be possible to go to infinity.
2010-12-07 00:59:05 +01:00
DrawData data;
Implemented a skeleton of LdCanvas. It now paints itself white and draws a simple grid. Also an LdDocument can be assigned to it.
2010-09-19 09:10:16 +02:00
GTK+ 3: Fix compilation, scrolling, drawing
2015-01-19 02:23:20 +01:00
GdkRectangle draw_area;
if (!gdk_cairo_get_clip_rectangle (cr, &draw_area))
return FALSE;
data.cr = cr;
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
data.self = LD_DIAGRAM_VIEW (widget);
data.scale = ld_diagram_view_get_scale_in_px (data.self);
GTK+ 3: Fix compilation, scrolling, drawing
2015-01-19 02:23:20 +01:00
data.exposed_rect.x = draw_area.x;
data.exposed_rect.y = draw_area.y;
data.exposed_rect.width = draw_area.width;
data.exposed_rect.height = draw_area.height;
Implemented a skeleton of LdCanvas. It now paints itself white and draws a simple grid. Also an LdDocument can be assigned to it.
2010-09-19 09:10:16 +02:00
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
color_apply (COLOR_GET (data.self, COLOR_BASE), data.cr);
Implement more of LdCanvas. 1. Add methods for coordinate translation between cairo/GtkWidget coordinates and LdDocument coordinates. 2. Draw the grid correctly (also make it significantly faster). 3. Place the canvas into a GtkScrolledWindow and register the set_scroll_adjustments signal in the GtkWidget base class. 4. Allow scrolling inside of an area of 200 x 200 units (for now). In the future, it should be possible to go to infinity.
2010-12-07 00:59:05 +01:00
cairo_paint (data.cr);
Implemented a skeleton of LdCanvas. It now paints itself white and draws a simple grid. Also an LdDocument can be assigned to it.
2010-09-19 09:10:16 +02:00
Add API for turning off the grid.
2011-03-06 15:56:41 +01:00
if (data.self->priv->show_grid)
draw_grid (widget, &data);
Rename LdDocument* to LdDiagram*. My bad; this name is much more appropriate.
2010-12-16 11:34:02 +01:00
draw_diagram (widget, &data);
Highlight symbol terminals on mouse hover.
2011-01-09 04:50:58 +01:00
draw_terminal (widget, &data);
Implemented a skeleton of LdCanvas. It now paints itself white and draws a simple grid. Also an LdDocument can be assigned to it.
2010-09-19 09:10:16 +02:00
Refactor ld-canvas.c, extend LdCanvas operations. Now objects can be selected and moved by dragging the mouse.
2011-02-05 16:36:04 +01:00
if (data.self->priv->operation == OPER_SELECT)
oper_select_draw (widget, &data);
Implemented a skeleton of LdCanvas. It now paints itself white and draws a simple grid. Also an LdDocument can be assigned to it.
2010-09-19 09:10:16 +02:00
return FALSE;
}
static void
Implement more of LdCanvas. 1. Add methods for coordinate translation between cairo/GtkWidget coordinates and LdDocument coordinates. 2. Draw the grid correctly (also make it significantly faster). 3. Place the canvas into a GtkScrolledWindow and register the set_scroll_adjustments signal in the GtkWidget base class. 4. Allow scrolling inside of an area of 200 x 200 units (for now). In the future, it should be possible to go to infinity.
2010-12-07 00:59:05 +01:00
draw_grid (GtkWidget *widget, DrawData *data)
Implemented a skeleton of LdCanvas. It now paints itself white and draws a simple grid. Also an LdDocument can be assigned to it.
2010-09-19 09:10:16 +02:00
{
Take a better approach to drawing the grid. If the diagram is zoomed out too much, just use bigger steps between dots.
2011-01-08 16:41:55 +01:00
gdouble grid_step;
Fix drawing of the grid.
2011-02-01 17:21:08 +01:00
gint grid_factor;
LdCanvas maintenance. * Rename ld_canvas_translate_*_coordinates() to ld_canvas_*_to_*_coords(). * Add missing parameter assertions to those functions. * Rename local variables in draw_grid(). * Use gdk_cairo_rectangle() in expose-event handler. * Update comments.
2010-12-18 05:23:05 +01:00
gdouble x_init, y_init;
Implement more of LdCanvas. 1. Add methods for coordinate translation between cairo/GtkWidget coordinates and LdDocument coordinates. 2. Draw the grid correctly (also make it significantly faster). 3. Place the canvas into a GtkScrolledWindow and register the set_scroll_adjustments signal in the GtkWidget base class. 4. Allow scrolling inside of an area of 200 x 200 units (for now). In the future, it should be possible to go to infinity.
2010-12-07 00:59:05 +01:00
gdouble x, y;
Speed up drawing of the grid.
2011-02-10 06:03:41 +01:00
cairo_surface_t *grid_surface;
gint stride;
unsigned char *pixels;
guint32 color;
Implement more of LdCanvas. 1. Add methods for coordinate translation between cairo/GtkWidget coordinates and LdDocument coordinates. 2. Draw the grid correctly (also make it significantly faster). 3. Place the canvas into a GtkScrolledWindow and register the set_scroll_adjustments signal in the GtkWidget base class. 4. Allow scrolling inside of an area of 200 x 200 units (for now). In the future, it should be possible to go to infinity.
2010-12-07 00:59:05 +01:00
Take a better approach to drawing the grid. If the diagram is zoomed out too much, just use bigger steps between dots.
2011-01-08 16:41:55 +01:00
grid_step = data->scale;
Fix drawing of the grid.
2011-02-01 17:21:08 +01:00
grid_factor = 1;
Take a better approach to drawing the grid. If the diagram is zoomed out too much, just use bigger steps between dots.
2011-01-08 16:41:55 +01:00
while (grid_step < 5)
Fix drawing of the grid.
2011-02-01 17:21:08 +01:00
{
Take a better approach to drawing the grid. If the diagram is zoomed out too much, just use bigger steps between dots.
2011-01-08 16:41:55 +01:00
grid_step *= 5;
Fix drawing of the grid.
2011-02-01 17:21:08 +01:00
grid_factor *= 5;
}
Don't draw the grid when it would be too narrow. This prevents eating all the memory.
2011-01-08 12:11:08 +01:00
Speed up drawing of the grid.
2011-02-10 06:03:41 +01:00
/* Paint manually on our own raster surface for speed. */
stride = cairo_format_stride_for_width
(CAIRO_FORMAT_ARGB32, data->exposed_rect.width);
pixels = g_malloc0 (stride * data->exposed_rect.height);
grid_surface = cairo_image_surface_create_for_data
(pixels, CAIRO_FORMAT_ARGB32,
data->exposed_rect.width, data->exposed_rect.height, stride);
Implement more of LdCanvas. 1. Add methods for coordinate translation between cairo/GtkWidget coordinates and LdDocument coordinates. 2. Draw the grid correctly (also make it significantly faster). 3. Place the canvas into a GtkScrolledWindow and register the set_scroll_adjustments signal in the GtkWidget base class. 4. Allow scrolling inside of an area of 200 x 200 units (for now). In the future, it should be possible to go to infinity.
2010-12-07 00:59:05 +01:00
LdCanvas maintenance. * Rename ld_canvas_translate_*_coordinates() to ld_canvas_*_to_*_coords(). * Add missing parameter assertions to those functions. * Rename local variables in draw_grid(). * Use gdk_cairo_rectangle() in expose-event handler. * Update comments.
2010-12-18 05:23:05 +01:00
/* Get coordinates of the top-left point. */
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
ld_diagram_view_widget_to_diagram_coords (data->self,
Split in-out parameters into separate in and out. In functions: ld_canvas_diagram_to_widget_coords() ld_canvas_widget_to_diagram_coords()
2011-01-03 05:57:22 +01:00
data->exposed_rect.x, data->exposed_rect.y, &x_init, &y_init);
Fix drawing of the grid.
2011-02-01 17:21:08 +01:00
x_init = ceil (x_init);
x_init = x_init - (gint) x_init % grid_factor;
y_init = ceil (y_init);
y_init = y_init - (gint) y_init % grid_factor;
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
ld_diagram_view_diagram_to_widget_coords (data->self,
Fix drawing of the grid.
2011-02-01 17:21:08 +01:00
x_init, y_init, &x_init, &y_init);
Implement more of LdCanvas. 1. Add methods for coordinate translation between cairo/GtkWidget coordinates and LdDocument coordinates. 2. Draw the grid correctly (also make it significantly faster). 3. Place the canvas into a GtkScrolledWindow and register the set_scroll_adjustments signal in the GtkWidget base class. 4. Allow scrolling inside of an area of 200 x 200 units (for now). In the future, it should be possible to go to infinity.
2010-12-07 00:59:05 +01:00
Speed up drawing of the grid.
2011-02-10 06:03:41 +01:00
x_init -= data->exposed_rect.x;
y_init -= data->exposed_rect.y;
while (x_init < 0)
x_init += grid_step;
while (y_init < 0)
y_init += grid_step;
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
color = color_to_cairo_argb (COLOR_GET (data->self, COLOR_GRID));
Speed up drawing of the grid.
2011-02-10 06:03:41 +01:00
for (x = x_init; x < data->exposed_rect.width; x += grid_step)
for (y = y_init; y < data->exposed_rect.height; y += grid_step)
*((guint32 *) (pixels + stride * (gint) y) + (gint) x) = color;
cairo_set_source_surface (data->cr, grid_surface,
data->exposed_rect.x, data->exposed_rect.y);
cairo_paint (data->cr);
cairo_surface_destroy (grid_surface);
g_free (pixels);
Implemented a skeleton of LdCanvas. It now paints itself white and draws a simple grid. Also an LdDocument can be assigned to it.
2010-09-19 09:10:16 +02:00
}
Highlight symbol terminals on mouse hover.
2011-01-09 04:50:58 +01:00
static void
draw_terminal (GtkWidget *widget, DrawData *data)
{
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
LdDiagramViewPrivate *priv;
Add support for LdDiagramConnection to LdCanvas. Heavy LdCanvas refactoring, some modifications to ld-types. It just wasn't possible for me to further work with an old, 2000 lines long file without shuffling everything around at the same time.
2011-02-07 01:10:17 +01:00
LdPoint widget_coords;
Highlight symbol terminals on mouse hover.
2011-01-09 04:50:58 +01:00
priv = data->self->priv;
Add support for LdDiagramConnection to LdCanvas. Heavy LdCanvas refactoring, some modifications to ld-types. It just wasn't possible for me to further work with an old, 2000 lines long file without shuffling everything around at the same time.
2011-02-07 01:10:17 +01:00
if (!priv->terminal_hovered)
Highlight symbol terminals on mouse hover.
2011-01-09 04:50:58 +01:00
return;
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
color_apply (COLOR_GET (data->self, COLOR_TERMINAL), data->cr);
Highlight symbol terminals on mouse hover.
2011-01-09 04:50:58 +01:00
cairo_set_line_width (data->cr, 1);
cairo_new_path (data->cr);
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
ld_diagram_view_diagram_to_widget_coords (data->self,
Add support for LdDiagramConnection to LdCanvas. Heavy LdCanvas refactoring, some modifications to ld-types. It just wasn't possible for me to further work with an old, 2000 lines long file without shuffling everything around at the same time.
2011-02-07 01:10:17 +01:00
priv->terminal.x, priv->terminal.y,
&widget_coords.x, &widget_coords.y);
cairo_arc (data->cr, widget_coords.x, widget_coords.y,
Highlight symbol terminals on mouse hover.
2011-01-09 04:50:58 +01:00
TERMINAL_RADIUS, 0, 2 * G_PI);
cairo_stroke (data->cr);
}
Implemented a skeleton of LdCanvas. It now paints itself white and draws a simple grid. Also an LdDocument can be assigned to it.
2010-09-19 09:10:16 +02:00
static void
Rename LdDocument* to LdDiagram*. My bad; this name is much more appropriate.
2010-12-16 11:34:02 +01:00
draw_diagram (GtkWidget *widget, DrawData *data)
Implemented a skeleton of LdCanvas. It now paints itself white and draws a simple grid. Also an LdDocument can be assigned to it.
2010-09-19 09:10:16 +02:00
{
Draw diagram objects in reversed order. Previously older objects drew on top of newer ones.
2011-01-09 06:05:43 +01:00
GList *objects, *iter;
Draw symbols from LdDocument in LdCanvas. Just the minimal implementation so far.
2010-12-10 22:44:12 +01:00
Rename LdDocument* to LdDiagram*. My bad; this name is much more appropriate.
2010-12-16 11:34:02 +01:00
if (!data->self->priv->diagram)
Draw symbols from LdDocument in LdCanvas. Just the minimal implementation so far.
2010-12-10 22:44:12 +01:00
return;
cairo_save (data->cr);
cairo_set_line_width (data->cr, 1 / data->scale);
Draw diagram objects in reversed order. Previously older objects drew on top of newer ones.
2011-01-09 06:05:43 +01:00
/* Draw objects from the diagram, from bottom to top. */
objects = (GList *) ld_diagram_get_objects (data->self->priv->diagram);
Revert the order of LdDiagram objects. Now they go from oldest to newest.
2011-01-16 14:33:52 +01:00
for (iter = objects; iter; iter = g_list_next (iter))
Draw diagram objects in reversed order. Previously older objects drew on top of newer ones.
2011-01-09 06:05:43 +01:00
draw_object (LD_DIAGRAM_OBJECT (iter->data), data);
Draw symbols from LdDocument in LdCanvas. Just the minimal implementation so far.
2010-12-10 22:44:12 +01:00
Make adding symbols to the diagram possible. This required creating a simple framework for operations to LdCanvas. It is probable that it's going to require some changes when other operations are added. The basic idea behind it seems to be good, though.
2011-01-04 09:54:05 +01:00
switch (data->self->priv->operation)
{
Add support for LdDiagramConnection to LdCanvas. Heavy LdCanvas refactoring, some modifications to ld-types. It just wasn't possible for me to further work with an old, 2000 lines long file without shuffling everything around at the same time.
2011-02-07 01:10:17 +01:00
AddObjectData *add_data;
ConnectData *connect_data;
Make adding symbols to the diagram possible. This required creating a simple framework for operations to LdCanvas. It is probable that it's going to require some changes when other operations are added. The basic idea behind it seems to be good, though.
2011-01-04 09:54:05 +01:00
case OPER_ADD_OBJECT:
Add support for LdDiagramConnection to LdCanvas. Heavy LdCanvas refactoring, some modifications to ld-types. It just wasn't possible for me to further work with an old, 2000 lines long file without shuffling everything around at the same time.
2011-02-07 01:10:17 +01:00
add_data = &OPER_DATA (data->self, add_object);
if (add_data->visible)
draw_object (add_data->object, data);
break;
case OPER_CONNECT:
connect_data = &OPER_DATA (data->self, connect);
draw_object (LD_DIAGRAM_OBJECT (connect_data->connection), data);
Make adding symbols to the diagram possible. This required creating a simple framework for operations to LdCanvas. It is probable that it's going to require some changes when other operations are added. The basic idea behind it seems to be good, though.
2011-01-04 09:54:05 +01:00
break;
}
Add drag and drop support for symbols.
2012-10-07 08:34:32 +02:00
if (data->self->priv->dnd_symbol && !data->self->priv->dnd_left)
draw_object (data->self->priv->dnd_symbol, data);
Draw symbols from LdDocument in LdCanvas. Just the minimal implementation so far.
2010-12-10 22:44:12 +01:00
cairo_restore (data->cr);
Implemented a skeleton of LdCanvas. It now paints itself white and draws a simple grid. Also an LdDocument can be assigned to it.
2010-09-19 09:10:16 +02:00
}
Draw symbols from LdDocument in LdCanvas. Just the minimal implementation so far.
2010-12-10 22:44:12 +01:00
static void
Partial refactoring of LdCanvas. draw_symbol() had been doing too much.
2011-01-04 00:45:44 +01:00
draw_object (LdDiagramObject *diagram_object, DrawData *data)
Draw symbols from LdDocument in LdCanvas. Just the minimal implementation so far.
2010-12-10 22:44:12 +01:00
{
Partial refactoring of LdCanvas. draw_symbol() had been doing too much.
2011-01-04 00:45:44 +01:00
g_return_if_fail (LD_IS_DIAGRAM_OBJECT (diagram_object));
Draw symbols from LdDocument in LdCanvas. Just the minimal implementation so far.
2010-12-10 22:44:12 +01:00
g_return_if_fail (data != NULL);
Allow object selection in LdCanvas. Refactor a part of LdCanvas in the process.
2011-01-07 04:52:44 +01:00
if (is_object_selected (data->self, diagram_object))
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
color_apply (COLOR_GET (data->self, COLOR_SELECTION), data->cr);
Draw selected objects with another color. Store all colors in LdCanvasPrivate and initialize them upon object creation. This creates a base for color themes. Make attempts to try adding an object that's not a part of the document to the selection issue a warning.
2011-01-05 01:11:03 +01:00
else
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
color_apply (COLOR_GET (data->self, COLOR_OBJECT), data->cr);
Draw selected objects with another color. Store all colors in LdCanvasPrivate and initialize them upon object creation. This creates a base for color themes. Make attempts to try adding an object that's not a part of the document to the selection issue a warning.
2011-01-05 01:11:03 +01:00
Partial refactoring of LdCanvas. draw_symbol() had been doing too much.
2011-01-04 00:45:44 +01:00
if (LD_IS_DIAGRAM_SYMBOL (diagram_object))
draw_symbol (LD_DIAGRAM_SYMBOL (diagram_object), data);
Add support for LdDiagramConnection to LdCanvas. Heavy LdCanvas refactoring, some modifications to ld-types. It just wasn't possible for me to further work with an old, 2000 lines long file without shuffling everything around at the same time.
2011-02-07 01:10:17 +01:00
else if (LD_IS_DIAGRAM_CONNECTION (diagram_object))
draw_connection (LD_DIAGRAM_CONNECTION (diagram_object), data);
Draw symbols from LdDocument in LdCanvas. Just the minimal implementation so far.
2010-12-10 22:44:12 +01:00
}
static void
Rename LdDocument* to LdDiagram*. My bad; this name is much more appropriate.
2010-12-16 11:34:02 +01:00
draw_symbol (LdDiagramSymbol *diagram_symbol, DrawData *data)
Draw symbols from LdDocument in LdCanvas. Just the minimal implementation so far.
2010-12-10 22:44:12 +01:00
{
LdSymbol *symbol;
Introduce LdRectangle, LdPoint and LdPointArray. Remove LdCanvasRect and LdSymbolArea.
2011-01-08 06:44:40 +01:00
LdRectangle clip_rect;
Allow object selection in LdCanvas. Refactor a part of LdCanvas in the process.
2011-01-07 04:52:44 +01:00
gdouble x, y;
Allow rotation of symbols. Bind this action to the right mouse button. Due to limitations of json-glib, we can't store rotation as an enum.
2011-02-14 10:14:28 +01:00
gint rotation;
Draw symbols from LdDocument in LdCanvas. Just the minimal implementation so far.
2010-12-10 22:44:12 +01:00
Add support for LdDiagramConnection to LdCanvas. Heavy LdCanvas refactoring, some modifications to ld-types. It just wasn't possible for me to further work with an old, 2000 lines long file without shuffling everything around at the same time.
2011-02-07 01:10:17 +01:00
symbol = resolve_symbol (data->self, diagram_symbol);
Draw symbols from LdDocument in LdCanvas. Just the minimal implementation so far.
2010-12-10 22:44:12 +01:00
/* TODO: Resolve this better; draw a cross or whatever. */
if (!symbol)
{
Fix a memory leak in LdDiagramSymbol.
2011-02-06 17:57:37 +01:00
gchar *klass;
klass = ld_diagram_symbol_get_class (diagram_symbol);
g_warning ("cannot find symbol `%s' in the library", klass);
g_free (klass);
Draw symbols from LdDocument in LdCanvas. Just the minimal implementation so far.
2010-12-10 22:44:12 +01:00
return;
}
Allow object selection in LdCanvas. Refactor a part of LdCanvas in the process.
2011-01-07 04:52:44 +01:00
if (!get_symbol_clip_area (data->self, diagram_symbol, &clip_rect)
Introduce LdRectangle, LdPoint and LdPointArray. Remove LdCanvasRect and LdSymbolArea.
2011-01-08 06:44:40 +01:00
|| !ld_rectangle_intersects (&clip_rect, &data->exposed_rect))
Partial refactoring of LdCanvas. draw_symbol() had been doing too much.
2011-01-04 00:45:44 +01:00
return;
cairo_save (data->cr);
Allow object selection in LdCanvas. Refactor a part of LdCanvas in the process.
2011-01-07 04:52:44 +01:00
cairo_rectangle (data->cr, clip_rect.x, clip_rect.y,
clip_rect.width, clip_rect.height);
Partial refactoring of LdCanvas. draw_symbol() had been doing too much.
2011-01-04 00:45:44 +01:00
cairo_clip (data->cr);
Allow rotation of symbols. Bind this action to the right mouse button. Due to limitations of json-glib, we can't store rotation as an enum.
2011-02-14 10:14:28 +01:00
g_object_get (diagram_symbol, "x", &x, "y", &y,
"rotation", &rotation, NULL);
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
ld_diagram_view_diagram_to_widget_coords (data->self, x, y, &x, &y);
Draw symbols from LdDocument in LdCanvas. Just the minimal implementation so far.
2010-12-10 22:44:12 +01:00
cairo_translate (data->cr, x, y);
cairo_scale (data->cr, data->scale, data->scale);
Add support for LdDiagramConnection to LdCanvas. Heavy LdCanvas refactoring, some modifications to ld-types. It just wasn't possible for me to further work with an old, 2000 lines long file without shuffling everything around at the same time.
2011-02-07 01:10:17 +01:00
Allow rotation of symbols. Bind this action to the right mouse button. Due to limitations of json-glib, we can't store rotation as an enum.
2011-02-14 10:14:28 +01:00
switch (rotation)
{
case LD_DIAGRAM_SYMBOL_ROTATION_90:
cairo_rotate (data->cr, G_PI * 0.5);
break;
case LD_DIAGRAM_SYMBOL_ROTATION_180:
cairo_rotate (data->cr, G_PI);
break;
case LD_DIAGRAM_SYMBOL_ROTATION_270:
cairo_rotate (data->cr, G_PI * 1.5);
break;
}
Draw symbols from LdDocument in LdCanvas. Just the minimal implementation so far.
2010-12-10 22:44:12 +01:00
ld_symbol_draw (symbol, data->cr);
Add support for LdDiagramConnection to LdCanvas. Heavy LdCanvas refactoring, some modifications to ld-types. It just wasn't possible for me to further work with an old, 2000 lines long file without shuffling everything around at the same time.
2011-02-07 01:10:17 +01:00
cairo_restore (data->cr);
}
static void
draw_connection (LdDiagramConnection *connection, DrawData *data)
{
LdRectangle clip_rect;
LdPointArray *points;
gdouble x, y;
guint i;
if (!get_connection_clip_area (data->self, connection, &clip_rect)
|| !ld_rectangle_intersects (&clip_rect, &data->exposed_rect))
return;
points = ld_diagram_connection_get_points (connection);
if (points->length < 2)
goto draw_connection_end;
Draw symbols from LdDocument in LdCanvas. Just the minimal implementation so far.
2010-12-10 22:44:12 +01:00
Add support for LdDiagramConnection to LdCanvas. Heavy LdCanvas refactoring, some modifications to ld-types. It just wasn't possible for me to further work with an old, 2000 lines long file without shuffling everything around at the same time.
2011-02-07 01:10:17 +01:00
cairo_save (data->cr);
g_object_get (connection, "x", &x, "y", &y, NULL);
Rename LdCanvas to LdDiagramView.
2011-02-16 07:50:07 +01:00
ld_diagram_view_diagram_to_widget_coords (data->self, x, y, &x, &y);
Add support for LdDiagramConnection to LdCanvas. Heavy LdCanvas refactoring, some modifications to ld-types. It just wasn't possible for me to further work with an old, 2000 lines long file without shuffling everything around at the same time.
2011-02-07 01:10:17 +01:00
cairo_translate (data->cr, x, y);
cairo_scale (data->cr, data->scale, data->scale);
for (i = 1; i < points->length; i++)
{
cairo_move_to (data->cr,
points->points[i - 1].x,
points->points[i - 1].y);
cairo_line_to (data->cr,
points->points[i].x,
points->points[i].y);
cairo_stroke (data->cr);
}
Draw symbols from LdDocument in LdCanvas. Just the minimal implementation so far.
2010-12-10 22:44:12 +01:00
cairo_restore (data->cr);
Add support for LdDiagramConnection to LdCanvas. Heavy LdCanvas refactoring, some modifications to ld-types. It just wasn't possible for me to further work with an old, 2000 lines long file without shuffling everything around at the same time.
2011-02-07 01:10:17 +01:00
draw_connection_end:
ld_point_array_free (points);
return;
Draw symbols from LdDocument in LdCanvas. Just the minimal implementation so far.
2010-12-10 22:44:12 +01:00
}