archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

use pure py classes instead of a mix of rna stuff for ui. fix a couple of bugs

Browse Source
This commit is contained in:
Martin Poirier
2009-09-08 01:18:06 +00:00
parent 8b6b31b41f
commit 00838f05d2
5 changed files with 72 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
release/io/netrender/operators.py
View File

@@ -61,18 +61,17 @@ class RENDER_OT_netclientstatus(bpy.types.Operator):
while(len(netsettings.jobs) > 0):
netsettings.jobs.remove(0)
bpy.data.netrender_jobs = []
for j in jobs:
bpy.data.netrender_jobs.append(j)
netsettings.jobs.add()
job = netsettings.jobs[-1]
job_results = j.framesStatus()
j.results = j.framesStatus() # cache frame status
job.id = j.id
job.name = j.name
job.length = len(j)
job.done = job_results[DONE]
job.error = job_results[ERROR]
return ('FINISHED',)
@@ -97,15 +96,13 @@ class RENDER_OT_netclientblacklistslave(bpy.types.Operator):
if netsettings.active_slave_index >= 0:
slave = netrender.slaves[netsettings.active_slave_index]
# deal with data
slave = bpy.data.netrender_slaves.pop(netsettings.active_slave_index)
bpy.data.netrender_blacklist.append(slave)
# deal with rna
netsettings.slaves_blacklist.add()
netsettings.slaves_blacklist[-1].id = slave.id
netsettings.slaves_blacklist[-1].name = slave.name
netsettings.slaves_blacklist[-1].address = slave.address
netsettings.slaves_blacklist[-1].last_seen = slave.last_seen
netsettings.slaves_blacklist[-1].stats = slave.stats
netsettings.slaves.remove(netsettings.active_slave_index)
netsettings.active_slave_index = -1
@@ -133,15 +130,13 @@ class RENDER_OT_netclientwhitelistslave(bpy.types.Operator):
if netsettings.active_blacklisted_slave_index >= 0:
slave = netsettings.slaves_blacklist[netsettings.active_blacklisted_slave_index]
# deal with data
slave = bpy.data.netrender_blacklist.pop(netsettings.active_blacklisted_slave_index)
bpy.data.netrender_slaves.append(slave)
# deal with rna
netsettings.slaves.add()
netsettings.slaves[-1].id = slave.id
netsettings.slaves[-1].name = slave.name
netsettings.slaves[-1].address = slave.address
netsettings.slaves[-1].last_seen = slave.last_seen
netsettings.slaves[-1].stats = slave.stats
netsettings.slaves_blacklist.remove(netsettings.active_blacklisted_slave_index)
netsettings.active_blacklisted_slave_index = -1
@@ -180,19 +175,21 @@ class RENDER_OT_netclientslaves(bpy.types.Operator):
while(len(netsettings.slaves) > 0):
netsettings.slaves.remove(0)
bpy.data.netrender_slaves = []
for s in slaves:
for slave in netsettings.slaves_blacklist:
for i in range(len(bpy.data.netrender_blacklist)):
slave = bpy.data.netrender_blacklist[i]
if slave.id == s.id:
bpy.data.netrender_blacklist[i] = s
netsettings.slaves_blacklist[i].name = s.name
break
else:
bpy.data.netrender_slaves.append(s)
netsettings.slaves.add()
slave = netsettings.slaves[-1]
slave.id = s.id
slave.name = s.name
slave.stats = s.stats
slave.address = s.address[0]
slave.last_seen = time.ctime(s.last_seen)
netsettings.slaves.add()
slave = netsettings.slaves[-1]
slave.name = s.name
return ('FINISHED',)
@@ -218,7 +215,7 @@ class RENDER_OT_netclientcancel(bpy.types.Operator):
conn = clientConnection(context.scene)
if conn:
job = netsettings.jobs[netsettings.active_job_index]
job = bpy.data.netrender_jobs[netsettings.active_job_index]
conn.request("POST", "cancel", headers={"job-id":job.id})