X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fbase%2Frs_python_wrappers.cpp;h=9af577ac2c8c7f337e9ba0a164ac441aaeb20a97;hb=97d3cdae07ec9788cf80e7905abfdb5d67a7747c;hp=b805b623c7694cd282734715e32fcc4f57c0600a;hpb=16ce54abf01ca3032e42a5bb11a4afcf9014dcca;p=architektonas

diff --git a/src/base/rs_python_wrappers.cpp b/src/base/rs_python_wrappers.cpp
index b805b62..9af577a 100644
--- a/src/base/rs_python_wrappers.cpp
+++ b/src/base/rs_python_wrappers.cpp
@@ -40,7 +40,7 @@ using namespace boost::python;
 #include "rs_entitycontainer.h"
 #include "rs_entity.h"
 #include "rs_flags.h"
-#include "rs_graphic.h"
+#include "drawing.h"
 #include "rs_image.h"
 #include "rs_insert.h"
 #include "rs_layer.h"
@@ -52,7 +52,7 @@ using namespace boost::python;
 #include "rs_vector.h"
 
 /* Global root functions */
-RS_Graphic* currentGraphic() { return RS_PYTHON->getGraphic(); }
+Drawing* currentGraphic() { return RS_PYTHON->getGraphic(); }
 
     /* more to be added later (access to global properties, all documents,
        creation of new documents, ... */
@@ -118,7 +118,7 @@ namespace QString_Python_Conversions {
    void fname(container& cont, std::auto_ptr<entity> obj) \
    { cont.addfunc(obj.get()); obj.release(); }
 
-TRANSFER_OWNERSHIP_FUNCTION(RS_Graphic_addLayer, RS_Graphic, addLayer, RS_Layer)
+TRANSFER_OWNERSHIP_FUNCTION(Drawing_addLayer, Drawing, addLayer, RS_Layer)
 TRANSFER_OWNERSHIP_FUNCTION(RS_LayerList_add, RS_LayerList, add, RS_Layer)
 
 #define ADDVERTEX_FUNCTION(fname, entity) \
@@ -139,8 +139,8 @@ void (RS_LayerList::*RS_LayerList_activate_string)(const QString&) = &RS_LayerLi
 void (RS_LayerList::*RS_LayerList_activate_layer)(RS_Layer*) = &RS_LayerList::activate;
 void (RS_LayerList::*RS_LayerList_toggle_string)(const QString&) = &RS_LayerList::toggle;
 void (RS_LayerList::*RS_LayerList_toggle_layer)(const QString&) = &RS_LayerList::toggle;
-void (RS_Graphic::*RS_Graphic_toggleLayer_string)(const QString&) = &RS_Graphic::toggleLayer;
-void (RS_Graphic::*RS_Graphic_toggleLayer_layer)(RS_Layer*) = &RS_Graphic::toggleLayer;
+void (Drawing::*Drawing_toggleLayer_string)(const QString&) = &Drawing::toggleLayer;
+void (Drawing::*Drawing_toggleLayer_layer)(RS_Layer*) = &Drawing::toggleLayer;
 void (RS_Entity::*RS_Entity_setLayer_string)(const QString&) = &RS_Entity::setLayer;
 void (RS_Entity::*RS_Entity_setLayer_layer)(RS_Layer*) = &RS_Entity::setLayer;
 
@@ -382,16 +382,16 @@ BOOST_PYTHON_MODULE(qcad)
 	.add_property("filename", &RS_Document::getFilename)
     ;
     
-    class_<RS_Graphic, bases<RS_Document> >("Graphic", init<RS_EntityContainer*>())
-        .def("count", &RS_Graphic::count)
-        .def("findLayer", &RS_Graphic::findLayer, return_value_policy<reference_existing_object>())
-	.def("editLayer", &RS_Graphic::editLayer)
-	.def("addLayer", RS_Graphic_addLayer)
-	.def("removeLayer", &RS_Graphic::removeLayer)
-	.def("toggleLayer", RS_Graphic_toggleLayer_string)
-	.def("toggleLayer", RS_Graphic_toggleLayer_layer)
-	.def("clearLayers", &RS_Graphic::clearLayers)
-	.def("freezeAllLayers", &RS_Graphic::freezeAllLayers)
+    class_<Drawing, bases<RS_Document> >("Graphic", init<RS_EntityContainer*>())
+        .def("count", &Drawing::count)
+        .def("findLayer", &Drawing::findLayer, return_value_policy<reference_existing_object>())
+	.def("editLayer", &Drawing::editLayer)
+	.def("addLayer", Drawing_addLayer)
+	.def("removeLayer", &Drawing::removeLayer)
+	.def("toggleLayer", Drawing_toggleLayer_string)
+	.def("toggleLayer", Drawing_toggleLayer_layer)
+	.def("clearLayers", &Drawing::clearLayers)
+	.def("freezeAllLayers", &Drawing::freezeAllLayers)
     ;
 
     /* Entity types */