* system/plots.py, system/fluent.glade: There is now an active plot.

fluent

@@ -47,6 +47,16 @@ class FluentApp:
         self.log_view.show()
         return self.log_view
 
+    def create_small_view(self, str1, str2, int1, int2):
+        self.small_view = plots.SmallView()
+        self.small_view.show()
+        return self.small_view
+
+    def create_large_view(self, str1, str2, int1, int2):
+        self.large_view = plots.LargeView()
+        self.large_view.show()
+        return self.large_view
+
     def create_navigator_view(self, str1, str2, int1, int2):
         self.navigator_view = navigator.NavigatorView(self.navigator, self)
         self.navigator_view.show()
@@ -66,23 +76,11 @@ class FluentApp:
         wf_box.pack_end(wf_menu)
 
         # Set up plot
-        pt = self.widget_tree.get_widget('plot_table')
+        pt = self.widget_tree.get_widget('small_view')
         plot = plots.SinePlot()
         plot.show()
         plot.mark_active(True)
-        pt.add(plot)
-
-        plot2 = plots.EmptyPlot()
-        plot2.show()
-        pt.attach(plot2, 1, 2, 0, 1)
-
-        plot3 = plots.EmptyPlot()
-        plot3.show()
-        pt.attach(plot3, 0, 1, 1, 2)
-
-        plot4 = plots.EmptyPlot()
-        plot4.show()
-        pt.attach(plot4, 1, 2, 1, 2)
+#        pt.set_child(plot, 0, 1)
 
         # Set up plot toolbar
         dock = self.widget_tree.get_widget('plot_toolbar_dock')
@@ -91,15 +89,20 @@ class FluentApp:
         # Connect signals
         signals = {'on_quit1_activate' : (gtk.main_quit),
                    'on_appwindow_delete_event' : (gtk.main_quit),
-                   'on_view_log_activate' : (self.toggle_view_log)}
+                   'on_view_log_activate' : (self.toggle_view_log),
+                   'on_zoom_in_button_clicked' : (self.on_single_view),
+                   'on_zoom_out_button_clicked' : (self.on_multiple_view)}
         self.widget_tree.signal_autoconnect(signals)
 
         # Log that we've set up the app now
         logger.log('debug', 'Program started')
 
     def change_plot(self, plot):
-        pt = self.widget_tree.get_widget('plot_table')
-        pt.attach(plot, 1, 2, 1, 2)
+        pt = self.widget_tree.get_widget('small_view')
+        pt.set_child(plot, 1, 1)
+#        plot.hide()
+#        pt.remove(plot)
+#        plot.unparent()
         
     def toggle_view_log(self, menu_item):
         lw = self.widget_tree.get_widget('logview')
@@ -109,6 +112,13 @@ class FluentApp:
             lw.unparent()
         logger.log('debug', 'Toggling log window visibility')
 
+    def on_single_view(self, button):
+        nb = self.widget_tree.get_widget('view_notebook')
+        nb.set_current_page(1)
+
+    def on_multiple_view(self, button):
+        nb = self.widget_tree.get_widget('view_notebook')
+        nb.set_current_page(0)
 
 if __name__ == '__main__':
     gnome.program_init(PROGRAM_NAME, VERSION)