index e1cafb1fd6df240102481ce4d013c3d4a876f3e8..f36d8dc5a994cfc7975a1d65f00aa0bcf213f577 100644 (file)
*
*/
+/* As a general comment, I am not exactly proud of how things are done.
+ * (for example the 'enable' widget and readRepr things)
+ * It does seem to work however. I intend to clean up and sort things out later, but that can take forever...
+ * Don't be shy to correct things.
+ */
+
#include "sp-canvas-util.h"
+#include "util/mathfns.h"
#include "display-forward.h"
#include <libnr/nr-pixops.h>
#include "desktop-handles.h"
#include "desktop.h"
#include "../document.h"
+#include "prefs-utils.h"
#include "canvas-grid.h"
#include "canvas-axonomgrid.h"
namespace Inkscape {
-#define DEFAULTGRIDCOLOR 0x0000FF20
-#define DEFAULTGRIDEMPCOLOR 0x0000FF40
-
-const gchar *grid_name [] = {
+static gchar const *const grid_name[] = {
N_("Rectangular grid"),
N_("Axonometric grid")
};
-const gchar *grid_svgname [] = {
+static gchar const *const grid_svgname[] = {
"xygrid",
"axonomgrid"
};
{
GridCanvasItem *gridcanvasitem = INKSCAPE_GRID_CANVASITEM (item);
- sp_canvas_prepare_buffer (buf);
-
- if (gridcanvasitem->grid) gridcanvasitem->grid->Render(buf);
+ if ( gridcanvasitem->grid && gridcanvasitem->grid->isVisible() ) {
+ sp_canvas_prepare_buffer (buf);
+ gridcanvasitem->grid->Render(buf);
+ }
}
static void
@@ -150,9 +156,11 @@ grid_canvasitem_update (SPCanvasItem *item, NR::Matrix const &affine, unsigned i
NULL /* order_changed */
};
-CanvasGrid::CanvasGrid(SPNamedView * nv, Inkscape::XML::Node * in_repr)
+CanvasGrid::CanvasGrid(SPNamedView * nv, Inkscape::XML::Node * in_repr, SPDocument *in_doc, GridType type)
+ : visible(true), gridtype(type)
{
repr = in_repr;
+ doc = in_doc;
if (repr) {
repr->addListener (&_repr_events, this);
}
}
}
+const char *
+CanvasGrid::getName()
+{
+ return _(grid_name[gridtype]);
+}
+
+const char *
+CanvasGrid::getSVGName()
+{
+ return grid_svgname[gridtype];
+}
+
+GridType
+CanvasGrid::getGridType()
+{
+ return gridtype;
+}
-const char *
+char const *
CanvasGrid::getName(GridType type)
{
return _(grid_name[type]);
}
-const char *
+char const *
CanvasGrid::getSVGName(GridType type)
{
return grid_svgname[type];
}
GridType
-CanvasGrid::getGridTypeFromSVGName(const char * typestr)
+CanvasGrid::getGridTypeFromSVGName(char const *typestr)
{
if (!typestr) return GRID_RECTANGULAR;
}
GridType
-CanvasGrid::getGridTypeFromName(const char * typestr)
+CanvasGrid::getGridTypeFromName(char const *typestr)
{
if (!typestr) return GRID_RECTANGULAR;
* writes an <inkscape:grid> child to repr.
*/
void
-CanvasGrid::writeNewGridToRepr(Inkscape::XML::Node * repr, GridType gridtype)
+CanvasGrid::writeNewGridToRepr(Inkscape::XML::Node * repr, SPDocument * doc, GridType gridtype)
{
if (!repr) return;
if (gridtype > GRID_MAXTYPENR) return;
// first create the child xml node, then hook it to repr. This order is important, to not set off listeners to repr before the new node is complete.
- SPDocument *current_document = sp_desktop_document(SP_ACTIVE_DESKTOP);
- Inkscape::XML::Document *xml_doc = sp_document_repr_doc(current_document);
+ Inkscape::XML::Document *xml_doc = sp_document_repr_doc(doc);
Inkscape::XML::Node *newnode;
newnode = xml_doc->createElement("inkscape:grid");
newnode->setAttribute("type", getSVGName(gridtype));
repr->appendChild(newnode);
+ Inkscape::GC::release(newnode);
- sp_document_done(current_document, SP_VERB_DIALOG_NAMEDVIEW, _("Create new grid"));
+ sp_document_done(doc, SP_VERB_DIALOG_NAMEDVIEW, _("Create new grid"));
}
/*
* Creates a new CanvasGrid object of type gridtype
*/
CanvasGrid*
-CanvasGrid::NewGrid(SPNamedView * nv, Inkscape::XML::Node * in_repr, GridType gridtype)
+CanvasGrid::NewGrid(SPNamedView * nv, Inkscape::XML::Node * repr, SPDocument * doc, GridType gridtype)
{
- if (!in_repr) return NULL;
+ if (!repr) return NULL;
+ if (!doc) {
+ g_error("CanvasGrid::NewGrid - doc==NULL");
+ return NULL;
+ }
switch (gridtype) {
case GRID_RECTANGULAR:
- return (CanvasGrid*) new CanvasXYGrid(nv, in_repr);
+ return (CanvasGrid*) new CanvasXYGrid(nv, repr, doc);
case GRID_AXONOMETRIC:
- return (CanvasGrid*) new CanvasAxonomGrid(nv, in_repr);
+ return (CanvasGrid*) new CanvasAxonomGrid(nv, repr, doc);
}
return NULL;
CanvasGrid::createCanvasItem(SPDesktop * desktop)
{
if (!desktop) return NULL;
- //Johan: I think for multiple desktops it is best if each has their own canvasitem, but share the same CanvasGrid object; that is what this function is for.
+// Johan: I think for multiple desktops it is best if each has their own canvasitem,
+// but share the same CanvasGrid object; that is what this function is for.
// check if there is already a canvasitem on this desktop linking to this grid
for (GSList *l = canvasitems; l != NULL; l = l->next) {
return item;
}
+Gtk::Widget *
+CanvasGrid::newWidget()
+{
+ Gtk::VBox * vbox = Gtk::manage( new Gtk::VBox() );
+ Gtk::Label * namelabel = Gtk::manage(new Gtk::Label("", Gtk::ALIGN_CENTER) );
+
+ Glib::ustring str("<b>");
+ str += getName();
+ str += "</b>";
+ namelabel->set_markup(str);
+ vbox->pack_start(*namelabel, true, true);
+
+ Inkscape::UI::Widget::RegisteredCheckButton * _rcb_visible = Gtk::manage(
+ new Inkscape::UI::Widget::RegisteredCheckButton( _("_Enabled"),
+ _("Determines whether to snap to this grid or not. Can be 'on' for invisible grids."),
+ "enabled", _wr, false, repr, doc) );
+ Inkscape::UI::Widget::RegisteredCheckButton * _rcb_enabled = Gtk::manage(
+ new Inkscape::UI::Widget::RegisteredCheckButton( _("_Visible"),
+ _("Determines whether the grid is displayed or not. Objects are still snapped to invisible grids."),
+ "visible", _wr, true, repr, doc) );
+
+ vbox->pack_start(*_rcb_enabled, true, true);
+ vbox->pack_start(*_rcb_visible, true, true);
+ vbox->pack_start(*newSpecificWidget(), true, true);
+
+ // set widget values
+ _rcb_visible->setActive(visible);
+ if (snapper != NULL) {
+ _rcb_enabled->setActive(snapper->getEnabled());
+ }
+
+ return dynamic_cast<Gtk::Widget *> (vbox);
+}
+
void
-CanvasGrid::on_repr_attr_changed (Inkscape::XML::Node * repr, const gchar *key, const gchar *oldval, const gchar *newval, bool is_interactive, void * data)
+CanvasGrid::on_repr_attr_changed(Inkscape::XML::Node *repr, gchar const *key, gchar const *oldval, gchar const *newval, bool is_interactive, void *data)
{
if (!data)
return;
@@ -288,7 +352,14 @@ CanvasGrid::on_repr_attr_changed (Inkscape::XML::Node * repr, const gchar *key,
((CanvasGrid*) data)->onReprAttrChanged(repr, key, oldval, newval, is_interactive);
}
-
+bool CanvasGrid::isEnabled()
+{
+ if (snapper == NULL) {
+ return false;
+ }
+
+ return snapper->getEnabled();
+}
// ##########################################################
// CanvasXYGrid
@@ -307,98 +378,50 @@ CanvasGrid::on_repr_attr_changed (Inkscape::XML::Node * repr, const gchar *key,
#define SPACE_SIZE_X 15
#define SPACE_SIZE_Y 10
static inline void
-attach_all (Gtk::Table &table, const Gtk::Widget *arr[], unsigned size, int start = 0)
+attach_all(Gtk::Table &table, Gtk::Widget const *const arr[], unsigned size, int start = 0)
{
- for (unsigned i=0, r=start; i<size/sizeof(Gtk::Widget*); i+=2)
- {
- if (arr[i] && arr[i+1])
- {
+ for (unsigned i=0, r=start; i<size/sizeof(Gtk::Widget*); i+=2) {
+ if (arr[i] && arr[i+1]) {
table.attach (const_cast<Gtk::Widget&>(*arr[i]), 1, 2, r, r+1,
- Gtk::FILL|Gtk::EXPAND, (Gtk::AttachOptions)0,0,0);
+ Gtk::FILL|Gtk::EXPAND, (Gtk::AttachOptions)0,0,0);
table.attach (const_cast<Gtk::Widget&>(*arr[i+1]), 2, 3, r, r+1,
- Gtk::FILL|Gtk::EXPAND, (Gtk::AttachOptions)0,0,0);
- }
- else
- {
- if (arr[i+1])
+ Gtk::FILL|Gtk::EXPAND, (Gtk::AttachOptions)0,0,0);
+ } else {
+ if (arr[i+1]) {
table.attach (const_cast<Gtk::Widget&>(*arr[i+1]), 1, 3, r, r+1,
- Gtk::FILL|Gtk::EXPAND, (Gtk::AttachOptions)0,0,0);
- else if (arr[i])
- {
+ Gtk::FILL|Gtk::EXPAND, (Gtk::AttachOptions)0,0,0);
+ } else if (arr[i]) {
Gtk::Label& label = reinterpret_cast<Gtk::Label&> (const_cast<Gtk::Widget&>(*arr[i]));
label.set_alignment (0.0);
table.attach (label, 0, 3, r, r+1,
- Gtk::FILL|Gtk::EXPAND, (Gtk::AttachOptions)0,0,0);
- }
- else
- {
+ Gtk::FILL|Gtk::EXPAND, (Gtk::AttachOptions)0,0,0);
+ } else {
Gtk::HBox *space = manage (new Gtk::HBox);
space->set_size_request (SPACE_SIZE_X, SPACE_SIZE_Y);
table.attach (*space, 0, 1, r, r+1,
- (Gtk::AttachOptions)0, (Gtk::AttachOptions)0,0,0);
+ (Gtk::AttachOptions)0, (Gtk::AttachOptions)0,0,0);
}
}
++r;
}
}
-CanvasXYGrid::CanvasXYGrid (SPNamedView * nv, Inkscape::XML::Node * in_repr)
- : CanvasGrid(nv, in_repr), table(1, 1)
+CanvasXYGrid::CanvasXYGrid (SPNamedView * nv, Inkscape::XML::Node * in_repr, SPDocument * in_doc)
+ : CanvasGrid(nv, in_repr, in_doc, GRID_RECTANGULAR)
{
- origin[NR::X] = origin[NR::Y] = 0.0;
- color = DEFAULTGRIDCOLOR;
- empcolor = DEFAULTGRIDEMPCOLOR;
- empspacing = 5;
- spacing[NR::X] = spacing[NR::Y] = 1.0;
- gridunit = &sp_unit_get_by_id(SP_UNIT_PX);
- render_dotted = false;
+ gridunit = sp_unit_get_by_abbreviation( prefs_get_string_attribute("options.grids.xy", "units") );
+ if (!gridunit)
+ gridunit = &sp_unit_get_by_id(SP_UNIT_PX);
+ origin[NR::X] = sp_units_get_pixels( prefs_get_double_attribute ("options.grids.xy", "origin_x", 0.0), *(gridunit) );
+ origin[NR::Y] = sp_units_get_pixels( prefs_get_double_attribute ("options.grids.xy", "origin_y", 0.0), *(gridunit) );
+ color = prefs_get_int_attribute("options.grids.xy", "color", 0x0000ff20);
+ empcolor = prefs_get_int_attribute("options.grids.xy", "empcolor", 0x0000ff40);
+ empspacing = prefs_get_int_attribute("options.grids.xy", "empspacing", 5);
+ spacing[NR::X] = sp_units_get_pixels( prefs_get_double_attribute ("options.grids.xy", "spacing_x", 0.0), *(gridunit) );
+ spacing[NR::Y] = sp_units_get_pixels( prefs_get_double_attribute ("options.grids.xy", "spacing_y", 0.0), *(gridunit) );
+ render_dotted = prefs_get_int_attribute ("options.grids.xy", "dotted", 0) == 1;
snapper = new CanvasXYGridSnapper(this, namedview, 0);
-
- // initialize widgets:
- vbox.set_border_width(2);
- table.set_spacings(2);
- vbox.pack_start(table, false, false, 0);
-
- _rumg.init (_("Grid _units:"), "units", _wr, repr);
- _rsu_ox.init (_("_Origin X:"), _("X coordinate of grid origin"),
- "originx", _rumg, _wr, repr);
- _rsu_oy.init (_("O_rigin Y:"), _("Y coordinate of grid origin"),
- "originy", _rumg, _wr, repr);
- _rsu_sx.init (_("Spacing _X:"), _("Distance between vertical grid lines"),
- "spacingx", _rumg, _wr, repr);
- _rsu_sy.init (_("Spacing _Y:"), _("Distance between horizontal grid lines"),
- "spacingy", _rumg, _wr, repr);
- _rcp_gcol.init (_("Grid line _color:"), _("Grid line color"),
- _("Color of grid lines"), "color", "opacity", _wr, repr);
- _rcp_gmcol.init (_("Ma_jor grid line color:"), _("Major grid line color"),
- _("Color of the major (highlighted) grid lines"),
- "empcolor", "empopacity", _wr, repr);
- _rsi.init (_("_Major grid line every:"), _("lines"), "empspacing", _wr, repr);
- _rcb_dotted.init ( _("_Show dots instead of lines"),
- _("If set, displays dots at gridpoints instead of gridlines"),
- "dotted", _wr, false, repr);
-
- const Gtk::Widget* widget_array[] =
- {
- _rumg._label, _rumg._sel,
- 0, _rsu_ox.getSU(),
- 0, _rsu_oy.getSU(),
- 0, _rsu_sx.getSU(),
- 0, _rsu_sy.getSU(),
- _rcp_gcol._label, _rcp_gcol._cp,
- 0, 0,
- _rcp_gmcol._label, _rcp_gmcol._cp,
- _rsi._label, &_rsi._hbox,
- 0, _rcb_dotted._button,
- };
-
- attach_all (table, widget_array, sizeof(widget_array));
-
- vbox.show();
-
- if (repr) readRepr();
- updateWidgets();
}
CanvasXYGrid::~CanvasXYGrid ()
/* fixme: Collect all these length parsing methods and think common sane API */
-static gboolean sp_nv_read_length(const gchar *str, guint base, gdouble *val, const SPUnit **unit)
+static gboolean
+sp_nv_read_length(gchar const *str, guint base, gdouble *val, SPUnit const **unit)
{
if (!str) {
return FALSE;
@@ -459,7 +483,7 @@ static gboolean sp_nv_read_length(const gchar *str, guint base, gdouble *val, co
return FALSE;
}
-static gboolean sp_nv_read_opacity(const gchar *str, guint32 *color)
+static gboolean sp_nv_read_opacity(gchar const *str, guint32 *color)
{
if (!str) {
return FALSE;
/** If the passed scalar is invalid (<=0), then set the widget and the scalar
to use the given old value.
- @param oldVal old value to use if the new one is invalid
- @param pTarget the scalar to validate
- @param widget widget associated with the scalar
+
+ @param oldVal Old value to use if the new one is invalid.
+ @param pTarget The scalar to validate.
+ @param widget Widget associated with the scalar.
*/
static void validateScalar(double oldVal,
- double* pTarget,
- Inkscape::UI::Widget::RegisteredScalarUnit& widget)
+ double* pTarget)
{
- // Avoid nullness.
- if ( pTarget == NULL )
- return;
+ // Avoid nullness.
+ if ( pTarget == NULL )
+ return;
- // Invalid new value?
- if ( *pTarget <= 0 )
- {
- // If the old value is somehow invalid as well, then default to 1.
- if ( oldVal <= 0 )
- oldVal = 1;
+ // Invalid new value?
+ if ( *pTarget <= 0 ) {
+ // If the old value is somehow invalid as well, then default to 1.
+ if ( oldVal <= 0 )
+ oldVal = 1;
- // Reset the scalar and associated widget to the old value.
- *pTarget = oldVal;
- widget.setValue( *pTarget);
- } //if
+ // Reset the scalar and associated widget to the old value.
+ *pTarget = oldVal;
+ } //if
} //validateScalar
/** If the passed int is invalid (<=0), then set the widget and the int
to use the given old value.
- @param oldVal old value to use if the new one is invalid
- @param pTarget the int to validate
- @param widget widget associated with the int
+
+ @param oldVal Old value to use if the new one is invalid.
+ @param pTarget The int to validate.
+ @param widget Widget associated with the int.
*/
static void validateInt(gint oldVal,
- gint* pTarget,
- Inkscape::UI::Widget::RegisteredSuffixedInteger& widget)
+ gint* pTarget)
{
- // Avoid nullness.
- if ( pTarget == NULL )
- return;
+ // Avoid nullness.
+ if ( pTarget == NULL )
+ return;
- // Invalid new value?
- if ( *pTarget <= 0 )
- {
- // If the old value is somehow invalid as well, then default to 1.
- if ( oldVal <= 0 )
- oldVal = 1;
+ // Invalid new value?
+ if ( *pTarget <= 0 ) {
+ // If the old value is somehow invalid as well, then default to 1.
+ if ( oldVal <= 0 )
+ oldVal = 1;
- // Reset the int and associated widget to the old value.
- *pTarget = oldVal;
- widget.setValue( *pTarget);
- } //if
+ // Reset the int and associated widget to the old value.
+ *pTarget = oldVal;
+ } //if
} //validateInt
void
CanvasXYGrid::readRepr()
{
- char buff[100];
- gchar const* value;
+ gchar const *value;
if ( (value = repr->attribute("originx")) ) {
sp_nv_read_length(value, SP_UNIT_ABSOLUTE | SP_UNIT_DEVICE, &origin[NR::X], &gridunit);
origin[NR::X] = sp_units_get_pixels(origin[NR::X], *(gridunit));
-
}
+
if ( (value = repr->attribute("originy")) ) {
sp_nv_read_length(value, SP_UNIT_ABSOLUTE | SP_UNIT_DEVICE, &origin[NR::Y], &gridunit);
origin[NR::Y] = sp_units_get_pixels(origin[NR::Y], *(gridunit));
}
if ( (value = repr->attribute("spacingx")) ) {
- double oldVal = spacing[NR::X];
+ double oldVal = spacing[NR::X];
sp_nv_read_length(value, SP_UNIT_ABSOLUTE | SP_UNIT_DEVICE, &spacing[NR::X], &gridunit);
- validateScalar( oldVal, &spacing[NR::X], _rsu_sx );
+ validateScalar( oldVal, &spacing[NR::X]);
spacing[NR::X] = sp_units_get_pixels(spacing[NR::X], *(gridunit));
}
if ( (value = repr->attribute("spacingy")) ) {
- double oldVal = spacing[NR::Y];
+ double oldVal = spacing[NR::Y];
sp_nv_read_length(value, SP_UNIT_ABSOLUTE | SP_UNIT_DEVICE, &spacing[NR::Y], &gridunit);
- validateScalar( oldVal, &spacing[NR::Y], _rsu_sy );
+ validateScalar( oldVal, &spacing[NR::Y]);
spacing[NR::Y] = sp_units_get_pixels(spacing[NR::Y], *(gridunit));
}
}
if ( (value = repr->attribute("empspacing")) ) {
- gint oldVal = empspacing;
+ gint oldVal = empspacing;
empspacing = atoi(value);
- validateInt( oldVal, &empspacing, _rsi );
+ validateInt( oldVal, &empspacing);
}
if ( (value = repr->attribute("dotted")) ) {
render_dotted = (strcmp(value,"true") == 0);
}
+ if ( (value = repr->attribute("visible")) ) {
+ visible = (strcmp(value,"true") == 0);
+ }
+
+ if ( (value = repr->attribute("enabled")) ) {
+ g_assert(snapper != NULL);
+ snapper->setEnabled(strcmp(value,"true") == 0);
+ }
+
for (GSList *l = canvasitems; l != NULL; l = l->next) {
sp_canvas_item_request_update ( SP_CANVAS_ITEM(l->data) );
}
* Called when XML node attribute changed; updates dialog widgets if change was not done by widgets themselves.
*/
void
-CanvasXYGrid::onReprAttrChanged (Inkscape::XML::Node * repr, const gchar *key, const gchar *oldval, const gchar *newval, bool is_interactive)
+CanvasXYGrid::onReprAttrChanged(Inkscape::XML::Node */*repr*/, gchar const */*key*/, gchar const */*oldval*/, gchar const */*newval*/, bool /*is_interactive*/)
{
readRepr();
@@ -611,10 +639,101 @@ CanvasXYGrid::onReprAttrChanged (Inkscape::XML::Node * repr, const gchar *key, c
-Gtk::Widget &
-CanvasXYGrid::getWidget()
+Gtk::Widget *
+CanvasXYGrid::newSpecificWidget()
{
- return vbox;
+ Gtk::Table * table = Gtk::manage( new Gtk::Table(1,1) );
+
+ Inkscape::UI::Widget::RegisteredUnitMenu *_rumg = new Inkscape::UI::Widget::RegisteredUnitMenu();
+ Inkscape::UI::Widget::RegisteredScalarUnit *_rsu_ox = new Inkscape::UI::Widget::RegisteredScalarUnit();
+ Inkscape::UI::Widget::RegisteredScalarUnit *_rsu_oy = new Inkscape::UI::Widget::RegisteredScalarUnit();
+ Inkscape::UI::Widget::RegisteredScalarUnit *_rsu_sx = new Inkscape::UI::Widget::RegisteredScalarUnit();
+ Inkscape::UI::Widget::RegisteredScalarUnit *_rsu_sy = new Inkscape::UI::Widget::RegisteredScalarUnit();
+ Inkscape::UI::Widget::RegisteredColorPicker *_rcp_gcol = new Inkscape::UI::Widget::RegisteredColorPicker();
+ Inkscape::UI::Widget::RegisteredColorPicker *_rcp_gmcol = new Inkscape::UI::Widget::RegisteredColorPicker();
+ Inkscape::UI::Widget::RegisteredSuffixedInteger *_rsi = new Inkscape::UI::Widget::RegisteredSuffixedInteger();
+
+ // initialize widgets:
+ table->set_spacings(2);
+
+_wr.setUpdating (true);
+ Inkscape::UI::Widget::ScalarUnit * sutemp;
+ _rumg->init (_("Grid _units:"), "units", _wr, repr, doc);
+ _rsu_ox->init (_("_Origin X:"), _("X coordinate of grid origin"),
+ "originx", *_rumg, _wr, repr, doc);
+ sutemp = _rsu_ox->getSU();
+ sutemp->setDigits(4);
+ sutemp->setIncrements(0.1, 1.0);
+ _rsu_oy->init (_("O_rigin Y:"), _("Y coordinate of grid origin"),
+ "originy", *_rumg, _wr, repr, doc);
+ sutemp = _rsu_oy->getSU();
+ sutemp->setDigits(4);
+ sutemp->setIncrements(0.1, 1.0);
+ _rsu_sx->init (_("Spacing _X:"), _("Distance between vertical grid lines"),
+ "spacingx", *_rumg, _wr, repr, doc);
+ sutemp = _rsu_sx->getSU();
+ sutemp->setDigits(4);
+ sutemp->setIncrements(0.1, 1.0);
+ _rsu_sy->init (_("Spacing _Y:"), _("Distance between horizontal grid lines"),
+ "spacingy", *_rumg, _wr, repr, doc);
+ sutemp = _rsu_sy->getSU();
+ sutemp->setDigits(4);
+ sutemp->setIncrements(0.1, 1.0);
+ _rcp_gcol->init (_("Grid line _color:"), _("Grid line color"),
+ _("Color of grid lines"), "color", "opacity", _wr, repr, doc);
+ _rcp_gmcol->init (_("Ma_jor grid line color:"), _("Major grid line color"),
+ _("Color of the major (highlighted) grid lines"),
+ "empcolor", "empopacity", _wr, repr, doc);
+ _rsi->init (_("_Major grid line every:"), _("lines"), "empspacing", _wr, repr, doc);
+
+ Inkscape::UI::Widget::RegisteredCheckButton * _rcb_dotted = Gtk::manage(
+ new Inkscape::UI::Widget::RegisteredCheckButton( _("_Show dots instead of lines"),
+ _("If set, displays dots at gridpoints instead of gridlines"),
+ "dotted", _wr, false, repr, doc)
+ );
+_wr.setUpdating (false);
+
+ Gtk::Widget const *const widget_array[] = {
+ _rumg->_label, _rumg->_sel,
+ 0, _rsu_ox->getSU(),
+ 0, _rsu_oy->getSU(),
+ 0, _rsu_sx->getSU(),
+ 0, _rsu_sy->getSU(),
+ _rcp_gcol->_label, _rcp_gcol->_cp,
+ 0, 0,
+ _rcp_gmcol->_label, _rcp_gmcol->_cp,
+ _rsi->_label, &_rsi->_hbox,
+ 0, _rcb_dotted,
+ };
+
+ attach_all (*table, widget_array, sizeof(widget_array));
+
+ if (repr) readRepr();
+
+ // set widget values
+ _rumg->setUnit (gridunit);
+
+ gdouble val;
+ val = origin[NR::X];
+ val = sp_pixels_get_units (val, *(gridunit));
+ _rsu_ox->setValue (val);
+ val = origin[NR::Y];
+ val = sp_pixels_get_units (val, *(gridunit));
+ _rsu_oy->setValue (val);
+ val = spacing[NR::X];
+ double gridx = sp_pixels_get_units (val, *(gridunit));
+ _rsu_sx->setValue (gridx);
+ val = spacing[NR::Y];
+ double gridy = sp_pixels_get_units (val, *(gridunit));
+ _rsu_sy->setValue (gridy);
+
+ _rcp_gcol->setRgba32 (color);
+ _rcp_gmcol->setRgba32 (empcolor);
+ _rsi->setValue (empspacing);
+
+ _rcb_dotted->setActive(render_dotted);
+
+ return table;
}
void
CanvasXYGrid::updateWidgets()
{
+/*
if (_wr.isUpdating()) return;
_wr.setUpdating (true);
+ _rcb_visible.setActive(visible);
+ if (snapper != NULL) {
+ _rcb_enabled.setActive(snapper->getEnabled());
+ }
+
_rumg.setUnit (gridunit);
gdouble val;
_rcp_gmcol.setRgba32 (empcolor);
_rsi.setValue (empspacing);
+ _rcb_dotted.setActive(render_dotted);
+
_wr.setUpdating (false);
return;
+*/
}
void
-CanvasXYGrid::Update (NR::Matrix const &affine, unsigned int flags)
+CanvasXYGrid::Update (NR::Matrix const &affine, unsigned int /*flags*/)
{
ow = origin * affine;
sw = spacing * affine;
static void
grid_dot (SPCanvasBuf *buf, gint x, gint y, guint32 rgba)
{
- if ( (y >= buf->rect.y0) && (y < buf->rect.y1)
+ if ( (y >= buf->rect.y0) && (y < buf->rect.y1)
&& (x >= buf->rect.x0) && (x < buf->rect.x1) ) {
guint r, g, b, a;
guchar *p;
p = buf->buf + (y - buf->rect.y0) * buf->buf_rowstride + (x - buf->rect.x0) * 3;
p[0] = NR_COMPOSEN11_1111 (r, a, p[0]);
p[1] = NR_COMPOSEN11_1111 (g, a, p[1]);
- p[2] = NR_COMPOSEN11_1111 (b, a, p[2]);
+ p[2] = NR_COMPOSEN11_1111 (b, a, p[2]);
}
}
void
CanvasXYGrid::Render (SPCanvasBuf *buf)
{
- const gdouble sxg = floor ((buf->rect.x0 - ow[NR::X]) / sw[NR::X]) * sw[NR::X] + ow[NR::X];
- const gint xlinestart = (gint) Inkscape::round((sxg - ow[NR::X]) / sw[NR::X]);
- const gdouble syg = floor ((buf->rect.y0 - ow[NR::Y]) / sw[NR::Y]) * sw[NR::Y] + ow[NR::Y];
- const gint ylinestart = (gint) Inkscape::round((syg - ow[NR::Y]) / sw[NR::Y]);
+ gdouble const sxg = floor ((buf->rect.x0 - ow[NR::X]) / sw[NR::X]) * sw[NR::X] + ow[NR::X];
+ gint const xlinestart = (gint) Inkscape::round((sxg - ow[NR::X]) / sw[NR::X]);
+ gdouble const syg = floor ((buf->rect.y0 - ow[NR::Y]) / sw[NR::Y]) * sw[NR::Y] + ow[NR::Y];
+ gint const ylinestart = (gint) Inkscape::round((syg - ow[NR::Y]) / sw[NR::Y]);
+
+ //set correct coloring, depending preference (when zoomed out, always major coloring or minor coloring)
+ guint32 _empcolor;
+ bool preference = prefs_get_int_attribute ("options.grids", "no_emphasize_when_zoomedout", 0) == 1;
+ if( (scaled[NR::X] || scaled[NR::Y]) && preference ) {
+ _empcolor = color;
+ } else {
+ _empcolor = empcolor;
+ }
if (!render_dotted) {
gint ylinenum;
gdouble y;
for (y = syg, ylinenum = ylinestart; y < buf->rect.y1; y += sw[NR::Y], ylinenum++) {
- const gint y0 = (gint) Inkscape::round(y);
-
- if (!scaled[NR::Y] && (ylinenum % empspacing) == 0) {
- grid_hline (buf, y0, buf->rect.x0, buf->rect.x1 - 1, empcolor);
- } else {
+ gint const y0 = (gint) Inkscape::round(y);
+ if (!scaled[NR::Y] && (ylinenum % empspacing) != 0) {
grid_hline (buf, y0, buf->rect.x0, buf->rect.x1 - 1, color);
+ } else {
+ grid_hline (buf, y0, buf->rect.x0, buf->rect.x1 - 1, _empcolor);
}
}
-
+
gint xlinenum;
gdouble x;
for (x = sxg, xlinenum = xlinestart; x < buf->rect.x1; x += sw[NR::X], xlinenum++) {
- const gint ix = (gint) Inkscape::round(x);
- if (!scaled[NR::X] && (xlinenum % empspacing) == 0) {
- grid_vline (buf, ix, buf->rect.y0, buf->rect.y1, empcolor);
- } else {
+ gint const ix = (gint) Inkscape::round(x);
+ if (!scaled[NR::X] && (xlinenum % empspacing) != 0) {
grid_vline (buf, ix, buf->rect.y0, buf->rect.y1, color);
+ } else {
+ grid_vline (buf, ix, buf->rect.y0, buf->rect.y1, _empcolor);
}
}
} else {
gint ylinenum;
gdouble y;
for (y = syg, ylinenum = ylinestart; y < buf->rect.y1; y += sw[NR::Y], ylinenum++) {
- const gint iy = (gint) Inkscape::round(y);
+ gint const iy = (gint) Inkscape::round(y);
gint xlinenum;
gdouble x;
for (x = sxg, xlinenum = xlinestart; x < buf->rect.x1; x += sw[NR::X], xlinenum++) {
- const gint ix = (gint) Inkscape::round(x);
- if ( (!scaled[NR::X] && (xlinenum % empspacing) == 0)
- || (!scaled[NR::Y] && (ylinenum % empspacing) == 0) )
- {
- grid_dot (buf, ix, iy, empcolor | (guint32)0x000000FF); // put alpha to max value
- }
- else
+ gint const ix = (gint) Inkscape::round(x);
+ if ( (!scaled[NR::X] && (xlinenum % empspacing) == 0)
+ || (!scaled[NR::Y] && (ylinenum % empspacing) == 0) )
{
+ grid_dot (buf, ix, iy, _empcolor | (guint32)0x000000FF); // put alpha to max value
+ } else {
grid_dot (buf, ix, iy, color | (guint32)0x000000FF); // put alpha to max value
}
}
}
}
-
-
-
-/**
- * \return x rounded to the nearest multiple of c1 plus c0.
- *
- * \note
- * If c1==0 (and c0 is finite), then returns +/-inf. This makes grid spacing of zero
- * mean "ignore the grid in this dimention". We're currently discussing "good" semantics
- * for guide/grid snapping.
- */
-
-/* FIXME: move this somewhere else, perhaps */
-static double round_to_nearest_multiple_plus(double x, double const c1, double const c0)
-{
- return floor((x - c0) / c1 + .5) * c1 + c0;
-}
-
CanvasXYGridSnapper::CanvasXYGridSnapper(CanvasXYGrid *grid, SPNamedView const *nv, NR::Coord const d) : LineSnapper(nv, d)
{
this->grid = grid;
scaled_spacing /= SP_ACTIVE_DESKTOP->current_zoom();
}
- NR::Coord const rounded = round_to_nearest_multiple_plus(p[i],
- scaled_spacing,
- grid->origin[i]);
-
- s.push_back(std::make_pair(NR::Dim2(i), rounded));
+ NR::Coord rounded;
+ NR::Point point_on_line;
+
+ rounded = Inkscape::Util::round_to_upper_multiple_plus(p[i], scaled_spacing, grid->origin[i]);
+ point_on_line = i ? NR::Point(0, rounded) : NR::Point(rounded, 0);
+ s.push_back(std::make_pair(component_vectors[i], point_on_line));
+
+ rounded = Inkscape::Util::round_to_lower_multiple_plus(p[i], scaled_spacing, grid->origin[i]);
+ point_on_line = i ? NR::Point(0, rounded) : NR::Point(rounded, 0);
+ s.push_back(std::make_pair(component_vectors[i], point_on_line));
}
return s;
}
+void CanvasXYGridSnapper::_addSnappedLine(SnappedConstraints &sc, NR::Point const snapped_point, NR::Coord const snapped_distance, NR::Point const normal_to_line, NR::Point const point_on_line) const
+{
+ SnappedLine dummy = SnappedLine(snapped_point, snapped_distance, getSnapperTolerance(), getSnapperAlwaysSnap(), normal_to_line, point_on_line);
+ sc.grid_lines.push_back(dummy);
+}
+
+/**
+ * \return true if this Snapper will snap at least one kind of point.
+ */
+bool CanvasXYGridSnapper::ThisSnapperMightSnap() const
+{
+ return _named_view == NULL ? false : (_snap_enabled && _snap_from != 0);
+}
+
}; /* namespace Inkscape */
+
/*
Local Variables:
mode:c++
fill-column:99
End:
*/
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :