[jboss-cvs] jboss-seam/examples/itext/view ...

Norman Richards norman.richards at jboss.com
Fri Jul 6 19:38:45 EDT 2007


  User: nrichards
  Date: 07/07/06 19:38:45

  Modified:    examples/itext/view  chartimage.xhtml
  Log:
  configure dataset
  
  Revision  Changes    Path
  1.9       +136 -114  jboss-seam/examples/itext/view/chartimage.xhtml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: chartimage.xhtml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/itext/view/chartimage.xhtml,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -b -r1.8 -r1.9
  --- chartimage.xhtml	4 Jul 2007 19:07:06 -0000	1.8
  +++ chartimage.xhtml	6 Jul 2007 23:38:45 -0000	1.9
  @@ -17,6 +17,9 @@
       <p:stroke id="dot1"  width="2" cap="round" join="bevel" dash="3 3" />
       <p:stroke id="dot2"  width="2" cap="round" join="bevel" dash="2 4" />
   
  +    <rich:panel>
  +        <f:facet name="header">HTML Chart Demo</f:facet>
  +
       <a:outputPanel id="chart">
           <p:barchart title="#{chart.title}"  orientation="#{chart.orientation}"
                       is3D="#{chart.is3d}"   legend="#{chart.legend}" 
  @@ -55,17 +58,15 @@
                             seriesOutlinePaint="#{dataset.seriesOutlinePaint}" 
                             seriesOutlineStroke="#{dataset.seriesOutlineStroke}">
   
  -                    <ui:repeat value="#{dataset.keys}" var="d">
  -                        <p:data columnKey="#{d}" value="#{dataset.values[d]}" />
  +                        <ui:repeat value="#{chart.categories}" var="category">
  +                            <p:data columnKey="#{category}" value="#{dataset.values[category]}" />
                       </ui:repeat>
                   </p:series>
               </ui:repeat>
           </p:barchart>
       </a:outputPanel>
  -
  +    </rich:panel>
       <h:form>
  -        <h3>Chart</h3>
  -
           <rich:tabPanel switchType="ajax">
               <rich:tab label="Title">
                   Label:
  @@ -211,17 +212,35 @@
                   </h:selectOneMenu>
               </rich:tab>
               <rich:tab label="Legend">
  -                Legend: 
  +                Show Legend: 
  +                <rich:dataTable value="#{chart.data}" var="dataset">
  +                    <f:facet name="header">
  +                        <rich:columnGroup>
  +                            <rich:column>Default</rich:column>
  +                            <rich:column>
                   <h:selectBooleanCheckbox value="#{chart.legend}">
                       <a:support  event="onchange" reRender="chart" />
                   </h:selectBooleanCheckbox>
  +                            </rich:column>
  +                        </rich:columnGroup>
  +                    </f:facet>
  +                    <rich:column>#{dataset.id}</rich:column>
  +                    <rich:column>
  +                        <h:selectBooleanCheckbox value="#{dataset.visibleInLegend}">
  +                            <a:support  event="onchange" reRender="chart" />
  +                        </h:selectBooleanCheckbox>
  +                    </rich:column>
  +                </rich:dataTable>
  +
  +
  +                Foreground Color:
                   <h:selectOneMenu value="#{chart.legendItemPaint}">             
                       <s:selectItems value="#{colors}" var="i" label="#{i}"
                                      noSelectionLabel="Default ... "/> 
                       <a:support  event="onchange" reRender="chart" />
                   </h:selectOneMenu> 
                   
  -                Background:
  +                Background Color:
                   <h:selectOneMenu value="#{chart.legendBackgroundPaint}">             
                       <s:selectItems value="#{colors}" var="i" label="#{i}"
                                      noSelectionLabel="Default ... "/> 
  @@ -230,29 +249,43 @@
                   
               </rich:tab>
               <rich:tab label="Data">
  -                <ui:repeat value="#{chart.data}" var="dataset">
  +                <table class="dr-table rich-table" border="0" cellpadding="0" cellspacing="0">
  +                    <thead>
  +                        <tr class="dr-table-header rich-table-header">
  +                            <td class="dr-table-headercell rich-table-headercell">Series Name</td>
  +                            <ui:repeat value="#{chart.categories}" var="category">
  +                                <td class="dr-table-headercell rich-table-headercell">
  +                                    #{category}
  +                                </td>
  +                            </ui:repeat>
  +                            <td class="dr-table-headercell rich-table-headercell">Visible</td>
  +                            <td class="dr-table-headercell rich-table-headercell">Style</td>
  +                            <td class="dr-table-headercell rich-table-headercell">Outline</td>
  +                        </tr>
  +                    </thead>
   
  -                    <rich:panel>
  -                        Visible:
  -                        <h:selectBooleanCheckbox value="#{dataset.visible}">
  +                    <ui:repeat value="#{chart.data}" var="dataset">
  +                        <tr class="dr-table-row rich-table-row">
  +                            <td class="dr-table-cell rich-table-cell">
  +                                <h:inputText value="#{dataset.id}">
                               <a:support  event="onchange" reRender="chart" />
  -                        </h:selectBooleanCheckbox>
  -                        
  -                        In Legend:
  -                        <h:selectBooleanCheckbox value="#{dataset.visibleInLegend}">
  +                                </h:inputText>
  +                            </td>
  +                            <ui:repeat value="#{chart.categories}" var="category">
  +                                <td class="dr-table-cell rich-table-cell">
  +                                    <rich:inputNumberSpinner value="#{dataset.values[category]}">
                               <a:support  event="onchange" reRender="chart" />
  -                        </h:selectBooleanCheckbox>
  -                        
  -                        <br />           
  -
  +                                    </rich:inputNumberSpinner>
  +                                </td>
  +                            </ui:repeat>
   
  -                        Series Name: <h:inputText value="#{dataset.id}">
  +                            <td class="dr-table-cell rich-table-cell">
  +                                <h:selectBooleanCheckbox value="#{dataset.visible}">
                               <a:support event="onchange" reRender="chart" />
  -                        </h:inputText>
  -                        <br />
  -
  +                                </h:selectBooleanCheckbox>
  +                            </td>
                       
  -                        Style:
  +                            <td class="dr-table-cell rich-table-cell">
                           <h:selectOneMenu value="#{dataset.seriesPaint}">             
                               <s:selectItems value="#{colors}" var="i" label="#{i}"
                                              noSelectionLabel="Default ... "/> 
  @@ -263,18 +296,8 @@
                               <s:selectItems value="#{strokes}" var="i" label="#{i}" noSelectionLabel="Default..." />
                               <a:support  event="onchange" reRender="chart" />
                           </h:selectOneMenu> 
  -                        
  -                        <ui:remove><!-- fill only for custom shapes?-->
  -                            Fill:
  -                            <h:selectOneMenu value="#{dataset.seriesFillPaint}">             
  -                                <s:selectItems value="#{colors}" var="i" label="#{i}"
  -                                               noSelectionLabel="Default ... "/> 
  -                                <a:support  event="onchange" reRender="chart" />
  -                            </h:selectOneMenu> 
  -                        </ui:remove>
  -                        <br />
  -                        
  -                        Outline:
  +                            </td>
  +                            <td class="dr-table-cell rich-table-cell">
                           <h:selectOneMenu value="#{dataset.seriesOutlinePaint}">             
                               <s:selectItems value="#{colors}" var="i" label="#{i}"
                                              noSelectionLabel="Default ... "/> 
  @@ -284,14 +307,13 @@
                               <s:selectItems value="#{strokes}" var="i" label="#{i}" noSelectionLabel="Default..." />
                               <a:support  event="onchange" reRender="chart" />
                           </h:selectOneMenu> 
  -                        
  -                        <br />
  -                        <s:button action="#{chart.removeSeries(dataset.id)}" />
  -                    </rich:panel>
  -                    <rich:spacer height="10" />
  +                            </td>
  +                        </tr>
                   </ui:repeat>
  +                </table>
   
                   <h:commandButton action="#{chart.newSeries}" value="Add New Series" />
  +                <h:commandButton action="#{chart.newCategory}" value="Add New Category" />
               </rich:tab>
           </rich:tabPanel>
       </h:form>
  
  
  



More information about the jboss-cvs-commits mailing list