Not working Quadtree object adding.

[ipdf/code.git] / src / controlpanel.cpp

diff --git a/src/controlpanel.cpp b/src/controlpanel.cpp
index 41013d0..0a50114 100644 (file)
--- a/src/controlpanel.cpp
+++ b/src/controlpanel.cpp
@@ -95,6 +95,31 @@ QMenu * ControlPanel::CreateViewMenu()
        view->addAction(m_view_set_bounds);
        connect(m_view_set_bounds, SIGNAL(triggered()), this, SLOT(SetViewBounds()));
        
+       m_view_show_bezier_bounds = new QAction("&Show Bezier Bounds", this);
+       m_view_show_bezier_bounds->setCheckable(true);
+       view->addAction(m_view_show_bezier_bounds);
+       connect(m_view_show_bezier_bounds, SIGNAL(triggered()), this, SLOT(ToggleShowBezierBounds()));
+       
+       m_view_show_bezier_type = new QAction("&Show Bezier Type", this);
+       m_view_show_bezier_type->setCheckable(true);
+       view->addAction(m_view_show_bezier_type);
+       connect(m_view_show_bezier_type, SIGNAL(triggered()), this, SLOT(ToggleShowBezierType()));
+       
+       m_view_show_fill_bounds = new QAction("&Show Fill Bounds", this);
+       m_view_show_fill_bounds->setCheckable(true);
+       view->addAction(m_view_show_fill_bounds);
+       connect(m_view_show_fill_bounds, SIGNAL(triggered()), this, SLOT(ToggleShowFillBounds()));
+       
+       m_view_show_fill_points = new QAction("&Show Fill Points", this);
+       m_view_show_fill_points->setCheckable(true);
+       view->addAction(m_view_show_fill_points);
+       connect(m_view_show_fill_bounds, SIGNAL(triggered()), this, SLOT(ToggleShowFillPoints()));
+       
+       m_view_enable_shading = new QAction("&Enable Shading", this);
+       m_view_enable_shading->setCheckable(true);
+       view->addAction(m_view_enable_shading);
+       connect(m_view_enable_shading, SIGNAL(triggered()), this, SLOT(ToggleEnableShading()));
+       
        return view;
 }
 
@@ -111,10 +136,16 @@ QMenu * ControlPanel::CreateScreenMenu()
        m_screen_cpu_rendering = new QAction("&CPU Rendering", this);
        m_screen_cpu_rendering->setCheckable(true);
        m_screen_gpu_rendering->setToolTip("Uses the CPU for Rendering");
+       
+       m_screen_lazy_rendering = new QAction("&Lazy Rendering", this);
+       m_screen_lazy_rendering->setCheckable(true);
                
        screen->addAction(m_screen_gpu_rendering);
        screen->addAction(m_screen_cpu_rendering);
        
+       screen->addAction(m_screen_lazy_rendering);
+       connect(m_screen_lazy_rendering, SIGNAL(triggered()), this, SLOT(ToggleLazyRendering()));
+       
        connect(m_screen_gpu_rendering, SIGNAL(triggered()), this, SLOT(SetGPURendering()));
        connect(m_screen_cpu_rendering, SIGNAL(triggered()), this, SLOT(SetCPURendering()));
        
@@ -146,6 +177,14 @@ void ControlPanel::UpdateAll()
        m_screen_gpu_rendering->setChecked(using_gpu_rendering);
        m_screen_cpu_rendering->setChecked(!using_gpu_rendering);       
        m_screen_show_debug->setChecked(m_screen.DebugFontShown());
+       m_screen_lazy_rendering->setChecked(m_view.UsingLazyRendering());
+       
+       m_view_show_bezier_bounds->setChecked(m_view.ShowingBezierBounds());
+       m_view_show_bezier_type->setChecked(m_view.ShowingBezierType());
+       m_view_show_fill_bounds->setChecked(m_view.ShowingFillBounds());
+       m_view_show_fill_points->setChecked(m_view.ShowingFillPoints());
+       m_view_enable_shading->setChecked(m_view.PerformingShading());
+       
        
        // update things based on state
        const char * title;
@@ -187,6 +226,39 @@ void ControlPanel::UpdateAll()
        setToolTip(tooltip);
 }
 
+void ControlPanel::ToggleShowBezierBounds()
+{
+       bool state = m_view.ShowingBezierBounds();
+       m_view.ShowBezierBounds(!state);
+       UpdateAll();
+}
+void ControlPanel::ToggleShowBezierType()
+{
+       bool state = m_view.ShowingBezierType();
+       m_view.ShowBezierType(!state);
+       UpdateAll();
+}
+void ControlPanel::ToggleShowFillBounds()
+{
+       bool state = m_view.ShowingFillBounds();
+       m_view.ShowFillBounds(!state);
+       UpdateAll();
+}
+
+void ControlPanel::ToggleShowFillPoints()
+{
+       bool state = m_view.ShowingFillPoints();
+       m_view.ShowFillPoints(!state);
+       UpdateAll();
+}
+
+void ControlPanel::ToggleEnableShading()
+{
+       bool state = m_view.PerformingShading();
+       m_view.PerformShading(!state);
+       UpdateAll();
+}
+
 void ControlPanel::SetGPURendering()
 {
        m_view.SetGPURendering(true);
@@ -199,6 +271,13 @@ void ControlPanel::SetCPURendering()
        UpdateAll();
 }
 
+void ControlPanel::ToggleLazyRendering()
+{
+       bool state = m_view.UsingLazyRendering();
+       m_view.SetLazyRendering(!state);
+       UpdateAll();
+}
+
 void ControlPanel::ToggleScreenDebugFont()
 {
        bool state = m_screen.DebugFontShown();
@@ -224,14 +303,19 @@ void ControlPanel::SetViewBounds()
 void ControlPanel::InsertTextIntoDocument()
 {
        const Rect & bounds = m_view.GetBounds();
-       Real xx = bounds.x + bounds.w/Real(2);
+       Real xx = bounds.x;
        Real yy = bounds.y + bounds.h/Real(2);
        
        string msg = m_text_edit->toPlainText().toStdString();
-       Real scale = bounds.w / Real(2);
+       Real scale = bounds.h / Real(2);
        Debug("Insert \"%s\" at %f, %f, scale %f", msg.c_str(), Float(xx), Float(yy), Float(scale));
-       //m_doc.Add(RECT_OUTLINE, bounds, 0); // debugging; text needs to go in the boujnds
-       m_doc.AddText(msg, xx, yy, scale);
+#ifndef QUADTREE_DISABLED
+       m_doc.SetQuadtreeInsertNode(m_view.GetCurrentQuadtreeNode());
+#endif
+       m_doc.AddText(msg, scale, xx, yy);
+#ifndef QUADTREE_DISABLED
+       m_doc.PropagateQuadChanges(m_view.GetCurrentQuadtreeNode());
+#endif
        m_view.ForceRenderDirty();
        m_view.ForceBufferDirty();
        m_view.ForceBoundsDirty();
@@ -239,10 +323,19 @@ void ControlPanel::InsertTextIntoDocument()
 void ControlPanel::InsertSVGIntoDocument()
 {
        Rect bounds(m_view.GetBounds());
+       bounds.x += bounds.w/Real(2);
+       bounds.y += bounds.h/Real(2);
+       
        bounds.w /= Real(m_screen.ViewportWidth());
        bounds.h /= Real(m_screen.ViewportHeight());
        
+#ifndef QUADTREE_DISABLED
+       m_doc.SetQuadtreeInsertNode(m_view.GetCurrentQuadtreeNode());
+#endif
        m_doc.ParseSVG(m_text_edit->toPlainText().toStdString(), bounds);
+#ifndef QUADTREE_DISABLED
+       m_doc.PropagateQuadChanges(m_view.GetCurrentQuadtreeNode());
+#endif
        m_view.ForceRenderDirty();
        m_view.ForceBufferDirty();
        m_view.ForceBoundsDirty();
@@ -255,11 +348,24 @@ void ControlPanel::LoadSVGIntoDocument()
        if (filename == "")
                return;
        
+       #ifdef TRANSFORM_OBJECTS_NOT_VIEW
+               Rect bounds(0,0,1,1);
+       #else
        Rect bounds(m_view.GetBounds());
+       #endif
+       bounds.x += bounds.w/Real(2);
+       bounds.y += bounds.h/Real(2);
+       
        bounds.w /= Real(m_screen.ViewportWidth());
        bounds.h /= Real(m_screen.ViewportHeight());
        
+#ifndef QUADTREE_DISABLED
+       m_doc.SetQuadtreeInsertNode(m_view.GetCurrentQuadtreeNode());
+#endif
        m_doc.LoadSVG(filename.toStdString(), bounds);
+#ifndef QUADTREE_DISABLED
+       m_doc.PropagateQuadChanges(m_view.GetCurrentQuadtreeNode());
+#endif
        m_view.ForceRenderDirty();
        m_view.ForceBufferDirty();
        m_view.ForceBoundsDirty();