Skip to content

Commit 6e1346a

Browse files
committed
Stop auto plot update after atom parameter change; add message to status line to update plot
RB selection now puts view point at RB origin not 1st atom.
1 parent 1dc5fe1 commit 6e1346a

File tree

1 file changed

+9
-4
lines changed

1 file changed

+9
-4
lines changed

GSASII/GSASIIphsGUI.py

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4500,7 +4500,8 @@ def chkUij(Uij,CSI): #needs to do something!!!
45004500
if 'Atoms' in data['Drawing'] and replot:
45014501
ci = colLabels.index('I/A')
45024502
G2mth.DrawAtomsReplaceByID(data,ci+8,atomData[r],ID)
4503-
G2plt.PlotStructure(G2frame,data)
4503+
G2frame.GetStatusBar().SetStatusText('Structure changed: Do "Edit Atoms/Update draw atoms" to refresh structure drawing',1)
4504+
# G2plt.PlotStructure(G2frame,data)
45044505
if SGData['SpGrp'] != 'P 1': #no need to update P 1 structures!
45054506
wx.CallAfter(Paint)
45064507

@@ -4525,7 +4526,8 @@ def AtomTypeSelect(event):
45254526
ID = atomData[r][ci+8]
45264527
if 'Atoms' in data['Drawing']:
45274528
G2mth.DrawAtomsReplaceByID(data,ci+8,atomData[r],ID)
4528-
G2plt.PlotStructure(G2frame,data)
4529+
G2frame.GetStatusBar().SetStatusText('Structure changed: Do "Edit Atoms/Update draw atoms" to refresh structure drawing',1)
4530+
# G2plt.PlotStructure(G2frame,data)
45294531
SetupGeneral()
45304532
else:
45314533
event.Skip()
@@ -4575,7 +4577,8 @@ def RowSelect(event):
45754577
G2frame.GetStatusBar().SetStatusText('Use right mouse click to brng up Atom editing options',1)
45764578
Atoms.ClearSelection()
45774579
Atoms.SelectRow(r,True)
4578-
G2plt.PlotStructure(G2frame,data)
4580+
G2frame.GetStatusBar().SetStatusText('Structure changed: Do "Edit Atoms/Update draw atoms" to refresh structure drawing',1)
4581+
# G2plt.PlotStructure(G2frame,data)
45794582

45804583
def ChangeSelection(event):
45814584
r,c = event.GetRow(),event.GetCol()
@@ -13891,14 +13894,16 @@ def RepaintRBInfo(rbType,rbIndx,Scroll=0):
1389113894
return
1389213895
Indx.clear()
1389313896
rbObj = data['RBModels'][rbType][rbIndx]
13894-
data['Drawing']['viewPoint'][0] = data['Atoms'][AtLookUp[rbObj['Ids'][0]]][cx:cx+3]
1389513897
Quad = rbObj['Orient'][0]
1389613898
data['Drawing']['Quaternion'] = G2mth.invQ(Quad)
1389713899
if rbType == 'Residue':
13900+
data['Drawing']['viewPoint'][0] = rbObj['Orig'][0]
1389813901
G2frame.bottomSizer = ResrbSizer(rbObj,rbIndx)
1389913902
elif rbType == 'Spin':
13903+
data['Drawing']['viewPoint'][0] = data['Atoms'][AtLookUp[rbObj['Ids'][0]]][cx:cx+3]
1390013904
G2frame.bottomSizer = SpnrbSizer(rbObj,rbIndx)
1390113905
else: #Vector
13906+
data['Drawing']['viewPoint'][0] = rbObj['Orig'][0]
1390213907
G2frame.bottomSizer = VecrbSizer(rbObj,rbIndx)
1390313908
mainSizer.Add(G2frame.bottomSizer)
1390413909
mainSizer.Layout()

0 commit comments

Comments
 (0)