← Back to branch summary

~valavanisalex/ubuntu/oneiric/inkscape/inkscape_0.48.1-2ubuntu5

« back to all changes in this revision

Viewing changes to src/live_effects/effect.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Alex Valavanis
  • Date: 2010-09-12 19:44:58 UTC
  • mfrom: (1.1.12 upstream) (45.1.3 maverick)
  • Revision ID: james.westby@ubuntu.com-20100912194458-4sjwmbl7dlsrk5dc
Tags: 0.48.0-1ubuntu1
https://launchpad.net/bugs/628048
https://launchpad.net/bugs/401567
https://launchpad.net/bugs/456248
https://launchpad.net/bugs/463602
https://launchpad.net/bugs/591986
https://launchpad.net/bugs/513319
* Merge with Debian unstable (LP: #628048, LP: #401567, LP: #456248, 
  LP: #463602, LP: #591986)
* debian/control: 
  - Ubuntu maintainers
  - Promote python-lxml, python-numpy, python-uniconvertor to Recommends.
  - Demote pstoedit to Suggests (universe package).
  - Suggests ttf-dejavu instead of ttf-bitstream-vera (LP: #513319)
* debian/rules:
  - Run intltool-update on build (Ubuntu-specific).
  - Add translation domain to .desktop files (Ubuntu-specific).
* debian/dirs:
  - Add usr/share/pixmaps.  Allow inkscape.xpm installation
* drop 50-poppler-API.dpatch (now upstream)
* drop 51-paste-in-unwritable-directory.dpatch (now upstream) 

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/live_effects/effect.cpp
28
28
#include "tools-switch.h"
29
29
#include "message-stack.h"
30
30
#include "desktop.h"
31
 
#include "nodepath.h"
32
 
 
 
31
#include "knotholder.h"
 
32
#include "sp-lpe-item.h"
33
33
#include "live_effects/lpeobject.h"
34
34
#include "live_effects/parameter/parameter.h"
35
35
#include <glibmm/ustring.h>
74
74
#include "live_effects/lpe-path_length.h"
75
75
#include "live_effects/lpe-line_segment.h"
76
76
#include "live_effects/lpe-recursiveskeleton.h"
 
77
#include "live_effects/lpe-extrude.h"
77
78
 
78
79
 
79
80
namespace Inkscape {
90
91
    {CIRCLE_WITH_RADIUS,    N_("Circle (by center and radius)"),   "circle_with_radius"},
91
92
    {CIRCLE_3PTS,           N_("Circle by 3 points"),      "circle_3pts"},
92
93
    {DYNASTROKE,            N_("Dynamic stroke"),          "dynastroke"},
 
94
    {EXTRUDE,               N_("Extrude"),                 "extrude"},
93
95
    {LATTICE,               N_("Lattice Deformation"),     "lattice"},
94
96
    {LINE_SEGMENT,          N_("Line Segment"),            "line_segment"},
95
97
    {MIRROR_SYMMETRY,       N_("Mirror symmetry"),         "mirror_symmetry"},
232
234
        case RECURSIVE_SKELETON:
233
235
            neweffect = static_cast<Effect*> ( new LPERecursiveSkeleton(lpeobj) );
234
236
            break;
 
237
        case EXTRUDE:
 
238
            neweffect = static_cast<Effect*> ( new LPEExtrude(lpeobj) );
 
239
            break;
235
240
        default:
236
241
            g_warning("LivePathEffect::Effect::New   called with invalid patheffect type (%d)", lpenr);
237
242
            neweffect = NULL;
659
664
}
660
665
 
661
666
void
662
 
Effect::setup_nodepath(Inkscape::NodePath::Path *np)
663
 
{
664
 
    np->helperpath_rgba = 0xff0000ff;
665
 
    np->helperpath_width = 1.0;
666
 
}
667
 
 
668
 
void
669
667
Effect::transform_multiply(Geom::Matrix const& postmul, bool set)
670
668
{
671
669
    // cycle through all parameters. Most parameters will not need transformation, but path and point params do.
675
673
    }
676
674
}
677
675
 
678
 
// TODO: take _all_ parameters into account, not only PointParams
679
676
bool
680
677
Effect::providesKnotholder()
681
678
{