Skip to content

Commit 984798e

Browse files
committed
Useful error message for pre-computed bubble plot when no data available
1 parent cd46ad0 commit 984798e

2 files changed

Lines changed: 9 additions & 1 deletion

File tree

VIPInterface.py

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1184,15 +1184,22 @@ def getPreDEGbubble(data):
11841184
conn = sqlite3.connect(strF)
11851185
deg = pd.read_sql_query(sql,conn,params=data['compSel']+data['genes']+data['compSel'])
11861186
conn.close()
1187+
if deg.shape[0]==0:
1188+
raise ValueError("No data for selected genes ("+", ".join(data['genes'])+") in selected comparison ("+", ".join(data['compSel'])+")!")
11871189

11881190
## add selected genes which is not in the database back to the dataframe as NA
11891191
addG = [[i,np.nan,np.nan,np.nan,data['compSel'][0]] for i in data['genes'] if i not in list(deg.gene.unique())]
11901192
if len(addG)>0:
11911193
deg = pd.concat([deg,pd.DataFrame(addG,columns=deg.columns)])
1194+
## add selected comparison which is not in the database back to the dataframe as NA
1195+
addComp = [[data['genes'][0],np.nan,np.nan,np.nan,i] for i in data['compSel'] if i not in list(deg.tag.unique())]
1196+
if len(addComp)>0:
1197+
deg = pd.concat([deg,pd.DataFrame(addComp,columns=deg.columns)])
1198+
#ppr.pprint(deg)
11921199
## plot in R
11931200
strF = ('%s/DEG%f.csv' % (data["CLItmp"],time.time()))
11941201
deg.to_csv(strF,index=False)
1195-
#ppr.pprint(' '.join([strExePath+'/bubbleMap.R',strF,data['figOpt']['img'],str(data['figOpt']['fontsize']),str(data['figOpt']['dpi']),data['scale']]))
1202+
#ppr.pprint(' '.join([strExePath+'/bubbleMap.R',strF,data['figOpt']['img'],str(data['figOpt']['fontsize']),str(data['figOpt']['dpi']),data['scale'],data['Rlib']]))
11961203
res = subprocess.run([strExePath+'/bubbleMap.R',strF,data['figOpt']['img'],str(data['figOpt']['fontsize']),str(data['figOpt']['dpi']),data['scale'],data['Rlib']],capture_output=True)#
11971204
img = res.stdout.decode('utf-8')
11981205
os.remove(strF)

interface.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3558,6 +3558,7 @@ <h3>Brushed ranges</h3>
35583558
'figOpt':window.figOpt}
35593559
document.getElementById(eID+"spin").style.visibility="visible";
35603560
$("."+eID+"bt").prop('disabled',true);
3561+
showImg(eID+'fig',"iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII=");
35613562
$.ajax({
35623563
type:"POST",
35633564
url: VIPurl,

0 commit comments

Comments
 (0)