Changeset 1576

Timestamp:

Nov 21, 2014 9:58:58 AM (7 years ago)

Author:

toby

Message:

add scroll for masks; fix up image import after GPX/image file move

Location:

trunk

Files:

• GSASIIIO.py (modified) (4 diffs)
• GSASIIimgGUI.py (modified) (8 diffs)

trunk/GSASIIIO.py

@@ -136 +136 @@
 
     '''
-    if not ospath.exists(imagefile):
-        dlg = wx.FileDialog(G2frame, 'Bad image file name; choose name', '.', '',\
+    if not os.path.exists(imagefile):
+        print 'Image file '+imagefile+' not found'
+        fil = imagefile.replace('\\','/') # windows?!
+        # see if we can find a file with same name or in a similarly named sub-dir
+        pth,fil = os.path.split(fil)
+        prevpth = None
+        while pth and pth != prevpth:
+            prevpth = pth
+            if os.path.exists(os.path.join(G2frame.dirname,fil)):
+                print 'found image file '+os.path.join(G2frame.dirname,fil)
+                return os.path.join(G2frame.dirname,fil)
+            pth,enddir = os.path.split(pth)
+            fil = os.path.join(enddir,fil)
+        # not found as a subdirectory, drop common parts of path for last saved & image file names
+        #    if image was .../A/B/C/imgs/ima.ge
+        #      & GPX was  .../A/B/C/refs/fil.gpx but is now .../NEW/TEST/TEST1
+        #    will look for .../NEW/TEST/TEST1/imgs/ima.ge, .../NEW/TEST/imgs/ima.ge, .../NEW/imgs/ima.ge and so on
+        Controls = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,G2frame.root, 'Controls'))
+        gpxPath = Controls.get('LastSavedAs','').replace('\\','/').split('/') # blank in older .GPX files
+        imgPath = imagefile.replace('\\','/').split('/')
+        for p1,p2 in zip(gpxPath,imgPath):
+            if p1 == p2:
+                gpxPath.pop(0),imgPath.pop(0)
+            else:
+                break
+        fil = os.path.join(*imgPath) # file with non-common prefix elements
+        prevpth = None
+        pth = os.path.abspath(G2frame.dirname)
+        while pth and pth != prevpth:
+            prevpth = pth
+            if os.path.exists(os.path.join(pth,fil)):
+                print 'found image file '+os.path.join(pth,fil)
+                return os.path.join(pth,fil)
+            pth,enddir = os.path.split(pth)
+        GSASIIpath.IPyBreak()
+
+    if not os.path.exists(imagefile):
+        dlg = wx.FileDialog(G2frame, 'Previous image file not found; open here', '.', '',\
         'Any image file (*.edf;*.tif;*.tiff;*.mar*;*.ge*;*.avg;*.sum;*.img)\
         |*.edf;*.tif;*.tiff;*.mar*;*.ge*;*.avg;*.sum;*.img|\
@@ -242 +278 @@
     ext = ospath.splitext(imagefile)[1]
     Comments = []
+    Image = None
     if ext == '.tif' or ext == '.tiff':
         Comments,Data,Npix,Image = GetTifData(imagefile)
@@ -270 +307 @@
         if not imageOnly:
             EditImageParms(G2frame,Data,Comments,Image,imagefile)
+    else:
+        print 'Extension for file '+imagefile+' not recognized'
+    if Image is None:
+        raise Exception('No image read')
     if imageOnly:
         if TRANSP:
@@ -940 +981 @@
         file = open(G2frame.GSASprojectfile,'wb')
         print 'save to file: ',G2frame.GSASprojectfile
+        # stick the file name into the tree
+        Controls = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,G2frame.root, 'Controls'))
+        Controls['LastSavedAs'] = G2frame.GSASprojectfile
         wx.BeginBusyCursor()
         try:

trunk/GSASIIimgGUI.py

@@ -1024 +1024 @@
     
 def UpdateMasks(G2frame,data):
-    '''Shows and handles the controls on the "Masks"
-    data tree entry
+    '''Shows and handles the controls on the "Masks" data tree entry
     '''
     
@@ -1235 +1234 @@
         G2frame.dataFrame.GetStatusBar().SetStatusText('Ring mask active - LB pick ring location')
     else:
-        G2frame.dataFrame.GetStatusBar().SetStatusText("To add mask: On 2D Powder Image, key a:arc, r:ring, s:spot, p:polygon, f:frame")
-    G2frame.dataDisplay = wx.Panel(G2frame.dataFrame)
+        G2frame.dataFrame.GetStatusBar().SetStatusText("To add mask: press a,r,s,p or f on 2D image for arc/ring/spot/polygon/frame")
+    G2frame.dataDisplay = wxscroll.ScrolledPanel(G2frame.dataFrame)
     mainSizer = wx.BoxSizer(wx.VERTICAL)
     mainSizer.Add((5,10),0)
@@ -1272 +1271 @@
     delSpotId = []
     if spots:
+        lbl = wx.StaticText(parent=G2frame.dataDisplay,label=' Spot masks')
+        lbl.SetBackgroundColour(wx.Colour(200,200,210))
+        mainSizer.Add(lbl,0,wx.EXPAND|wx.ALIGN_CENTER,0)
         littleSizer = wx.FlexGridSizer(0,3,0,5)
-        littleSizer.Add(wx.StaticText(parent=G2frame.dataDisplay,label=' Spot masks:'),0,WACV)
-        littleSizer.Add((5,0),0)
-        littleSizer.Add((5,0),0)
         littleSizer.Add(wx.StaticText(parent=G2frame.dataDisplay,label=' position, mm'),0,WACV)
         littleSizer.Add(wx.StaticText(parent=G2frame.dataDisplay,label=' diameter, mm'),0,WACV)
@@ -1301 +1300 @@
     delRingId = []
     if rings:
+        lbl = wx.StaticText(parent=G2frame.dataDisplay,label=' Ring masks')
+        lbl.SetBackgroundColour(wx.Colour(200,200,210))
+        mainSizer.Add(lbl,0,wx.EXPAND|wx.ALIGN_CENTER,0)
         littleSizer = wx.FlexGridSizer(0,3,0,5)
-        littleSizer.Add(wx.StaticText(parent=G2frame.dataDisplay,label=' Ring masks:'),0,WACV)
-        littleSizer.Add((5,0),0)
-        littleSizer.Add((5,0),0)
         littleSizer.Add(wx.StaticText(parent=G2frame.dataDisplay,label=' 2-theta,deg'),0,WACV)
         littleSizer.Add(wx.StaticText(parent=G2frame.dataDisplay,label=' thickness, deg'),0,WACV)
@@ -1330 +1329 @@
     delArcId = []
     if arcs:
+        lbl = wx.StaticText(parent=G2frame.dataDisplay,label=' Arc masks')
+        lbl.SetBackgroundColour(wx.Colour(200,200,210))
+        mainSizer.Add(lbl,0,wx.EXPAND|wx.ALIGN_CENTER,0)
         littleSizer = wx.FlexGridSizer(0,4,0,5)
-        littleSizer.Add(wx.StaticText(parent=G2frame.dataDisplay,label=' Arc masks:'),0,WACV)
-        littleSizer.Add((5,0),0)
-        littleSizer.Add((5,0),0)
-        littleSizer.Add((5,0),0)
         littleSizer.Add(wx.StaticText(parent=G2frame.dataDisplay,label=' 2-theta,deg'),0,WACV)
         littleSizer.Add(wx.StaticText(parent=G2frame.dataDisplay,label=' azimuth, deg'),0,WACV)
@@ -1367 +1365 @@
     delFrameId = []
     if polygons:
+        lbl = wx.StaticText(parent=G2frame.dataDisplay,label=' Polygon masks (on plot RB vertex drag to move,\nLB vertex drag to insert)')
+        lbl.SetBackgroundColour(wx.Colour(200,200,210))
+        mainSizer.Add(lbl,0,wx.EXPAND|wx.ALIGN_CENTER,0)
         littleSizer = wx.FlexGridSizer(0,2,0,5)
-        littleSizer.Add(wx.StaticText(parent=G2frame.dataDisplay,label=' Polygon masks:'),0,WACV)
-        littleSizer.Add((5,0),0)
         for polygon in polygons:
             if polygon:
@@ -1383 +1382 @@
         mainSizer.Add(littleSizer,0,)
     if frame:
+        lbl = wx.StaticText(parent=G2frame.dataDisplay,label=' Frame mask (on plot RB vertex drag to move,\nLB vertex drag to insert)')
+        lbl.SetBackgroundColour(wx.Colour(200,200,210))
+        mainSizer.Add(lbl,0,wx.EXPAND|wx.ALIGN_CENTER,0)
         littleSizer = wx.FlexGridSizer(0,2,0,5)
-        littleSizer.Add(wx.StaticText(parent=G2frame.dataDisplay,label=' Frame mask:'),0,
-            WACV)
-        littleSizer.Add((5,0),0)
         frameList = []
         for x,y in frame:
@@ -1397 +1396 @@
         littleSizer.Add(frameDelete,0,WACV)
         mainSizer.Add(littleSizer,0,)
-    if (frame or polygons):
-        mainSizer.Add(wx.StaticText(G2frame.dataDisplay,
-            label=' For frame and polygons: on plot RB vertex drag to move, LB vertex drag to insert'),0,WACV)
+    #if (frame or polygons):
+    #    mainSizer.Add(wx.StaticText(G2frame.dataDisplay,
+    #        label=' For frame and polygons: on plot RB vertex drag to move, LB vertex drag to insert'),0,WACV)
     mainSizer.Layout()    
     G2frame.dataDisplay.SetSizer(mainSizer)
     G2frame.dataDisplay.SetSize(mainSizer.Fit(G2frame.dataFrame))
+    G2frame.dataDisplay.SetupScrolling()
     Size = mainSizer.Fit(G2frame.dataFrame)
-    Size[0] = 450
+    Size[0] += 50 # room for scrollbar & status msg
+    Size[1] = min(Size[1],500)
+    G2frame.dataDisplay.SetSize(Size)
     G2frame.dataFrame.setSizePosLeft(Size)