Changes in / [048381b3:8416a02] in sasview

Files:

• docs/sphinx-docs/source/user/analysis.rst (modified) (1 diff)
• docs/sphinx-docs/source/user/sasgui/perspectives/corfunc/corfunc_help.rst (deleted)
• docs/sphinx-docs/source/user/sasgui/perspectives/corfunc/fig1.gif (deleted)
• docs/sphinx-docs/source/user/sasgui/perspectives/corfunc/fig2.gif (deleted)
• docs/sphinx-docs/source/user/sasgui/perspectives/corfunc/tutorial1.png (deleted)
• docs/sphinx-docs/source/user/sasgui/perspectives/corfunc/tutorial2.png (deleted)
• docs/sphinx-docs/source/user/sasgui/perspectives/corfunc/tutorial3.png (deleted)
• sasview/sasview.py (modified) (4 diffs)
• src/sas/sascalc/corfunc/__init__.py (deleted)
• src/sas/sascalc/corfunc/corfunc_calculator.py (deleted)
• src/sas/sascalc/corfunc/transform_thread.py (deleted)
• src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter1D.py (modified) (6 diffs)
• src/sas/sasgui/perspectives/corfunc/__init__.py (deleted)
• src/sas/sasgui/perspectives/corfunc/corfunc.py (deleted)
• src/sas/sasgui/perspectives/corfunc/corfunc_panel.py (deleted)
• src/sas/sasgui/perspectives/corfunc/corfunc_state.py (deleted)
• src/sas/sasgui/perspectives/corfunc/media/corfunc_help.rst (deleted)
• src/sas/sasgui/perspectives/corfunc/media/fig1.gif (deleted)
• src/sas/sasgui/perspectives/corfunc/media/fig2.gif (deleted)
• src/sas/sasgui/perspectives/corfunc/media/tutorial1.png (deleted)
• src/sas/sasgui/perspectives/corfunc/media/tutorial2.png (deleted)
• src/sas/sasgui/perspectives/corfunc/media/tutorial3.png (deleted)
• src/sas/sasgui/perspectives/corfunc/plot_labels.py (deleted)
• test/corfunc/test/98929.txt (deleted)
• test/corfunc/test/utest_corfunc.py (deleted)

docs/sphinx-docs/source/user/analysis.rst

@@ -6 +6 @@
 .. toctree::
    :maxdepth: 1
-
+   
    Model Fitting <sasgui/perspectives/fitting/fitting>
-
+   
    P(r) Inversion <sasgui/perspectives/pr/pr_help>
-
+   
    Invariant Calculation <sasgui/perspectives/invariant/invariant_help>
-
-   Correlation Function <sasgui/perspectives/corfunc/corfunc_help>

sasview/sasview.py

@@ -81 +81 @@
 #Always use private .matplotlib setup to avoid conflicts with other
 #uses of matplotlib
-#Have to check if .sasview exists first
+#Have to check if .sasview exists first 
 sasdir = os.path.join(os.path.expanduser("~"),'.sasview')
 if not os.path.exists(sasdir):
@@ -119 +119 @@
         # Fitting perspective
         try:
-            import sas.sasgui.perspectives.fitting as module
+            import sas.sasgui.perspectives.fitting as module    
             fitting_plug = module.Plugin()
             self.gui.add_perspective(fitting_plug)
@@ -145 +145 @@
             logging.error(traceback.format_exc())
 
-        # Corfunc perspective
-        try:
-            import sas.sasgui.perspectives.corfunc as module
-            corfunc_plug = module.Plugin()
-            self.gui.add_perspective(corfunc_plug)
-        except:
-            logging.error("Unable to load corfunc module")
-
-        #Calculator perspective
+        #Calculator perspective   
         try:
             import sas.sasgui.perspectives.calculator as module
@@ -199 +191 @@
 if __name__ == "__main__":
     run()
+

src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter1D.py

@@ -95 +95 @@
         self.parent.SetFocus()
 
-        # If true, there are 3 qrange bars
-        self.is_corfunc = False
-
 
     def get_symbol_label(self):
@@ -217 +214 @@
         if active_ctrl == None:
             return
-        if hasattr(event, 'is_corfunc'):
-            self.is_corfunc = event.is_corfunc
         if event.id in self.plots.keys():
             ctrl = event.ctrl
@@ -227 +222 @@
             values = [max(x_data.min(), float(ctrl[0].GetValue())),
                       min(x_data.max(), float(ctrl[1].GetValue()))]
-            if len(ctrl) == 3:
-                colors.append('purple')
-                values.append(min(x_data.max(), float(ctrl[2].GetValue())))
             if self.ly == None:
                 self.ly = []
@@ -301 +293 @@
         ly0x = ly[0].get_xdata()
         ly1x = ly[1].get_xdata()
-        ly2x = None
-        if self.is_corfunc: ly2x = ly[2].get_xdata()
         self.q_ctrl[0].SetBackgroundColour('white')
         self.q_ctrl[1].SetBackgroundColour('white')
@@ -316 +306 @@
                 self.q_ctrl[0].SetValue(str(pos_x))
                 self.q_ctrl[1].SetBackgroundColour('pink')
-        elif ly2x is not None and ly1x >= ly2x:
-            if self.vl_ind == 1:
-                ly[2].set_xdata(posx)
-                ly[2].set_zorder(nop)
-                self.q_ctrl[2].SetValue(str(pos_x))
-            elif self.vl_ind == 2:
-                ly[1].set_xdata(posx)
-                ly[1].set_zorder(nop)
-                self.q_ctrl[1].SetValue(str(pos_x))
-
 
     def _get_cusor_lines(self, event):
@@ -345 +325 @@
             dqmin = math.fabs(event.xdata - self.ly[0].get_xdata())
             dqmax = math.fabs(event.xdata - self.ly[1].get_xdata())
-            if not self.is_corfunc:
-                is_qmax = dqmin > dqmax
-                if is_qmax:
-                    self.vl_ind = 1
-                else:
-                    self.vl_ind = 0
+            is_qmax = dqmin > dqmax
+            if is_qmax:
+                self.vl_ind = 1
             else:
-                dqmax2 = math.fabs(event.xdata - self.ly[2].get_xdata())
-                closest = min(dqmin, dqmax, dqmax2)
-                self.vl_ind = { dqmin: 0, dqmax: 1, dqmax2: 2 }.get(closest)
+                self.vl_ind = 0
 
     def cusor_line(self, event):