This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit dd0d0c5f463f4c061a9c2857a32d1c59540b7cee Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Oct 25 19:11:39 2016 +0200 Remaniement de l'écran d'opération de pêche (LL) --- .../ui/content/impl/longline/SetLonglineUI.jaxx | 190 ++++++++++----------- 1 file changed, 88 insertions(+), 102 deletions(-) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/SetLonglineUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/SetLonglineUI.jaxx index 863e437..2f485d0 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/SetLonglineUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/SetLonglineUI.jaxx @@ -170,74 +170,100 @@ <cell anchor='west'> <JLabel id='settingShapeLabel'/> </cell> - <cell columns="2" fill="both"> + <cell columns="3" fill="both"> <BeanComboBox id='settingShape' constructorParams='this' genericType='ReferentialReference<SettingShapeDto>' _entityClass='SettingShapeDto.class'/> </cell> </row> - <!-- line type --> + <!-- setting vessel speed --> <row> - <cell anchor='west'> - <JLabel id='lineTypeLabel'/> + <cell> + <JLabel id='settingVesselSpeedLabel'/> </cell> - <cell columns="2"> - <BeanComboBox id='lineType' constructorParams='this' genericType='ReferentialReference<LineTypeDto>' _entityClass='LineTypeDto.class'/> + <cell columns="3"> + <NumberEditor id='settingVesselSpeed' constructorParams='this'/> </cell> </row> - - <!-- lightsticks type --> + <!-- time between hooks --> <row> <cell anchor='west'> - <JLabel id='lightsticksTypeLabel'/> + <JLabel id='timeBetweenHooksLabel'/> </cell> - <cell columns="2"> - <BeanComboBox id='lightsticksType' constructorParams='this' genericType='ReferentialReference<LightsticksTypeDto>' _entityClass='LightsticksTypeDto.class'/> + <cell fill='both' weightx="1" columns="3"> + <NumberEditor id='timeBetweenHooks' constructorParams='this'/> </cell> </row> - - <!-- lightsticks color --> + <!-- shooter used --> + <!-- shooter speed --> <row> - <cell anchor='west'> - <JLabel id='lightsticksColorLabel'/> - </cell> - <cell columns="2"> - <BeanComboBox id='lightsticksColor' constructorParams='this' genericType='ReferentialReference<LightsticksColorDto>' _entityClass='LightsticksColorDto.class'/> + <cell anchor="east"> + <JCheckBox id='shooterUsed'/> </cell> - </row> - - <!-- setting vessel speed --> - <row> <cell> - <JLabel id='settingVesselSpeedLabel'/> + <JLabel id='shooterSpeedLabel'/> </cell> <cell columns="2"> - <NumberEditor id='settingVesselSpeed' constructorParams='this'/> + <NumberEditor id='shooterSpeed' constructorParams='this'/> </cell> </row> - <!-- max depth targeted (m) --> <row> <cell> <JLabel id='maxDepthTargetedLabel'/> </cell> - <cell columns="2"> + <cell columns="3"> <NumberEditor id='maxDepthTargeted' constructorParams='this'/> </cell> </row> - - <!-- shooter used --> - <!-- shooter speed --> + <!-- total section count --> <row> - <cell anchor="east"> - <JCheckBox id='shooterUsed'/> + <cell anchor='west'> + <JLabel id='totalSectionsCountLabel'/> </cell> - <cell> - <JLabel id='shooterSpeedLabel'/> + <cell fill='both' weightx="1" columns="3"> + <NumberEditor id='totalSectionsCount' constructorParams='this'/> </cell> - <cell> - <NumberEditor id='shooterSpeed' constructorParams='this'/> + </row> + <!-- basket per section count --> + <!-- total basket count --> + <row> + <cell anchor='west'> + <JLabel id='basketsPerSectionCountLabel'/> + </cell> + <cell fill='both' weightx="1"> + <NumberEditor id='basketsPerSectionCount' constructorParams='this'/> + </cell> + <cell anchor='west'> + <JLabel id='totalBasketsCountLabel'/> + </cell> + <cell fill='both' weightx="1"> + <NumberEditor id='totalBasketsCount' constructorParams='this'/> + </cell> + </row> + <!-- branchlines per basket count --> + <!-- total hooks count --> + <row> + <cell anchor='west'> + <JLabel id='branchlinesPerBasketCountLabel'/> + </cell> + <cell fill='both' weightx="1"> + <NumberEditor id='branchlinesPerBasketCount' constructorParams='this'/> + </cell> + <cell anchor='west'> + <JLabel id='totalHooksCountLabel'/> + </cell> + <cell fill='both' weightx="1"> + <NumberEditor id='totalHooksCount' constructorParams='this'/> + </cell> + </row> + <!-- line type --> + <row> + <cell anchor='west'> + <JLabel id='lineTypeLabel'/> + </cell> + <cell columns="3"> + <BeanComboBox id='lineType' constructorParams='this' genericType='ReferentialReference<LineTypeDto>' _entityClass='LineTypeDto.class'/> </cell> </row> - <!-- weighted swivels --> <!-- swivels weights --> <row> @@ -247,7 +273,7 @@ <cell anchor="west"> <JLabel id='swivelWeightLabel'/> </cell> - <cell> + <cell columns="2"> <NumberEditor id='swivelWeight' constructorParams='this'/> </cell> </row> @@ -261,83 +287,43 @@ <cell> <JLabel id='snapWeightLabel'/> </cell> - <cell> + <cell columns="2"> <NumberEditor id='snapWeight' constructorParams='this'/> </cell> </row> - - <!-- monitored --> - <!-- time between hooks --> + <!-- ligtsticks per basket count --> <row> - <cell anchor='east'> - <JCheckBox id='monitored'/> + <cell anchor='west'> + <JLabel id='lightsticksPerBasketCountLabel'/> </cell> + <cell fill='both' weightx="1" columns="3"> + <NumberEditor id='lightsticksPerBasketCount' constructorParams='this'/> + </cell> + </row> + <!-- lightsticks type --> + <row> <cell anchor='west'> - <JLabel id='timeBetweenHooksLabel'/> + <JLabel id='lightsticksTypeLabel'/> </cell> - <cell fill='both' weightx="1"> - <NumberEditor id='timeBetweenHooks' constructorParams='this'/> + <cell columns="3"> + <BeanComboBox id='lightsticksType' constructorParams='this' genericType='ReferentialReference<LightsticksTypeDto>' _entityClass='LightsticksTypeDto.class'/> </cell> </row> - + <!-- lightsticks color --> <row> - <cell columns="3" fill="both"> - <Table insets="0"> - - <!-- basket per section count --> - <!-- total section count --> - <row> - <cell anchor='west'> - <JLabel id='basketsPerSectionCountLabel'/> - </cell> - <cell fill='both' weightx="1"> - <NumberEditor id='basketsPerSectionCount' constructorParams='this'/> - </cell> - <cell anchor='west'> - <JLabel id='totalSectionsCountLabel'/> - </cell> - <cell fill='both' weightx="1"> - <NumberEditor id='totalSectionsCount' constructorParams='this'/> - </cell> - </row> - - <!-- ligtsticks per basket count --> - <!-- total basket count --> - <row> - <cell anchor='west'> - <JLabel id='lightsticksPerBasketCountLabel'/> - </cell> - <cell fill='both' weightx="1"> - <NumberEditor id='lightsticksPerBasketCount' constructorParams='this'/> - </cell> - <cell anchor='west'> - <JLabel id='totalBasketsCountLabel'/> - </cell> - <cell fill='both' weightx="1"> - <NumberEditor id='totalBasketsCount' constructorParams='this'/> - </cell> - </row> - - <!-- branchlines per basket count --> - <!-- total hooks count --> - <row> - <cell anchor='west'> - <JLabel id='branchlinesPerBasketCountLabel'/> - </cell> - <cell fill='both' weightx="1"> - <NumberEditor id='branchlinesPerBasketCount' constructorParams='this'/> - </cell> - <cell anchor='west'> - <JLabel id='totalHooksCountLabel'/> - </cell> - <cell fill='both' weightx="1"> - <NumberEditor id='totalHooksCount' constructorParams='this'/> - </cell> - </row> - </Table> + <cell anchor='west'> + <JLabel id='lightsticksColorLabel'/> + </cell> + <cell columns="3"> + <BeanComboBox id='lightsticksColor' constructorParams='this' genericType='ReferentialReference<LightsticksColorDto>' _entityClass='LightsticksColorDto.class'/> + </cell> + </row> + <!-- monitored --> + <row> + <cell anchor='east'> + <JCheckBox id='monitored'/> </cell> </row> - </Table> </tab> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.