Skip to content

C
cpython
Commit 96d47b00 authored by Guido van Rossum's avatar Guido van Rossum
Browse files
Options

Cosmetic changes to Vedit and -Form.

parent 4aa97788
Show whitespace changes
Inline Side-by-side
Showing with 49 additions and 47 deletions
Demo/sgi/video/Vedit.py
View file @ 96d47b00
...@@ -3,13 +3,12 @@ ...@@ -3,13 +3,12 @@
# Edit CMIF movies interactively -- copy one or more files to an output file # Edit CMIF movies interactively -- copy one or more files to an output file
# Possibilities: # XXX To do:
# #
# - convert between formats (grey, rgb, rgb8, ...) # - convert between formats (grey, rgb, rgb8, ...)
# - change size # - change size
# - cut out a given area of the image # - cut out a given area of the image
# - change time base (a la Vtime) # - change time base (a la Vtime)
# - skip stretches of frames
import sys import sys
...@@ -23,7 +22,7 @@ import string ...@@ -23,7 +22,7 @@ import string
def main(): def main():
qsize = 20 qsize = 40
opts, args = getopt.getopt(sys.argv[1:], 'q:') opts, args = getopt.getopt(sys.argv[1:], 'q:')
for o, a in opts: for o, a in opts:
if o == '-q': if o == '-q':
...@@ -111,7 +110,10 @@ class Editor: ...@@ -111,7 +110,10 @@ class Editor:
def cb_copy(self, args): def cb_copy(self, args):
if not self.iocheck(): return if not self.iocheck(): return
data = self.vin.get() data = self.vin.get()
if data: if not data:
self.err('End of input file')
self.ishow()
return
if self.vout.getinfo() <> self.vin.getinfo(): if self.vout.getinfo() <> self.vin.getinfo():
print 'Copying info...' print 'Copying info...'
self.vout.setinfo(self.vin.getinfo()) self.vout.setinfo(self.vin.getinfo())
......
Demo/sgi/video/VeditForm.fd
View file @ 96d47b00
...@@ -8,13 +8,13 @@ Number of forms: 1 ...@@ -8,13 +8,13 @@ Number of forms: 1
=============== FORM =============== =============== FORM ===============
Name: form Name: form
Width: 480.000000 Width: 480.000000
Height: 350.000000 Height: 290.000000
Number of Objects: 23 Number of Objects: 23
-------------------- --------------------
class: 1 class: 1
type: 1 type: 1
box: 0.000000 0.000000 480.000000 350.000000 box: 0.000000 0.000000 480.000000 290.000000
boxtype: 1 boxtype: 1
colors: 47 47 colors: 47 47
alignment: 4 alignment: 4
...@@ -29,7 +29,7 @@ argument: ...@@ -29,7 +29,7 @@ argument:
-------------------- --------------------
class: 11 class: 11
type: 4 type: 4
box: 170.000000 110.000000 140.000000 40.000000 box: 180.000000 70.000000 120.000000 40.000000
boxtype: 1 boxtype: 1
colors: 47 47 colors: 47 47
alignment: 4 alignment: 4
...@@ -44,14 +44,14 @@ argument: 0 ...@@ -44,14 +44,14 @@ argument: 0
-------------------- --------------------
class: 11 class: 11
type: 4 type: 4
box: 10.000000 110.000000 140.000000 40.000000 box: 90.000000 50.000000 60.000000 60.000000
boxtype: 1 boxtype: 1
colors: 47 47 colors: 47 47
alignment: 4 alignment: 4
style: 0 style: 0
size: 11.000000 size: 11.000000
lcol: 0 lcol: 0
label: Forward label: @>
name: name:
callback: cb_in_skip callback: cb_in_skip
argument: 0 argument: 0
...@@ -59,7 +59,7 @@ argument: 0 ...@@ -59,7 +59,7 @@ argument: 0
-------------------- --------------------
class: 11 class: 11
type: 0 type: 0
box: 10.000000 10.000000 140.000000 40.000000 box: 10.000000 10.000000 140.000000 30.000000
boxtype: 1 boxtype: 1
colors: 47 47 colors: 47 47
alignment: 4 alignment: 4
...@@ -74,14 +74,14 @@ argument: 0 ...@@ -74,14 +74,14 @@ argument: 0
-------------------- --------------------
class: 11 class: 11
type: 0 type: 0
box: 330.000000 10.000000 140.000000 40.000000 box: 330.000000 10.000000 140.000000 30.000000
boxtype: 1 boxtype: 1
colors: 47 47 colors: 47 47
alignment: 4 alignment: 4
style: 0 style: 0
size: 11.000000 size: 11.000000
lcol: 0 lcol: 0
label: Reset output label: Clear output
name: name:
callback: cb_out_rewind callback: cb_out_rewind
argument: 0 argument: 0
...@@ -89,7 +89,7 @@ argument: 0 ...@@ -89,7 +89,7 @@ argument: 0
-------------------- --------------------
class: 11 class: 11
type: 0 type: 0
box: 10.000000 260.000000 80.000000 40.000000 box: 10.000000 210.000000 80.000000 30.000000
boxtype: 1 boxtype: 1
colors: 47 47 colors: 47 47
alignment: 4 alignment: 4
...@@ -104,7 +104,7 @@ argument: 0 ...@@ -104,7 +104,7 @@ argument: 0
-------------------- --------------------
class: 11 class: 11
type: 0 type: 0
box: 330.000000 260.000000 80.000000 40.000000 box: 330.000000 210.000000 80.000000 30.000000
boxtype: 1 boxtype: 1
colors: 47 47 colors: 47 47
alignment: 4 alignment: 4
...@@ -119,10 +119,10 @@ argument: 0 ...@@ -119,10 +119,10 @@ argument: 0
-------------------- --------------------
class: 2 class: 2
type: 0 type: 0
box: 10.000000 210.000000 140.000000 40.000000 box: 10.000000 170.000000 140.000000 30.000000
boxtype: 6 boxtype: 6
colors: 47 47 colors: 47 47
alignment: 2 alignment: 4
style: 0 style: 0
size: 11.000000 size: 11.000000
lcol: 0 lcol: 0
...@@ -134,10 +134,10 @@ argument: ...@@ -134,10 +134,10 @@ argument:
-------------------- --------------------
class: 2 class: 2
type: 0 type: 0
box: 330.000000 210.000000 140.000000 40.000000 box: 330.000000 170.000000 140.000000 30.000000
boxtype: 6 boxtype: 6
colors: 47 47 colors: 47 47
alignment: 2 alignment: 4
style: 0 style: 0
size: 11.000000 size: 11.000000
lcol: 0 lcol: 0
...@@ -149,10 +149,10 @@ argument: ...@@ -149,10 +149,10 @@ argument:
-------------------- --------------------
class: 2 class: 2
type: 0 type: 0
box: 10.000000 160.000000 30.000000 30.000000 box: 10.000000 130.000000 30.000000 30.000000
boxtype: 6 boxtype: 6
colors: 47 47 colors: 47 47
alignment: 2 alignment: 4
style: 0 style: 0
size: 8.000000 size: 8.000000
lcol: 0 lcol: 0
...@@ -164,7 +164,7 @@ argument: ...@@ -164,7 +164,7 @@ argument:
-------------------- --------------------
class: 11 class: 11
type: 0 type: 0
box: 170.000000 260.000000 140.000000 40.000000 box: 170.000000 210.000000 140.000000 30.000000
boxtype: 1 boxtype: 1
colors: 47 47 colors: 47 47
alignment: 4 alignment: 4
...@@ -179,14 +179,14 @@ argument: 0 ...@@ -179,14 +179,14 @@ argument: 0
-------------------- --------------------
class: 11 class: 11
type: 4 type: 4
box: 330.000000 60.000000 140.000000 40.000000 box: 330.000000 50.000000 60.000000 60.000000
boxtype: 1 boxtype: 1
colors: 47 47 colors: 47 47
alignment: 4 alignment: 4
style: 0 style: 0
size: 11.000000 size: 11.000000
lcol: 0 lcol: 0
label: Back label: @<
name: name:
callback: cb_out_back callback: cb_out_back
argument: 0 argument: 0
...@@ -194,14 +194,14 @@ argument: 0 ...@@ -194,14 +194,14 @@ argument: 0
-------------------- --------------------
class: 11 class: 11
type: 4 type: 4
box: 10.000000 60.000000 140.000000 40.000000 box: 10.000000 50.000000 60.000000 60.000000
boxtype: 1 boxtype: 1
colors: 47 47 colors: 47 47
alignment: 4 alignment: 4
style: 0 style: 0
size: 11.000000 size: 11.000000
lcol: 0 lcol: 0
label: Back label: @<
name: name:
callback: cb_in_back callback: cb_in_back
argument: 0 argument: 0
...@@ -209,14 +209,14 @@ argument: 0 ...@@ -209,14 +209,14 @@ argument: 0
-------------------- --------------------
class: 11 class: 11
type: 4 type: 4
box: 330.000000 110.000000 140.000000 40.000000 box: 410.000000 50.000000 60.000000 60.000000
boxtype: 1 boxtype: 1
colors: 47 47 colors: 47 47
alignment: 4 alignment: 4
style: 0 style: 0
size: 11.000000 size: 11.000000
lcol: 0 lcol: 0
label: Forward label: @>
name: name:
callback: cb_out_skip callback: cb_out_skip
argument: 0 argument: 0
...@@ -224,7 +224,7 @@ argument: 0 ...@@ -224,7 +224,7 @@ argument: 0
-------------------- --------------------
class: 11 class: 11
type: 4 type: 4
box: 170.000000 60.000000 140.000000 40.000000 box: 180.000000 20.000000 120.000000 40.000000
boxtype: 1 boxtype: 1
colors: 47 47 colors: 47 47
alignment: 4 alignment: 4
...@@ -239,7 +239,7 @@ argument: 0 ...@@ -239,7 +239,7 @@ argument: 0
-------------------- --------------------
class: 11 class: 11
type: 0 type: 0
box: 100.000000 260.000000 50.000000 40.000000 box: 100.000000 210.000000 50.000000 30.000000
boxtype: 1 boxtype: 1
colors: 47 47 colors: 47 47
alignment: 4 alignment: 4
...@@ -254,7 +254,7 @@ argument: 0 ...@@ -254,7 +254,7 @@ argument: 0
-------------------- --------------------
class: 11 class: 11
type: 0 type: 0
box: 420.000000 260.000000 50.000000 40.000000 box: 420.000000 210.000000 50.000000 30.000000
boxtype: 1 boxtype: 1
colors: 47 47 colors: 47 47
alignment: 4 alignment: 4
...@@ -269,10 +269,10 @@ argument: 0 ...@@ -269,10 +269,10 @@ argument: 0
-------------------- --------------------
class: 2 class: 2
type: 0 type: 0
box: 10.000000 310.000000 460.000000 30.000000 box: 10.000000 250.000000 460.000000 30.000000
boxtype: 6 boxtype: 6
colors: 47 47 colors: 47 47
alignment: 2 alignment: 4
style: 0 style: 0
size: 11.000000 size: 11.000000
lcol: 0 lcol: 0
...@@ -284,10 +284,10 @@ argument: ...@@ -284,10 +284,10 @@ argument:
-------------------- --------------------
class: 2 class: 2
type: 0 type: 0
box: 50.000000 160.000000 60.000004 40.000000 box: 50.000000 130.000000 60.000004 30.000000
boxtype: 6 boxtype: 6
colors: 47 47 colors: 47 47
alignment: 2 alignment: 4
style: 0 style: 0
size: 11.000000 size: 11.000000
lcol: 0 lcol: 0
...@@ -299,10 +299,10 @@ argument: ...@@ -299,10 +299,10 @@ argument:
-------------------- --------------------
class: 2 class: 2
type: 0 type: 0
box: 120.000000 160.000000 30.000000 30.000000 box: 120.000000 130.000000 30.000000 30.000000
boxtype: 6 boxtype: 6
colors: 47 47 colors: 47 47
alignment: 2 alignment: 4
style: 0 style: 0
size: 8.000000 size: 8.000000
lcol: 0 lcol: 0
...@@ -314,10 +314,10 @@ argument: ...@@ -314,10 +314,10 @@ argument:
-------------------- --------------------
class: 2 class: 2
type: 0 type: 0
box: 330.000000 160.000000 30.000000 30.000000 box: 330.000000 130.000000 30.000000 30.000000
boxtype: 6 boxtype: 6
colors: 47 47 colors: 47 47
alignment: 2 alignment: 4
style: 0 style: 0
size: 8.000000 size: 8.000000
lcol: 0 lcol: 0
...@@ -329,10 +329,10 @@ argument: ...@@ -329,10 +329,10 @@ argument:
-------------------- --------------------
class: 2 class: 2
type: 0 type: 0
box: 370.000000 160.000000 60.000004 40.000000 box: 370.000000 130.000000 60.000004 30.000000
boxtype: 6 boxtype: 6
colors: 47 47 colors: 47 47
alignment: 2 alignment: 4
style: 0 style: 0
size: 11.000000 size: 11.000000
lcol: 0 lcol: 0
...@@ -344,10 +344,10 @@ argument: ...@@ -344,10 +344,10 @@ argument:
-------------------- --------------------
class: 2 class: 2
type: 0 type: 0
box: 440.000000 160.000000 30.000000 30.000000 box: 440.000000 130.000000 30.000000 30.000000
boxtype: 6 boxtype: 6
colors: 47 47 colors: 47 47
alignment: 2 alignment: 4
style: 0 style: 0
size: 8.000000 size: 8.000000
lcol: 0 lcol: 0
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7