Skip to content

Commit 433de3f

Browse files
author
Ed Brown
committed
manageElements done. Working on boxfill.
1 parent 3a14c8b commit 433de3f

File tree

2 files changed

+144
-40
lines changed

2 files changed

+144
-40
lines changed

Packages/vcs/vcs/boxfill.py

Lines changed: 113 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -690,50 +690,137 @@ def _setdatawc_y2(self, value):
690690
datawc_y2 = property(_getdatawc_y2, _setdatawc_y2)
691691

692692
def colors(self, color1=16, color2=239):
693+
"""
694+
Sets the color_1 and color_2 properties of the object.
695+
696+
:param color1: Sets the color_1 value on the object
697+
:type color1: int
698+
699+
:param color2: Sets the color_2 value on the object
700+
:type color2: int
701+
702+
"""
693703
self.color_1 = color1
694704
self.color_2 = color2
695-
colors.__doc__ = xmldocs.colorsdoc
705+
#colors.__doc__ = xmldocs.colorsdoc
696706

697707
def exts(self, ext1='n', ext2='y'):
708+
"""
709+
Sets the ext_1 and ext_2 values on the object.
710+
711+
:param ext1: Sets the ext_1 value on the object. 'y' sets it to True, 'n' sets it to False.
712+
:type ext1: str
713+
714+
:param ext2: Sets the ext_2 value on the object. 'y' sets it to True, 'n' sets it to False.
715+
:type ext2: str
716+
717+
"""
698718
self.ext_1 = ext1
699719
self.ext_2 = ext2
700-
exts.__doc__ = xmldocs.extsdoc
720+
#exts.__doc__ = xmldocs.extsdoc
701721
#
702722
# Doesn't make sense to inherit. This would mean more coding in C.
703723
# I put this code back.
704724
#
705725

706726
def xticlabels(self, xtl1='', xtl2=''):
727+
"""
728+
Sets xticlabels1 and xticlabels2 properties of the object.
729+
730+
:param xtl1: Sets the xticlabels1 property of the object.
731+
:type xtl1: str
732+
733+
:param xtl2: Sets the xticlabels2 property of the object.
734+
:type xtl2: str
735+
736+
"""
707737
self.xticlabels1 = xtl1
708738
self.xticlabels2 = xtl2
709-
xticlabels.__doc__ = xmldocs.xticlabelsdoc
739+
#xticlabels.__doc__ = xmldocs.xticlabelsdoc
710740

711741
def xmtics(self, xmt1='', xmt2=''):
742+
"""
743+
Sets xmtics1 and xmtics2 properties of the object.
744+
745+
:param xmt1: Sets the xmtics1 property of the object.
746+
:type xmt1: str
747+
748+
:param xmt2: Sets the xmtics1 property of the object.
749+
:type xmt2: str
750+
751+
"""
712752
self.xmtics1 = xmt1
713753
self.xmtics2 = xmt2
714-
xmtics.__doc__ = xmldocs.xmticsdoc
754+
#xmtics.__doc__ = xmldocs.xmticsdoc
715755

716756
def yticlabels(self, ytl1='', ytl2=''):
757+
"""
758+
Sets yticlabels1 and yticlabels2 properties of the object.
759+
760+
:param ytl1: Sets yticlabels1 property of the object.
761+
:type ytl1: str
762+
763+
:param ytl2: Sets yticlabels2 property of the object.
764+
:type ytl2: str
765+
766+
"""
717767
self.yticlabels1 = ytl1
718768
self.yticlabels2 = ytl2
719769
yticlabels.__doc__ = xmldocs.yticlabelsdoc
720770

721771
def ymtics(self, ymt1='', ymt2=''):
772+
"""
773+
Sets ymtics1 and ymtics2 properties of the object.
774+
775+
:param ymt1: Sets ymtics1 property of the object.
776+
:type ymt1: str
777+
778+
:param ymt2: Sets ymtics2 property of the object.
779+
:type ymt2: str
780+
"""
722781
self.ymtics1 = ymt1
723782
self.ymtics2 = ymt2
724-
ymtics.__doc__ = xmldocs.ymticsdoc
783+
#ymtics.__doc__ = xmldocs.ymticsdoc
725784

726785
def datawc(self, dsp1=1e20, dsp2=1e20, dsp3=1e20, dsp4=1e20):
786+
"""
787+
Sets datawc properties of the object.
788+
789+
:param dsp1: Sets the datawc_y1 property of the object.
790+
:type dsp1: ???
791+
792+
:param dsp2: Sets the datawc_y2 property of the object.
793+
:type dsp2: ???
794+
795+
:param dsp3: Sets the datawc_x1 property of the object.
796+
:type dsp3: ???
797+
798+
:param dsp4: Sets the datawc_x2 property of the object.
799+
:type dsp4: ???
800+
801+
"""
727802
self.datawc_y1 = dsp1
728803
self.datawc_y2 = dsp2
729804
self.datawc_x1 = dsp3
730805
self.datawc_x2 = dsp4
731-
datawc.__doc__ = xmldocs.datawcdoc
806+
#datawc.__doc__ = xmldocs.datawcdoc
732807

733808
def xyscale(self, xat='linear', yat='linear'):
809+
"""
810+
Sets xaxisconvert and yaxisconvert properties of the object.
811+
812+
:param xat:
813+
:type xat:
814+
815+
:param yat:
816+
:type yat:
817+
818+
:returns:
819+
:rtype:
820+
"""
734821
self.xaxisconvert = xat
735822
self.yaxisconvert = yat
736-
xyscale.__doc__ = xmldocs.xyscaledoc
823+
#xyscale.__doc__ = xmldocs.xyscaledoc
737824

738825
def getlevels(self, varmin, varmax):
739826
if self.boxfill_type == "custom":
@@ -858,27 +945,34 @@ def list(self):
858945
def script(self, script_filename, mode='a'):
859946
"""
860947
%s
861-
Function: script # Calls _vcs.scriptGfb
862-
863-
Description of Function:
864-
Saves out a boxfill graphics method in Python or VCS script form to a
865-
designated file.
866-
867-
Example of Use:
868-
script(scriptfile_name, mode)
869-
where: scriptfile_name is the output name of the script file.
870-
mode is either "w" for replace or "a" for append.
948+
Saves out a boxfill graphics method in Python or VCS script form to a
949+
designated file.
871950
872951
Note: If the the filename has a ".py" at the end, it will produce a
873952
Python script. If the filename has a ".scr" at the end, it will
874953
produce a VCS script. If neither extensions are give, then by
875954
default a Python script will be produced.
876955
956+
:Example:
957+
958+
::
959+
877960
a=vcs.init()
878961
box=a.createboxfill('temp')
879-
box.script('filename.py') # Append to a Python file "filename.py"
880-
box.script('filename.scr') # Append to a VCS file "filename.scr"
962+
# Append to a Python script named "filename.py"
963+
box.script('filename.py')
964+
# Append to a VCS script named "filename.scr"
965+
box.script('filename.scr')
881966
box.script('filename','w')
967+
968+
:param script_filename: Output name of the script file. If no extension is specified, a .json object is created.
969+
:type script_filename: str
970+
971+
:param mode: Either 'w' for replace, or 'a' for append. Defaults to 'a', if not specified.
972+
:type mode: str
973+
974+
:returns:
975+
:rtype:
882976
"""
883977
if (script_filename is None):
884978
raise ValueError(

Packages/vcs/vcs/manageElements.py

Lines changed: 31 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2666,27 +2666,37 @@ def removeP(obj):
26662666

26672667
def removeobject(obj):
26682668
"""
2669-
Function: remove
2670-
2671-
Description of Function:
2672-
The user has the ability to create primary and secondary class
2673-
objects. The function allows the user to remove these objects
2674-
from the appropriate class list.
2675-
2676-
Note, To remove the object completely from Python, remember to
2677-
use the "del" function.
2678-
2679-
Also note, The user is not allowed to remove a "default" class
2680-
object.
2681-
2682-
:Example:
2683-
a=vcs.init()
2684-
line=a.getline('red') # To Modify an existing line object
2685-
iso=x.createisoline('dean') # Create an instance of an isoline object
2686-
...
2687-
x.remove(line) # Removes line object from VCS list
2688-
x.remove(iso) # Remove isoline object from VCS list
2689-
"""
2669+
The user has the ability to create primary and secondary class
2670+
objects. The function allows the user to remove these objects
2671+
from the appropriate class list.
2672+
2673+
Note, To remove the object completely from Python, remember to
2674+
use the "del" function.
2675+
2676+
Also note, The user is not allowed to remove a "default" class
2677+
object.
2678+
2679+
:Example:
2680+
2681+
::
2682+
2683+
a=vcs.init()
2684+
# To Modify an existing line object
2685+
line=a.getline('red')
2686+
# Create an instance of an isoline object
2687+
iso=a.createisoline('dean')
2688+
#...
2689+
# Removes line object from VCS list
2690+
a.remove(line)
2691+
# Remove isoline object from VCS list
2692+
a.remove(iso)
2693+
2694+
:param obj: Any VCS primary or secondary object
2695+
:type obj: VCS object
2696+
2697+
:returns: String indicating the specified object was removed
2698+
:rtype: str
2699+
"""
26902700
if vcs.istemplate(obj):
26912701
msg = vcs.removeP(obj.name)
26922702
elif vcs.isgraphicsmethod(obj):

0 commit comments

Comments
 (0)