[rkward-cvs] rkward/rkward/plugins/plots histogram.xml,1.4,1.5 plot_options.xml,1.4,1.5

[Thomas Friedrichsmeier]

Update of /cvsroot/rkward/rkward/rkward/plugins/plots
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4313

Modified Files:
	histogram.xml plot_options.xml 
Log Message:
Provide only meaningful options when embedding Plot Options plugin inside Histogram plugin

Index: histogram.xml
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/plugins/plots/histogram.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** histogram.xml	21 Mar 2006 15:41:24 -0000	1.4
--- histogram.xml	5 Apr 2006 14:32:06 -0000	1.5
***************
*** 1,56 ****
  <!DOCTYPE rkplugin>
  <document>
!   <code file="histogram.php" />
!   <logic>
!     <connect client="plotoptions.xvar" governor="x.available"/>
!   </logic>
!   <dialog label="Histogram" >
!     <tabbook>
!       <tab label="Variable(s)" >
!         <row>
!           <varselector id="vars" />
!           <varslot multi="false" type="numeric" id="x" source="vars" label="variable(s):" required="true" />
!         </row>
!       </tab>
!       <tab label="Options" >
!         <column>
!           <radio id="scale" label="Scale" >
!             <option value="FALSE" label="No Frequency" />
!             <option value="TRUE" label="Frequency" />
!           </radio>
!           <column>
!             <checkbox value_unchecked="0" checked="false" value="1" id="rug" label="Rug" />
!             <checkbox value_unchecked="0" checked="false" value="1" id="jitter" label="Jitter" />
!           </column>
!         </column>
! 	</tab>
!       <tab label="Plot options">
! 		<embed id="plotoptions" component="rkward::plot_options" />
! 		<embed id="plotoptionsb" component="rkward::plot_options" as_button="true" label="Just a test" />
!       </tab>
!     </tabbook>
!   </dialog>
!   <wizard>
! 	<page><text>This wizard is for testing purposes only. Remove it!</text></page>
! 	<page label="Variable(s)" >
  		<row>
! 			<varselector id="vars" />
! 			<varslot multi="false" type="numeric" id="x" source="vars" label="variable(s):" required="true" />
  		</row>
! 	</page>
! 	<embed id="plotoptions" component="rkward::plot_options" />
! 	<page label="Options" >
! 		<column>
! 			<radio id="scale" label="Scale" >
! 				<option value="FALSE" label="No Frequency" />
! 				<option value="TRUE" label="Frequency" />
! 			</radio>
! 			<column>
! 				<checkbox value_unchecked="0" checked="false" value="1" id="rug" label="Rug" />
! 				<checkbox value_unchecked="0" checked="false" value="1" id="jitter" label="Jitter" />
! 			</column>
! 		</column>
! 	</page>
! 	<page><embed id="plotoptionsb" component="rkward::plot_options" as_button="true" label="Just a test" /></page>
!   </wizard>
  </document>
--- 1,29 ----
  <!DOCTYPE rkplugin>
  <document>
! <code file="histogram.php" />
! <logic>
! 	<connect client="plotoptions.xvar" governor="x.available"/>
! 	<set id="plotoptions.allow_log" to="false"/>
! 	<set id="plotoptions.allow_type" to="false"/>
! </logic>
! <dialog label="Histogram" >
! 	<tabbook>
! 	<tab label="Variable(s)" >
  		<row>
! 		<varselector id="vars" />
! 		<varslot multi="false" type="numeric" id="x" source="vars" label="variable(s):" required="true" />
  		</row>
! 	</tab>
! 	<tab label="Options" >
! 		<radio id="scale" label="Scale" >
! 		<option value="FALSE" label="No Frequency" />
! 		<option value="TRUE" label="Frequency" />
! 		</radio>
! 		<checkbox value_unchecked="0" checked="false" value="1" id="rug" label="Rug" />
! 		<checkbox value_unchecked="0" checked="false" value="1" id="jitter" label="Jitter" />
! 		<embed id="plotoptions" component="rkward::plot_options" as_button="true" label="Plot Options" />
! 		<stretch/>
! 	</tab>
! 	</tabbook>
! </dialog>
  </document>

Index: plot_options.xml
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/plugins/plots/plot_options.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** plot_options.xml	5 Apr 2006 10:10:04 -0000	1.4
--- plot_options.xml	5 Apr 2006 14:32:06 -0000	1.5
***************
*** 9,14 ****
--- 9,20 ----
  		<connect client="ylabisexp.enabled" governor="ylabfilled" />
  
+ 		<connect client="xlog.visible" governor="allow_log"/>
+ 		<connect client="ylog.visible" governor="allow_log"/>
+ 		<connect client="pointtypepage.visible" governor="allow_type"/>
+ 
  		<external id="xvar" />
  		<external id="yvar" />
+ 		<external id="allow_log" default="true" />
+ 		<external id="allow_type" default="true" />
  	</logic>
  	<dialog label="Default plot options" >
***************
*** 49,53 ****
  				</column>
  			</tab>
! 			<tab label="Points / Lines">
  				<radio id="pointtype" label="Type of points/lines" >
  					<option value="" label="default" checked="true" />
--- 55,59 ----
  				</column>
  			</tab>
! 			<tab id="pointtypepage" label="Points / Lines">
  				<radio id="pointtype" label="Type of points/lines" >
  					<option value="" label="default" checked="true" />