@@ -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 )
0 commit comments