X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fbase%2Fpreview.cpp;h=b0d60664dca741a7cedfb869e4740d51f2c8ef50;hb=e1d1cacbb43055988d0d9db632fdf05c0bea9543;hp=1a873b81c7b4413a9ad701292b9910cf5ffd9c54;hpb=3239ef39dcee08fa6e8cd68cdf2727fc68cc7a8c;p=architektonas diff --git a/src/base/preview.cpp b/src/base/preview.cpp index 1a873b8..b0d6066 100644 --- a/src/base/preview.cpp +++ b/src/base/preview.cpp @@ -25,7 +25,7 @@ /** * Constructor. */ -RS_Preview::RS_Preview(RS_EntityContainer * parent): RS_EntityContainer(parent), +Preview::Preview(EntityContainer * parent): EntityContainer(parent), visible(false) { settings.beginGroup("Appearance"); @@ -36,7 +36,7 @@ RS_Preview::RS_Preview(RS_EntityContainer * parent): RS_EntityContainer(parent), /** * Destructor. */ -RS_Preview::~RS_Preview() +Preview::~Preview() { } @@ -44,7 +44,7 @@ RS_Preview::~RS_Preview() * Adds an entity to this preview and removes any attributes / layer * connectsions before that. */ -void RS_Preview::addEntity(RS_Entity * entity) +void Preview::addEntity(Entity * entity) { if (entity == NULL || entity->isUndone()) return; @@ -73,15 +73,15 @@ void RS_Preview::addEntity(RS_Entity * entity) Vector min = entity->getMin(); Vector max = entity->getMax(); - RS_Line * l1 = new RS_Line(this, RS_LineData(Vector(min.x, min.y), Vector(max.x, min.y))); - RS_Line * l2 = new RS_Line(this, RS_LineData(Vector(max.x, min.y), Vector(max.x, max.y))); - RS_Line * l3 = new RS_Line(this, RS_LineData(Vector(max.x, max.y), Vector(min.x, max.y))); - RS_Line * l4 = new RS_Line(this, RS_LineData(Vector(min.x, max.y), Vector(min.x, min.y))); + Line * l1 = new Line(this, LineData(Vector(min.x, min.y), Vector(max.x, min.y))); + Line * l2 = new Line(this, LineData(Vector(max.x, min.y), Vector(max.x, max.y))); + Line * l3 = new Line(this, LineData(Vector(max.x, max.y), Vector(min.x, max.y))); + Line * l4 = new Line(this, LineData(Vector(min.x, max.y), Vector(min.x, min.y))); - RS_EntityContainer::addEntity(l1); - RS_EntityContainer::addEntity(l2); - RS_EntityContainer::addEntity(l3); - RS_EntityContainer::addEntity(l4); + EntityContainer::addEntity(l1); + EntityContainer::addEntity(l2); + EntityContainer::addEntity(l3); + EntityContainer::addEntity(l4); delete entity; entity = NULL; @@ -91,35 +91,35 @@ void RS_Preview::addEntity(RS_Entity * entity) entity->setLayer(NULL); entity->setSelected(false); entity->reparent(this); - entity->setPen(RS_Pen(RS_Color(255, 255, 255), RS2::Width00, RS2::SolidLine)); - RS_EntityContainer::addEntity(entity); + entity->setPen(Pen(Color(255, 255, 255), RS2::Width00, RS2::SolidLine)); + EntityContainer::addEntity(entity); } } /** * Clones the given entity and adds the clone to the preview. */ -void RS_Preview::addCloneOf(RS_Entity * entity) +void Preview::addCloneOf(Entity * entity) { if (!entity) return; - RS_Entity * clone = entity->clone(); + Entity * clone = entity->clone(); addEntity(clone); } /** * Adds all entities from 'container' to the preview (unselected). */ -void RS_Preview::addAllFrom(RS_EntityContainer & container) +void Preview::addAllFrom(EntityContainer & container) { int c = 0; - for(RS_Entity * e=container.firstEntity(); e!=NULL; e=container.nextEntity()) + for(Entity * e=container.firstEntity(); e!=NULL; e=container.nextEntity()) { if (c < maxEntities) { - RS_Entity * clone = e->clone(); + Entity * clone = e->clone(); clone->setSelected(false); clone->reparent(this); @@ -133,15 +133,15 @@ void RS_Preview::addAllFrom(RS_EntityContainer & container) /** * Adds all selected entities from 'container' to the preview (unselected). */ -void RS_Preview::addSelectionFrom(RS_EntityContainer & container) +void Preview::addSelectionFrom(EntityContainer & container) { int c = 0; - for(RS_Entity * e=container.firstEntity(); e!=NULL; e=container.nextEntity()) + for(Entity * e=container.firstEntity(); e!=NULL; e=container.nextEntity()) { if (e->isSelected() && c < maxEntities) { - RS_Entity * clone = e->clone(); + Entity * clone = e->clone(); clone->setSelected(false); clone->reparent(this); @@ -156,17 +156,17 @@ void RS_Preview::addSelectionFrom(RS_EntityContainer & container) * Adds all entities in the given range and those which have endpoints in the * given range to the preview. */ -void RS_Preview::addStretchablesFrom(RS_EntityContainer & container, const Vector & v1, +void Preview::addStretchablesFrom(EntityContainer & container, const Vector & v1, const Vector & v2) { int c = 0; - for(RS_Entity * e=container.firstEntity(); e!=NULL; e=container.nextEntity()) + for(Entity * e=container.firstEntity(); e!=NULL; e=container.nextEntity()) { if (e->isVisible() && e->rtti() != RS2::EntityHatch && (e->isInWindow(v1, v2) || e->hasEndpointsWithinWindow(v1, v2)) && c < maxEntities) { - RS_Entity * clone = e->clone(); + Entity * clone = e->clone(); //clone->setSelected(false); clone->reparent(this); @@ -177,37 +177,37 @@ void RS_Preview::addStretchablesFrom(RS_EntityContainer & container, const Vecto } } -void RS_Preview::SetOffset(Vector v) +void Preview::SetOffset(Vector v) { offset = v; } -Vector RS_Preview::Offset(void) +Vector Preview::Offset(void) { return offset; } -void RS_Preview::SetVisible(bool visibility/*= true*/) +void Preview::SetVisible(bool visibility/*= true*/) { visible = visibility; } -bool RS_Preview::Visible(void) +bool Preview::Visible(void) { return visible; } -void RS_Preview::Draw(GraphicView * view, PaintInterface * painter) +void Preview::Draw(GraphicView * view, PaintInterface * painter) { if (isEmpty()) return; - painter->setPen(RS_Pen(RS_Color(60, 255, 80), RS2::Width00, RS2::SolidLine)); + painter->setPen(Pen(Color(60, 255, 80), RS2::Width00, RS2::SolidLine)); painter->setOffset(offset); // We have to traverse the container ourselves, because RS_Container::draw() // uses drawEntity() instead of drawEntityPlain()... - for(RS_Entity * e=firstEntity(RS2::ResolveNone); e!=NULL; e=nextEntity(RS2::ResolveNone)) + for(Entity * e=firstEntity(RS2::ResolveNone); e!=NULL; e=nextEntity(RS2::ResolveNone)) view->drawEntityPlain(e); painter->setOffset(Vector(0, 0));