X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fbase%2Frs_grid.cpp;h=c2f43e078db7538595802ceaf35ba9d18d419a51;hb=d774c2655ba2c3657a565f325411144452392277;hp=61368edc9f25228fa1b7aa006aabe74b1e9ba175;hpb=16ce54abf01ca3032e42a5bb11a4afcf9014dcca;p=architektonas diff --git a/src/base/rs_grid.cpp b/src/base/rs_grid.cpp index 61368ed..c2f43e0 100644 --- a/src/base/rs_grid.cpp +++ b/src/base/rs_grid.cpp @@ -14,10 +14,15 @@ #include "rs_grid.h" -#include "rs_units.h" -#include "rs_graphic.h" +#include "drawing.h" +#include "graphicview.h" +//#include "rs_graphicview.h" #include "settings.h" +#include "rs_units.h" +#include "vector.h" +#warning "!!! Clean out all references to RS_GraphicView here and in header !!!" +#if 0 /** * Constructor. */ @@ -25,6 +30,15 @@ RS_Grid::RS_Grid(RS_GraphicView * gv): graphicView(gv), pt(NULL), number(0), metaX(NULL), numMetaX(0), metaY(NULL), numMetaY(0) { } +#endif + +/** + * Constructor II. + */ +RS_Grid::RS_Grid(GraphicView * gv): graphicView(gv), pt(NULL), number(0), + metaX(NULL), numMetaX(0), metaY(NULL), numMetaY(0) +{ +} /** * Destructor. @@ -51,7 +65,7 @@ void RS_Grid::update() if (!graphicView->isGridOn()) return; - RS_Graphic * graphic = graphicView->getGraphic(); + Drawing * graphic = graphicView->getGraphic(); // auto scale grid? settings.beginGroup("Appearance");