Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package sirilic for openSUSE:Factory checked in at 2023-10-12 23:41:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sirilic (Old) and /work/SRC/openSUSE:Factory/.sirilic.new.1807 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sirilic" Thu Oct 12 23:41:03 2023 rev:2 rq:1117111 version:1.15.8 Changes: -------- --- /work/SRC/openSUSE:Factory/sirilic/sirilic.changes 2023-09-06 19:04:15.332525147 +0200 +++ /work/SRC/openSUSE:Factory/.sirilic.new.1807/sirilic.changes 2023-10-12 23:42:27.157643573 +0200 @@ -1,0 +2,15 @@ +Mon Oct 9 14:32:28 UTC 2023 - Paolo Stivanin <[email protected]> + +- Update to 1.15.8: + * fix "platesolving" + * fix "weighing" only for light + * check if Siril path is a file and file access is "x" + * fix coords format (Simbad) (Sometimes, the format is not degre minute second) + * fix project history + +------------------------------------------------------------------- +Thu Oct 5 15:12:47 UTC 2023 - Paolo Stivanin <[email protected]> + +- Remove useless checks. + +------------------------------------------------------------------- Old: ---- sirilic-V1.15.7.tar.bz2 New: ---- sirilic-V1.15.8.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sirilic.spec ++++++ --- /var/tmp/diff_new_pack.CRyGIY/_old 2023-10-12 23:42:27.889670071 +0200 +++ /var/tmp/diff_new_pack.CRyGIY/_new 2023-10-12 23:42:27.889670071 +0200 @@ -1,7 +1,7 @@ # # spec file for package sirilic # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: sirilic -Version: 1.15.7 +Version: 1.15.8 Release: 0 Summary: Software that uses SiriL for preparing acquisition files for processing License: LGPL-3.0-or-later @@ -29,14 +29,8 @@ BuildRequires: pkgconfig(python3) >= 3.6 Requires: siril >= 1.0.6 BuildArch: noarch -%if 0%{?fedora_version} >= 30 || 0%{?centos_version} >= 8 -BuildRequires: python-wxpython4 >= 4.0 -Requires: python-wxpython4 >= 4.0 -%endif -%if 0%{?suse_version} >= 1530 BuildRequires: python3-wxPython >= 4.0 Requires: python3-wxPython >= 4.0 -%endif %description SiriLic ( SiriL Image Converter) is a software for preparing ++++++ sirilic-V1.15.7.tar.bz2 -> sirilic-V1.15.8.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sirilic-V1.15.7/sirilic/lib/actionsiril.py new/sirilic-V1.15.8/sirilic/lib/actionsiril.py --- old/sirilic-V1.15.7/sirilic/lib/actionsiril.py 2023-08-15 17:02:33.000000000 +0200 +++ new/sirilic-V1.15.8/sirilic/lib/actionsiril.py 2023-09-28 20:42:07.000000000 +0200 @@ -24,7 +24,6 @@ import threading import ctypes import locale -import io from sirilic.lib import tools,constantes @@ -32,19 +31,20 @@ class SirilScript(threading.Thread): def __init__(self, log, siril_exe, script,last_processed_image, bRunSiril, bDev ): threading.Thread.__init__(self,name="ThSiril") + if siril_exe.find('siril-cli') == -1 : + siril_exe=siril_exe.replace('siril','siril-cli') self.param=(log, siril_exe, script, last_processed_image, bRunSiril, bDev ) self.memolog = [] - + # -------------------------------------------------------------------------- def run(self): ( log, siril_exe, script,last_processed_image, bRunSiril, bDev ) = self.param + + if check_exe(log, siril_exe) : return + task = tools.GestionThread() task.SetRunning(self) - if not os.path.exists( siril_exe ) : - log.insert("***" + _("Error: siril don't exist") + " => " + siril_exe + '?\n') - return - if self.check_compatibility(log,siril_exe, bDev) : return workdir=os.path.dirname(os.path.dirname(script)) @@ -256,7 +256,7 @@ buffer = byte_buffer.decode(code,errors='ignore') buffer = buffer.rstrip() if buffer.find("Reading sequence failed, file cannot be opened:")==0: - buffer = "~~~ warning:" + buffer + '\n' + buffer = "~~~ warning:" + buffer + '\n' elif not re.search(r'[0-9][0-9]*: running',buffer): buffer = "*** " + buffer + '\n' else: @@ -266,7 +266,25 @@ byte_buffer=b'' # ============================================================================== +def check_exe(log, siril_exe): + if not os.path.exists( siril_exe ) : + log.insert("***" + _("Error: siril don't exist") + " => " + siril_exe + '?\n') + return True + + if not os.path.isfile(siril_exe) : + log.insert("***" + _("Error: siril isn't a file") + " => " + siril_exe + '?\n') + return True + + if not os.access(siril_exe, os.X_OK) : + log.insert("***" + _("Error: siril isn't a executable") + " => " + siril_exe + '?\n') + return True + + return False +# ============================================================================== def run_alone(log, siril_exe, filename=None, strcwd=None): + siril_exe=siril_exe.replace('siril-cli','siril') + if check_exe(log, siril_exe) : return + if (filename != None) : log.insert("### " + _("last processed image") + " => " + filename + ' ###\n') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sirilic-V1.15.7/sirilic/lib/buildscript.py new/sirilic-V1.15.8/sirilic/lib/buildscript.py --- old/sirilic-V1.15.7/sirilic/lib/buildscript.py 2023-08-15 17:02:33.000000000 +0200 +++ new/sirilic-V1.15.8/sirilic/lib/buildscript.py 2023-09-28 20:42:07.000000000 +0200 @@ -869,9 +869,7 @@ ccd_mono = 0 no_align = False self.wplatesolveR={'mode':0} - for layername,sessions in layers.items(): - if layername == "R" : self.wplatesolveR = self.wplatesolve - + for layername,sessions in layers.items(): if not (self.isColor(layername) ) : ccd_mono = ccd_mono +1 if (len(sessions) != 1) and ( multisession is False ): @@ -888,6 +886,7 @@ self.wsubsky = image[r"subsky"] self.wplatesolve = image["platesolve"] + if layername == "R" : self.wplatesolveR = self.wplatesolve self.register_opt = self.mk_reg_param(image,layername) regdrizzle=" -drizzle " if image['register']['drizzle'] else "" @@ -994,7 +993,7 @@ last_processed_image="final_" + objectname +"_RGB" self.command("rgbcomp", "mr_C01 mr_C02 mr_C03 -out=../"+last_processed_image) - if self.wplatesolveR['mode'] == 1 : + if self.wplatesolveR['mode'] >= 1 : self.command("load", "../"+last_processed_image) self.platesolve(self.wplatesolveR, "../"+last_processed_image,pcc=True ) @@ -1002,7 +1001,7 @@ self.comment(_("LRGB compositing")+"...") last_processed_image="final_" + objectname + "_LRGB" self.command("rgbcomp", "-lum=r_C00 mr_C01 mr_C02 mr_C03 -out=../" + last_processed_image) - if self.wplatesolveR['mode'] == 1 : + if self.wplatesolveR['mode'] >= 1 : self.command("load", "../"+last_processed_image) self.platesolve(self.wplatesolveR, "../"+last_processed_image,pcc=True) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sirilic-V1.15.7/sirilic/lib/callbacks.py new/sirilic-V1.15.8/sirilic/lib/callbacks.py --- old/sirilic-V1.15.7/sirilic/lib/callbacks.py 2023-08-15 17:02:33.000000000 +0200 +++ new/sirilic-V1.15.8/sirilic/lib/callbacks.py 2023-09-28 20:42:07.000000000 +0200 @@ -187,7 +187,9 @@ if len(self.prefs.Get('last_project') ) == 0 : self.prefs.Set('last_project', [ _("empty history") ] * gui.NB_HISTO ) - + + self.SetHisto() + self.processus = tabprocessus.CProcessus(self.i_proc.f_draw,i_db) self.load_project( self.prefs.Get('last_project')[-1],False) self.ChangeOnglet(TAB_PROCESSUS) @@ -220,6 +222,7 @@ self.SaveAuto() self.DebugTrace(False) self.bExitWin = True + self.SaveHisto() self.prefs.Save() self.log.LogTrace(False,self.prefs.Get('workdir')) self.i_gui.Destroy() @@ -256,14 +259,20 @@ self.RefreshListTree(False) # -------------------------------------------------------------------------- - def GetPrefs(self) : + def SaveHisto(self) : ll=len(self.prefs.Get('last_project')) - ll = min(ll,5) + ll = min(ll,gui.NB_HISTO) if ll > 0 : self.prefs.Set('last_project', self.prefs.Get('last_project')[-ll:] ) else: self.prefs.Set('last_project', "") return self.prefs + + def SetHisto(self): + nb=min(gui.NB_HISTO,len(self.prefs.Get('last_project'))) + for jj in range(1,nb+1): + if len(self.prefs.Get('last_project')[-jj]) != 0 : + self.i_gui.mLastProject[jj-1].SetItemLabel(self.prefs.Get('last_project')[-jj]) # -------------------------------------------------------------------------- def CB_SaveProperties(self, _event=None,clr=True): @@ -673,15 +682,10 @@ self.RefreshListTree(select_first) self.RefreshHistoProject( ) - def RefreshHistoProject(self ): - if self.CurrentProject != self.prefs.Get('last_project')[-1] : + def RefreshHistoProject(self ): + if len(self.CurrentProject) != 0 and self.CurrentProject != self.prefs.Get('last_project')[-1] : self.prefs.Get('last_project').append(self.CurrentProject) - - nb=min(gui.NB_HISTO,len(self.prefs.Get('last_project'))) - for ii in range(nb): - jj=ii+1 - if len(self.prefs.Get('last_project')[-jj]) != 0 : - self.i_gui.mLastProject[ii].SetItemLabel(self.prefs.Get('last_project')[-jj]) + self.SetHisto() def Unselect(self) : for xx in range(self.listProject.GetItemCount()): self.listProject.Select(xx,0) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sirilic-V1.15.7/sirilic/lib/changelog.py new/sirilic-V1.15.8/sirilic/lib/changelog.py --- old/sirilic-V1.15.7/sirilic/lib/changelog.py 2023-08-15 17:02:33.000000000 +0200 +++ new/sirilic-V1.15.8/sirilic/lib/changelog.py 2023-09-28 20:42:07.000000000 +0200 @@ -16,10 +16,16 @@ # For details, see GNU General Public License, version 3 or later. # "https://www.gnu.org/licenses/gpl.html"; # ============================================================================== -DATE_VERSION="August 2023" -NO_VERSION="1.15.7" +DATE_VERSION="September 2023" +NO_VERSION="1.15.8" CHANGELOG="""CHANGELOG: V""" + NO_VERSION + """ + + fix "platesolving" + + fix "weighing" only for light + + check if Siril path is a file and file access is "x" + + fix coords format (Simbad) (Sometimes, the format is not degre minute second) + + fix project history + V1.15.7 + add platesolve + add 'find text' and 'goto line' to the script editor + add request object coords in simbad diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sirilic-V1.15.7/sirilic/lib/tabproperties.py new/sirilic-V1.15.8/sirilic/lib/tabproperties.py --- old/sirilic-V1.15.7/sirilic/lib/tabproperties.py 2023-08-15 17:02:33.000000000 +0200 +++ new/sirilic-V1.15.8/sirilic/lib/tabproperties.py 2023-09-28 20:42:07.000000000 +0200 @@ -21,14 +21,37 @@ import wx import copy import requests +import traceback from sirilic.lib.constantes import IMAGE,OFFSET,DARK,FLAT,DFLAT -# ============================================================================== +# ============================================================================== +def conv_hhmmss(values_str) : + fields=values_str.split(" ") + if len(fields) == 1 : + degre=float(fields) + minute=(degre-int(degre))*60 + second=round((minute-int(minute))*60) + minute=int(minute) + degre=-int(degre) + elif len(fields) == 2 : + degre=int(fields[0]) + minute=float(fields[1]) + second=round((minute-int(minute))*60) + minute=int(minute) + elif len(fields) == 3 : + degre=int(fields[0]) + minute=int(fields[1]) + second=round(float(fields[2])) + else: + return "coords-error:" + values_str + + return "%+02d:%02d:%02d" %(degre,minute,second) + def GetCoordObj_simbad(objectname) : data='format object form1 "%%IDLIST(1):%%COO(A):%%COO(D)"\nquery id %s\nformat display' % (objectname, ) resultat = requests.get('https://simbad.cds.unistra.fr/simbad/sim-script?script='+data) - out=[] + out=[objectname,"00:00:00","00:00:00"] searcherror="::error:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::" searchdata ="::data::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::\n" if resultat.text.find(searcherror) == -1 : @@ -36,7 +59,13 @@ if pos >= 0 : for line in resultat.text[pos+len(searchdata):].split('\n') : if len(line) > 0 : - out=line.split(":") + try: + out=line.split(":") + out[1] = conv_hhmmss(out[1] ) + out[2] = conv_hhmmss(out[2] ) + except: + print(_("Error")+ " : "+ traceback.format_exc() ) + out=[objectname, _("Error")+ " "+ objectname,line] return out # ============================================================================== @@ -129,7 +158,7 @@ objectname=dlg.GetValue() res=GetCoordObj_simbad(objectname) if len(res) == 3 : - self.e_prop.t_coord.SetValue( res[1].replace(" ",":") + "," + res[2].replace(" ",":")) + self.e_prop.t_coord.SetValue( res[1] + "," + res[2]) else: self.e_prop.t_coord.SetValue(objectname + ":"+ _("not found")) dlg.Destroy() @@ -352,6 +381,8 @@ self.i_prop.cb_fix_fujix.Show(cond) self.i_prop.cb_RGBequa.Show(cond) self.i_prop.cb_optimdark.Show(cond) + self.i_prop.cb_Weighing.Show(cond) + self.i_prop.l_weighing.Show(cond) self.i_prop.cb_Cosmetic.Show(cond) self.i_prop.e_HotCosmetic.Show(cond) @@ -393,11 +424,11 @@ img_stack= img_prop["stack"] img_stack["type" ] = self.i_prop.cb_Stack.GetValue() - img_stack["weighing"] = self.i_prop.cb_Weighing.GetValue() img_stack["norm" ] = self.i_prop.cb_Norm.GetValue() if select == IMAGE : img_stack["RGBequa"] = self.i_prop.cb_RGBequa.GetValue() + img_stack["weighing"] = self.i_prop.cb_Weighing.GetValue() img_stack["DarkOpt" ] = self.i_prop.cb_optimdark.GetValue() img_rej = img_stack["reject"]
