- Move all plugin imports to plugins __init__

- Improve style dialog
- Hysteresis fit function

Author: aglavic

.project

@@ -16,7 +16,7 @@
 	</natures>
 	<filteredResources>
 		<filter>
-			<id>1334233498656</id>
+			<id>1344408557768</id>
 			<name></name>
 			<type>10</type>
 			<matcher>
@@ -25,7 +25,7 @@
 			</matcher>
 		</filter>
 		<filter>
-			<id>1334233498661</id>
+			<id>1344408557770</id>
 			<name></name>
 			<type>10</type>
 			<matcher>
@@ -34,13 +34,22 @@
 			</matcher>
 		</filter>
 		<filter>
-			<id>1334233498663</id>
+			<id>1344408557771</id>
 			<name></name>
 			<type>10</type>
 			<matcher>
 				<id>org.eclipse.ui.ide.multiFilter</id>
 				<arguments>1.0-name-matches-false-false-debug</arguments>
 			</matcher>
 		</filter>
+		<filter>
+			<id>1344408557773</id>
+			<name></name>
+			<type>6</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-false-false-*~</arguments>
+			</matcher>
+		</filter>
 	</filteredResources>
 </projectDescription>

plot_script/fit_data.py

@@ -14,6 +14,7 @@
 # import gui functions for active config.gui.toolkit
 from plot_script.config import gui as gui_config
 import parallel
+#prepare other processes by importing all importend modules
 parallel.add_actions([
                       'import numpy',
                       'from mpfit import mpfit',
@@ -2293,6 +2294,51 @@ class FitLangevin(FitFunction):
                                         )+p[3]
   fit_function_text='Langevin'
 
+class FitHysteresis(FitFunction):
+  '''
+    Fit two Langevin functions with hysteretic offset and exchange bias shift.
+  '''
+  # define class variables.
+  name="Hysteresis"
+  parameters=[1.e-7, 0.1, 0., 20.]
+  parameter_names=['M_S', 'H_C', 'H_EB', 'w']
+  fit_function_text='M_S=[M_S]  H_C=[H_C|2]  H_{EB}=[H_EB]  w=[w|2]'
+
+  constrains={
+              0: {'bounds': [0., None], 'tied': ''},
+              1: {'bounds': [0., None], 'tied': ''},
+              3: {'bounds': [0., None], 'tied': ''},
+             }
+
+
+  def fit_function(self, p, x):
+    '''
+      Fit two Langevin functions with horizontal offset.
+      Use the x change direction to determine hysteresis branches.
+    '''
+    M_S=p[0]
+    H_C=p[1]
+    H_EB=p[2]
+    w=p[3]
+    left_pos=x[1]>x[0]
+    # find point where direction changes
+    switch_idx=numpy.where(
+                           (((-1)**left_pos*(x[:-2]-x[1:-1]))>=0)&
+                           (((-1)**left_pos*(x[1:-1]-x[2:]))<0)
+                           )[0][0]+1
+    x1=x[:switch_idx]
+    x2=x[switch_idx:]
+    out1=M_S*self.Langevin(x1-H_EB+((-1)**left_pos*H_C), w)
+    out2=M_S*self.Langevin(x2-H_EB-((-1)**left_pos*H_C), w)
+    return numpy.append(out1, out2)
+
+  def Langevin(self, H, w):
+    wH=w*H
+    res=numpy.zeros_like(H)
+    pos=wH!=0
+    res[pos]=1./numpy.tanh(wH[pos])-1./(wH[pos])
+    return res
+
 
 class FitFerromagnetic(FitFunction):
   '''
@@ -2834,6 +2880,7 @@ class FitSession(FitSessionGUI):
                        FitBrillouineB.name: FitBrillouineB,
                        FitBrillouineT.name: FitBrillouineT,
                        FitLangevin.name: FitLangevin,
+                       FitHysteresis.name: FitHysteresis,
                        FitFerromagnetic.name: FitFerromagnetic,
                        FitCuK.name: FitCuK,
                        FitPowerlaw.name: FitPowerlaw,

plot_script/gtkgui/dialogs.py

@@ -2652,13 +2652,15 @@ def _add_item(self, item):
   def add_item(self, button):
     self.list_link.append(self.entry_type())
     self._add_item(self.entry_type())
+    self.emit('activate', self, None)
 
   def remove_item(self, button):
     buttons=[item[2] for item in self.list_entries]
     idx=buttons.index(button)
     self.list_link.pop(idx)
     line, ignore, ignore=self.list_entries.pop(idx)
     self.remove(line)
+    self.emit('activate', self, None)
 
   def entry_changed(self, entry):
     entries=[item[1] for item in self.list_entries]

plot_script/gtkgui/main_window.py

@@ -579,10 +579,12 @@ def main_quit(self, action=None, store_config=True):
     # exit persistent gnuplot instances
     persistent_plot_instances=measurement_data_plotting.persistent_plot_instances
     for p in persistent_plot_instances:
-      if p.stdin.is_open():
-        p.stdin.write('quit\n')
+      try:
+        p.stdin.write('\nquit\n')
         p.stdin.flush()
-      p.communicate()
+        p.communicate()
+      except:
+        pass
     # save settings to ini file
     if store_config:
       if not os.path.exists(os.path.expanduser('~')+'/.plotting_gui'):
@@ -609,3 +611,6 @@ def main_quit(self, action=None, store_config=True):
     except RuntimeError:
       pass
 
+gobject.type_register(ApplicationMainWindow)
+gobject.signal_new("plot-drawn", ApplicationMainWindow, gobject.SIGNAL_RUN_FIRST,
+                   gobject.TYPE_NONE, ())

plot_script/gtkgui/main_window_plotting.py

@@ -10,7 +10,7 @@
 from plot_script import measurement_data_plotting
 from plot_script.config import gnuplot_preferences, user_config
 from dialogs import LabelArrowDialog, StyleLine, SimpleEntryDialog, \
-                    PreviewDialog
+                    PreviewDialog, VListEntry
 from diverse_classes import PlotProfile
 
 errorbars=False
@@ -357,6 +357,7 @@ def replot(self, echo=True):
     # make sure hugeMD objects are removed from memory after plotting
     if hasattr(self.active_dataset, 'tmp_export_file'):
       self.active_dataset.store_data()
+    self.emit('plot-drawn')
 
   def open_plot_options_window(self, action):
     '''
@@ -616,43 +617,73 @@ def show_last_plot_params(self, action):
     param_dialog=gtk.Dialog(title='Last plot parameters:')
     param_dialog.set_default_size(600, 600)
     # alignment table
-    table=gtk.Table(1, 2, False)
+    vbox1=gtk.VBox()
     paned=gtk.VPaned()
 
     # Label
     label=gtk.Label('Gnuplot input for the last plot:')
-    table.attach(label, 0, 1, 0, 1, 0, 0, 0, 0);
+    vbox1.pack_start(label, expand=False)
 
     # plot options
     sw=gtk.ScrolledWindow()
     # Set the adjustments for horizontal and vertical scroll bars.
     # POLICY_AUTOMATIC will automatically decide whether you need
     # scrollbars.
     sw.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
-    text_field=gtk.Label(plot_text)
+    text_field1=gtk.Label(plot_text)
     #text_filed.set_markup(plot_text.replace('<', '[').replace('>', ']'))
-    sw.add_with_viewport(text_field) # add textbuffer view widget
-    table.attach(sw, 0, 1, 1, 2, gtk.EXPAND|gtk.FILL, gtk.EXPAND|gtk.FILL, 0, 0)
-    paned.add(table)
+    sw.add_with_viewport(text_field1) # add textbuffer view widget
+    vbox1.add(sw)
+    paned.add1(vbox1)
     # errors of the last plot
-    if self.last_plot_text!='':
-      table=gtk.Table(1, 2, False)
-      # Label
-      label=gtk.Label('Error during execution:')
-      table.attach(label, 0, 1, 0, 1, 0, 0, 0, 0);
-      sw=gtk.ScrolledWindow()
-      # Set the adjustments for horizontal and vertical scroll bars.
-      # POLICY_AUTOMATIC will automatically decide whether you need
-      # scrollbars.
-      sw.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
-      text_field=gtk.Label(self.last_plot_text)
-      #text_field.set_markup()
-      sw.add_with_viewport(text_field) # add textbuffer view widget
-      table.attach(sw, 0, 1, 1, 2, gtk.EXPAND|gtk.FILL, gtk.EXPAND|gtk.FILL, 0, 0)
-      paned.add(table)
-      paned.set_position(400)
+    vbox2=gtk.VBox()
+    # Label
+    label=gtk.Label('Error during execution:')
+    vbox2.pack_start(label, expand=False)
+    sw=gtk.ScrolledWindow()
+    # Set the adjustments for horizontal and vertical scroll bars.
+    # POLICY_AUTOMATIC will automatically decide whether you need
+    # scrollbars.
+    sw.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
+    text_field2=gtk.Label(self.last_plot_text)
+    #text_field.set_markup()
+    sw.add_with_viewport(text_field2) # add textbuffer view widget
+    vbox2.add(sw)
+    paned.add2(vbox2)
+    paned.set_position(400)
     param_dialog.vbox.add(paned)
     param_dialog.show_all()
+    if self.last_plot_text=='':
+      paned.set_position(580)
+    def update_text(ignore):
+      # recreate string after replot command
+      if self.active_multiplot:
+        itemlist=[item[0] for item in self.multiplot]
+        if self.active_dataset in itemlist:
+          new_plot_text=measurement_data_plotting.create_plot_script(
+                            self.active_session,
+                            [item[0] for item in self.multiplot],
+                            self.active_session.active_file_name,
+                            '',
+                            self.multiplot[0][0].short_info,
+                            [item[0].short_info for item in self.multiplot],
+                            errorbars,
+                            self.active_session.TEMP_DIR+'plot_temp.png',
+                            fit_lorentz=False)
+      else:
+        new_plot_text=measurement_data_plotting.create_plot_script(
+                           self.active_session,
+                           [self.active_dataset],
+                           self.active_session.active_file_name,
+                           '',
+                           self.active_dataset.short_info,
+                           [ds.short_info for ds in self.active_dataset.plot_together],
+                           errorbars,
+                           output_file=self.active_session.TEMP_DIR+'plot_temp.png',
+                           fit_lorentz=False)
+      text_field1.set_text(new_plot_text)
+      text_field2.set_text(self.last_plot_text)
+    self.connect('plot-drawn', update_text)
     # connect dialog to main window
     self.open_windows.append(param_dialog)
     param_dialog.connect("destroy", lambda*w: self.open_windows.remove(param_dialog))
@@ -750,6 +781,7 @@ def change_plot_style(self, action):
       Open a Dialog to chang the style of the current plot.
     '''
     dialog=gtk.Dialog(title='Plot style settings...', parent=self)
+    dialog.set_default_size(600, 300)
     nb=gtk.Notebook()
     nb.show()
     dialog.vbox.add(nb)
@@ -768,11 +800,11 @@ def change_plot_style(self, action):
           tentry.show()
           title.add(entry)
           title.add(tentry)
-          dialog.vbox.add(title)
+          dialog.vbox.pack_start(title, expand=False)
           tentry.connect('activate', self.change_plot_shortinfo, dataset)
           line=StyleLine(dataset.plot_options, self.replot)
           line.show()
-          main_items.add(line)
+          main_items.pack_start(line, expand=False)
           i+=1
     else:
       datasets=self.active_dataset.plot_together
@@ -787,10 +819,10 @@ def change_plot_style(self, action):
         tentry.connect('activate', self.change_plot_shortinfo, dataset)
         title.add(entry)
         title.add(tentry)
-        main_items.add(title)
+        main_items.pack_start(title, expand=False)
         line=StyleLine(dataset.plot_options, self.replot)
         line.show()
-        main_items.add(line)
+        main_items.pack_start(line, expand=False)
     sw=gtk.ScrolledWindow()
     sw.add_with_viewport(main_items)
     sw.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
@@ -799,7 +831,22 @@ def change_plot_style(self, action):
     # Create entries for the advanced options of the PlotOptions class
     advanced_items=gtk.VBox()
     #
+    pre_entry=VListEntry(self.active_dataset.plot_options.free_input,
+                         title='Custom commands before script')
+    pre_entry.show()
+    advanced_items.pack_start(pre_entry, expand=False)
+    advanced_items.show_all()
+    pre_entry.connect('activate', lambda *ignore: self.replot())
+    post_entry=VListEntry(self.active_dataset.plot_options.free_input_after,
+                         title='Custom commands after settings')
+    post_entry.show()
+    advanced_items.pack_start(post_entry, expand=False)
+    button=gtk.Button('Show gnuplot script')
+    button.connect('clicked', self.show_last_plot_params)
+    advanced_items.pack_end(button, expand=False)
     advanced_items.show_all()
+    post_entry.connect('activate', lambda *ignore: self.replot())
+    #
     nb.append_page(advanced_items, gtk.Label('Advanced Gnuplot Settings'))
     dialog.show()
     self.open_windows.append(dialog)

plot_script/plugins/__init__.py

@@ -1,19 +1,59 @@
 # -*- coding: utf-8 -*-
-
 '''
-  Plot.py global plugins package. Scans the plugins folder for python files and imports them.
+  Plot.py global plugins package. Scans the global and user plugins folder 
+  for python files and imports them.
+  
+  To import all plugin modules directly use:
+    from plot_script.plugins import * # import to namespace
+     or
+    from plot_script.plugins import all_plugins # import list of modules
 '''
 
 import sys
 import os
+
 # Add this folder to python path
 global_plugin_path=os.path.abspath(os.path.split(__file__)[0])
 if not global_plugin_path in sys.path:
   sys.path.append(global_plugin_path)
 
+__all__=[]
+
+# plugins from the program folder
 global_plugins=[]
 plugin_sources=os.listdir(global_plugin_path)
 plugin_sources=filter(lambda file_name: file_name.endswith('.py'), plugin_sources)
 for plugin_source in plugin_sources:
-  plugin=__import__(plugin_source[:-3])
-  global_plugins.append(plugin)
+  if plugin_source.startswith('_'):
+    continue
+  try:
+    plugin=__import__('plot_script.plugins.'+plugin_source[:-3], fromlist=[plugin_source[:-3]])
+  except ImportError, error:
+    print "Error importing plugin %s, skipped. Error message: %s"%(plugin_source, error)
+  else:
+    global_plugins.append(plugin)
+    exec '%s=plugin'%plugin_source[:-3]
+    __all__.append(plugin_source[:-3])
+
+# plugins from the user folder
+user_plugins=[]
+user_folder=os.path.join(os.path.expanduser('~'), '.plotting_gui')
+if os.path.exists(user_folder) and os.path.exists(os.path.join(user_folder, 'plugins')):
+  if not os.path.join(user_folder, 'plugins') in sys.path:
+    sys.path.append(os.path.join(user_folder, 'plugins'))
+  plugin_sources=os.listdir(os.path.join(user_folder, 'plugins'))
+  plugin_sources=filter(lambda file_: file_.endswith('.py'), plugin_sources)
+  for plugin_source in plugin_sources:
+    if plugin_source.startswith('_'):
+      continue
+    try:
+      plugin=__import__(plugin_source[:-3])
+    except ImportError, error:
+      print "Error importing plugin %s, skipped. Error message: %s"%(plugin_source, error)
+    else:
+      user_plugins.append(plugin)
+      exec '%s=plugin'%plugin_source[:-3]
+      __all__.append(plugin_source[:-3])
+
+
+all_plugins=global_plugins+user_plugins