Added delete view.

src/celestia/celestiacore.cpp

@@ -95,10 +95,15 @@ public:
 };
 
 
-View::View(Observer* _observer,
+View::View(View::Type _type,
+           Observer* _observer,
            float _x, float _y,
            float _width, float _height) :
+    type(_type),
     observer(_observer),
+    parent(0),
+    child1(0),
+    child2(0),
     x(_x),
     y(_y),
     width(_width),
@@ -106,7 +111,6 @@ View::View(Observer* _observer,
 {
 }
 
-
 void View::mapWindowToView(float wx, float wy, float& vx, float& vy) const
 {
     vx = (wx - x) / width;
@@ -114,7 +118,43 @@ void View::mapWindowToView(float wx, float wy, float& vx, float& vy) const
     vx = (vx - 0.5f) * (width / height);
     vy = 0.5f - vy;
 }
-    
+
+void View::walkTreeResize(View* sibling, int sign) {
+   float ratio;
+   switch (parent->type)
+    {
+    case View::HorizontalSplit:
+        ratio = parent->height / (parent->height -  height);
+        sibling->height *= ratio;
+        if (sign == 1)
+        {
+            sibling->y = parent->y + (sibling->y - parent->y) * ratio;
+        }
+        else
+        {
+            sibling->y = parent->y + (sibling->y - (y + height)) * ratio;
+        }
+        break;
+
+    case View::VerticalSplit:
+        ratio = parent->width / (parent->width - width);
+        sibling->width *= ratio;
+        if (sign == 1)
+        {
+            sibling->x = parent->x + (sibling->x - parent->x) * ratio;
+        }
+        else
+        {
+            sibling->x = parent->x + (sibling->x - (x + width) ) * ratio;
+        }
+        break;
+    case View::ViewWindow:
+        break;
+    }
+    if (sibling->child1) walkTreeResize(sibling->child1, sign);
+    if (sibling->child2) walkTreeResize(sibling->child2, sign);
+}
+
 
 CelestiaCore::CelestiaCore() :
     config(NULL),
@@ -668,6 +708,10 @@ void CelestiaCore::charEntered(char c)
         altAzimuthMode = !altAzimuthMode;
         break;
 
+    case 127: // Delete
+        deleteView();
+        break;
+
     case '\011': // TAB
         activeView++;
         if (activeView >= (int) views.size())
@@ -683,12 +727,12 @@ void CelestiaCore::charEntered(char c)
         break;
 
     case '\025': // Ctrl+U
-        splitView(true);
+        splitView(View::VerticalSplit);
         flash("Added view");
         break;
 
     case '\022': // Ctrl+R
-        splitView(false);
+        splitView(View::HorizontalSplit);
         flash("Added view");
         break;
 
@@ -1201,7 +1245,7 @@ void CelestiaCore::setStartURL(std::string url)
     } 
     else 
     {
-        free(initScript);   
+        free(initScript);
         ifstream scriptfile(url.c_str());
         CommandParser parser(scriptfile);
         initScript = parser.parse();
@@ -1455,8 +1499,9 @@ void CelestiaCore::resize(GLsizei w, GLsizei h)
 }
 
 
-void CelestiaCore::splitView(bool vertical)
+void CelestiaCore::splitView(View::Type type)
 {
+    bool vertical = ( type == View::VerticalSplit );
     Observer* o = sim->addObserver();
 
     // Make the new observer a copy of the old one
@@ -1467,13 +1512,34 @@ void CelestiaCore::splitView(bool vertical)
     float w = views[activeView]->width * (vertical ? 0.5f : 1.0f);
     float h = views[activeView]->height * (vertical ? 1.0f : 0.5f);
 
+    View* split = new View(type,
+                           0,
+                           views[activeView]->x,
+                           views[activeView]->y,
+                           views[activeView]->width,
+                           views[activeView]->height);
+    split->parent = views[activeView]->parent;
+    if (views[activeView]->parent != 0)
+    {
+        if (views[activeView]->parent->child1 == views[activeView])
+            views[activeView]->parent->child1 = split;
+        else
+            views[activeView]->parent->child2 = split;
+    }
+    split->child1 = views[activeView];
+
     views[activeView]->width = w;
     views[activeView]->height = h;
+    views[activeView]->parent = split;
 
-    View* view = new View(o,
+    View* view = new View(View::ViewWindow,
+                          o,
                           views[activeView]->x + (vertical ? w : 0),
                           views[activeView]->y + (vertical ? 0 : h),
                           w, h);
+    split->child2 = view;
+    view->parent = split;
+
     views.insert(views.end(), view);
 }
 
@@ -1487,6 +1553,7 @@ void CelestiaCore::singleView()
         if ((int) i != activeView)
         {
             sim->removeObserver(views[i]->observer);
+            delete views[i]->observer;
             delete views[i];
         }
     }
@@ -1495,12 +1562,58 @@ void CelestiaCore::singleView()
     av->y = 0.0f; 
     av->width = 1.0f;
     av->height = 1.0f;
+    av->parent = 0;
 
     views.clear();
     views.insert(views.end(), av);
     activeView = 0;
 }
 
+void CelestiaCore::deleteView()
+{
+    View *v = views[activeView];
+    if (v->parent == 0) return;
+
+    for(std::vector<View*>::iterator i = views.begin(); i < views.end() ; i++)
+    {
+        if (*i == v)
+        {
+            views.erase(i);
+            break;
+        }
+    }
+
+    int sign;
+    View *sibling;
+    if (v->parent->child1 == v)
+    {
+        sibling = v->parent->child2;
+        sign = -1;
+    }
+    else
+    {
+        sibling = v->parent->child1;
+        sign = 1;
+    }
+    sibling->parent = v->parent->parent;
+    if (v->parent->parent != 0) {
+        if (v->parent->parent->child1 == v->parent)
+            v->parent->parent->child1 = sibling;
+        else
+            v->parent->parent->child2 = sibling;
+    }
+
+    v->walkTreeResize(sibling, sign);
+
+    sim->removeObserver(v->observer);
+    delete(v->observer);
+    activeView = 0;
+    sim->setActiveObserver(views[activeView]->observer);
+
+    delete(v->parent);
+    delete(v);
+}
+
 
 void CelestiaCore::setContextMenuCallback(ContextMenuFunc callback)
 {
@@ -2300,7 +2413,7 @@ bool CelestiaCore::initSimulation()
     if((renderer->getRenderFlags() & Renderer::ShowAutoMag) == 0)
     sim->setFaintestVisible(config->faintestVisible);
 
-    View* view = new View(sim->getActiveObserver(), 0.0f, 0.0f, 1.0f, 1.0f);
+    View* view = new View(View::ViewWindow, sim->getActiveObserver(), 0.0f, 0.0f, 1.0f, 1.0f);
     views.insert(views.end(), view);
 
     return true;

src/celestia/celestiacore.h

@@ -37,16 +37,28 @@ typedef Watcher<CelestiaCore> CelestiaWatcher;
 class View
 {
  public:
-    View(Observer*, float, float, float, float);
+    enum Type {
+        ViewWindow      = 1,
+        HorizontalSplit = 2,
+        VerticalSplit   = 3
+    };
+
+    View(Type, Observer*, float, float, float, float);
 
     void mapWindowToView(float, float, float&, float&) const;
-    
+
  public:
+    Type type;
+
     Observer* observer;
+    View *parent;
+    View *child1;
+    View *child2;
     float x;
     float y;
     float width;
     float height;
+    void walkTreeResize(View*, int);
 };
 
 
@@ -205,8 +217,9 @@ class CelestiaCore // : public Watchable<CelestiaCore>
     void setFaintest(float);
     void setFaintestAutoMag();
 
-    void splitView(bool vertical);
+    void splitView(View::Type);
     void singleView();
+    void deleteView();
 
     void flash(const std::string&, double duration = 1.0);
 

src/celestia/kde/data/celestiaui.rc

@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui>
-<kpartgui name="celestia" version="6">
+<kpartgui name="celestia" version="7">
 <MenuBar noMerge="0">
   <Menu name="file">
     <Action name="grabImage"/>
@@ -84,7 +84,7 @@
   <Action name="splitH" />
   <Action name="splitV" />
   <Action name="cycleView" />
-  <Action name="singleView" />
+  <Action name="deleteView" />
   <Action name="file_quit" />
 </ToolBar>
 </kpartgui>

src/celestia/kde/kdeapp.cpp

@@ -300,6 +300,7 @@ void KdeApp::initActions()
     new KAction(i18n("Split View Vertically"), "view_left_right", CTRL + Key_U, this, SLOT(slotSplitV()), actionCollection(), "splitV");
     new KAction(i18n("Cycle View"), "rotate_cw", Key_Tab, this, SLOT(slotCycleView()), actionCollection(), "cycleView");
     new KAction(i18n("Single View"), "view_remove", CTRL + Key_D, this, SLOT(slotSingleView()), actionCollection(), "singleView");
+    new KAction(i18n("Delete View"), "view_remove", Key_Delete, this, SLOT(slotDeleteView()), actionCollection(), "deleteView");
 
     new KAction(i18n("Alt-Azimuth Mode"), 0, CTRL + Key_A, this, SLOT(slotAltAzMode()), actionCollection(), "altAzMode");
 
@@ -795,6 +796,10 @@ void KdeApp::slotSingleView() {
     appCore->charEntered('\004');
 }
 
+void KdeApp::slotDeleteView() {
+    appCore->charEntered(127);
+}
+
 void KdeApp::slotAmbientLightLevel(float l) {
     appCore->getRenderer()->setAmbientLightLevel(l);
 }

src/celestia/kde/kdeapp.h

@@ -125,6 +125,7 @@ public slots:
     void slotCycleView();
     void slotAltAzMode();
     void slotSingleView();
+    void slotDeleteView();
 
     void slotCelestialBrowser();
     void slotEclipseFinder();