From: Peter S. <zu...@us...> - 2008-09-29 09:47:24
|
Update of /cvsroot/apophysis/2.10/Source In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv31927 Modified Files: FormRender.dfm FormRender.pas RenderMT.pas RenderThread.pas ScriptForm.pas Log Message: renderthread priority control disabled Index: RenderMT.pas =================================================================== RCS file: /cvsroot/apophysis/2.10/Source/RenderMT.pas,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** RenderMT.pas 8 Sep 2008 11:25:20 -0000 1.3 --- RenderMT.pas 29 Sep 2008 09:47:10 -0000 1.4 *************** *** 173,178 **** inherited; ! for i := 0 to High(WorkingThreads) do ! WorkingThreads[i].Priority := p; end; --- 173,178 ---- inherited; ! //for i := 0 to High(WorkingThreads) do ! // WorkingThreads[i].Priority := p; end; *************** *** 182,186 **** Result := TBucketFillerThread.Create(fcp); assert(Result<>nil); ! Result.Priority := FThreadPriority; if FCP.FAngle = 0 then --- 182,186 ---- Result := TBucketFillerThread.Create(fcp); assert(Result<>nil); ! //Result.Priority := FThreadPriority; if FCP.FAngle = 0 then Index: FormRender.dfm =================================================================== RCS file: /cvsroot/apophysis/2.10/Source/FormRender.dfm,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** FormRender.dfm 8 Sep 2008 11:25:19 -0000 1.19 --- FormRender.dfm 29 Sep 2008 09:47:10 -0000 1.20 *************** *** 569,573 **** --- 569,575 ---- Height = 17 Caption = 'Low priority' + Enabled = False TabOrder = 10 + Visible = False OnClick = chkThreadPriorityClick end Index: RenderThread.pas =================================================================== RCS file: /cvsroot/apophysis/2.10/Source/RenderThread.pas,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** RenderThread.pas 8 Sep 2008 11:25:20 -0000 1.13 --- RenderThread.pas 29 Sep 2008 09:47:11 -0000 1.14 *************** *** 205,209 **** FRenderer.SetCP(FCP); ! FRenderer.SetThreadPriority(self.Priority); // FRenderer.compatibility := compatibility; FRenderer.MinDensity := FMinDensity; --- 205,209 ---- FRenderer.SetCP(FCP); ! // FRenderer.SetThreadPriority(self.Priority); // FRenderer.compatibility := compatibility; FRenderer.MinDensity := FMinDensity; Index: ScriptForm.pas =================================================================== RCS file: /cvsroot/apophysis/2.10/Source/ScriptForm.pas,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** ScriptForm.pas 25 Sep 2008 03:05:40 -0000 1.40 --- ScriptForm.pas 29 Sep 2008 09:47:11 -0000 1.41 *************** *** 1974,1978 **** i, j: integer; begin - if NumTransforms > 0 then try // I'm not sure, but *maybe* this will help scripts not to screw up finalXform --- 1974,1977 ---- *************** *** 1985,2012 **** exit; end; ! if ActiveTransform = (NumTransforms - 1) then ! { Last triangle...just reduce number} ! begin Dec(NumTransforms); ! ActiveTransform := NumTransforms - 1; ! // scriptEditor.cp.xform[NumTransforms].density := 0; ! scriptEditor.cp.xform[NumTransforms].Assign(scriptEditor.cp.xform[NumTransforms+1]); ! end ! else ! begin ! for i := ActiveTransform to NumTransforms - 2 do ! scriptEditor.cp.xform[i].Assign(scriptEditor.cp.xform[i + 1]); ! { begin ! // copy higher transforms down ! ScriptEditor.cp.xform[i].density := ScriptEditor.cp.xform[i + 1].density; ! ScriptEditor.cp.xform[i].color := ScriptEditor.cp.xform[i + 1].color; ! ScriptEditor.cp.xform[i].symmetry := ScriptEditor.cp.xform[i + 1].symmetry; ! for j := 0 to NRVAR - 1 do ! ScriptEditor.cp.xform[i].vars[j] := ScriptEditor.cp.xform[i + 1].vars[j]; ! end;} ! NumTransforms := NumTransforms - 1; ! // ScriptEditor.cp.xform[Numtransforms].density := 0; ! scriptEditor.cp.xform[NumTransforms].Assign(scriptEditor.cp.xform[NumTransforms+1]); ! end except begin --- 1984,2009 ---- exit; end; ! if NumTransforms <= 1 then exit; ! ! // delete xform from all probability tables ! for i := 0 to NumTransforms-1 do ! with scriptEditor.cp.xform[i] do begin ! for j := ActiveTransform to NumTransforms-1 do ! modWeights[j] := modWeights[j+1]; ! modWeights[NumTransforms-1] := 1; ! end; ! // ! ! with scriptEditor.cp do begin ! if ActiveTransform = (NumTransforms - 1) then ! Dec(ActiveTransform) ! else begin ! for i := ActiveTransform to NumTransforms - 2 do ! xform[i].Assign(xform[i + 1]); ! end; Dec(NumTransforms); ! xform[NumTransforms].Assign(xform[NumTransforms+1]); ! xform[NumTransforms+1].Clear; ! end; except begin *************** *** 2025,2045 **** try if NumTransforms < NXFORMS then begin old := ActiveTransform; ActiveTransform := NumTransforms; inc(NumTransforms); ! ScriptEditor.cp.xform[NumTransforms].Assign(ScriptEditor.cp.xform[ActiveTransform]); // final xform ! ScriptEditor.cp.xform[ActiveTransform].Assign(ScriptEditor.cp.xform[old]); ! { ! ScriptEditor.cp.xform[ActiveTransform].c[0, 1] := ScriptEditor.cp.xform[old].c[0, 1]; ! ScriptEditor.cp.xform[ActiveTransform].c[1, 0] := ScriptEditor.cp.xform[old].c[1, 0]; ! ScriptEditor.cp.xform[ActiveTransform].c[1, 1] := ScriptEditor.cp.xform[old].c[1, 1]; ! ScriptEditor.cp.xform[ActiveTransform].c[2, 0] := ScriptEditor.cp.xform[old].c[2, 0]; ! ScriptEditor.cp.xform[ActiveTransform].c[2, 1] := ScriptEditor.cp.xform[old].c[2, 1]; ! ScriptEditor.cp.xform[ActiveTransform].color := ScriptEditor.cp.xform[old].color; ! ScriptEditor.cp.xform[ActiveTransform].density := ScriptEditor.cp.xform[old].density; ! for i := 0 to NRVAR - 1 do ! ScriptEditor.cp.xform[ActiveTransform].vars[i] := ScriptEditor.cp.xform[old].vars[i] ! } end else raise EFormatInvalid.Create('Too many transforms.'); --- 2022,2036 ---- try if NumTransforms < NXFORMS then + with ScriptEditor.cp do begin old := ActiveTransform; ActiveTransform := NumTransforms; inc(NumTransforms); ! xform[NumTransforms].Assign(xform[ActiveTransform]); // final xform ! xform[ActiveTransform].Assign(xform[old]); ! ! for i := 0 to NumTransforms-1 do ! xform[i].modWeights[ActiveTransform] := xform[i].modWeights[old]; ! xform[ActiveTransform].modWeights[ActiveTransform] := xform[old].modWeights[old]; end else raise EFormatInvalid.Create('Too many transforms.'); Index: FormRender.pas =================================================================== RCS file: /cvsroot/apophysis/2.10/Source/FormRender.pas,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** FormRender.pas 11 Sep 2008 06:37:24 -0000 1.30 --- FormRender.pas 29 Sep 2008 09:47:10 -0000 1.31 *************** *** 512,521 **** Renderer := TRenderThread.Create; assert(Renderer <> nil); ! if chkThreadPriority.Checked then Renderer.SetPriority(tpLower) else Renderer.SetPriority(tpNormal); ! Renderer.BitsPerSample := BitsPerSample; if chkLimitMem.checked then --- 512,521 ---- Renderer := TRenderThread.Create; assert(Renderer <> nil); ! { if chkThreadPriority.Checked then Renderer.SetPriority(tpLower) else Renderer.SetPriority(tpNormal); ! } Renderer.BitsPerSample := BitsPerSample; if chkLimitMem.checked then *************** *** 524,528 **** Renderer.TargetHandle := self.Handle; Renderer.SetCP(cp); ! //Renderer.Priority := tpLower; Renderer.NrThreads := NrTreads; Renderer.Output := Output.Lines; --- 524,528 ---- Renderer.TargetHandle := self.Handle; Renderer.SetCP(cp); ! Renderer.Priority := tpLower; Renderer.NrThreads := NrTreads; Renderer.Output := Output.Lines; *************** *** 585,594 **** Renderer := TRenderThread.Create; assert(Renderer <> nil); ! if chkThreadPriority.Checked then Renderer.SetPriority(tpLower) else Renderer.SetPriority(tpNormal); ! Renderer.BitsPerSample := BitsPerSample; if chkLimitMem.checked then --- 585,594 ---- Renderer := TRenderThread.Create; assert(Renderer <> nil); ! { if chkThreadPriority.Checked then Renderer.SetPriority(tpLower) else Renderer.SetPriority(tpNormal); ! } Renderer.BitsPerSample := BitsPerSample; if chkLimitMem.checked then *************** *** 599,603 **** // Renderer.Compatibility := compatibility; Renderer.SetCP(cp); ! //Renderer.Priority := tpLower; Renderer.NrThreads := NrTreads; --- 599,603 ---- // Renderer.Compatibility := compatibility; Renderer.SetCP(cp); ! Renderer.Priority := tpLower; Renderer.NrThreads := NrTreads; *************** *** 1057,1060 **** --- 1057,1061 ---- LowerRenderPriority := chkThreadPriority.Checked; + { if Assigned(Renderer) then begin if LowerRenderPriority then *************** *** 1063,1066 **** --- 1064,1068 ---- Renderer.SetPriority(tpNormal); end; + } end; |