Menu
▾
▴
[dcm4che-commits] SF.net SVN: dcm4che:[15717] oviyam/mayam/trunk/src/in/raster/mayam
|
From: <ams...@us...> - 2011-07-27 06:29:51
|
Revision: 15717
http://dcm4che.svn.sourceforge.net/dcm4che/?rev=15717&view=rev
Author: amsundaram06
Date: 2011-07-27 06:29:43 +0000 (Wed, 27 Jul 2011)
Log Message:
-----------
MAYAM-100 and MAYAM-101 Query filters applied properly while choosing other languages.
Modified Paths:
--------------
oviyam/mayam/trunk/src/in/raster/mayam/delegate/QueryService.java
oviyam/mayam/trunk/src/in/raster/mayam/form/ImagePanel.java
oviyam/mayam/trunk/src/in/raster/mayam/form/QueryRetrieve.form
oviyam/mayam/trunk/src/in/raster/mayam/form/QueryRetrieve.java
oviyam/mayam/trunk/src/in/raster/mayam/form/ServerManager.form
oviyam/mayam/trunk/src/in/raster/mayam/form/ServerManager.java
oviyam/mayam/trunk/src/in/raster/mayam/util/database/DatabaseHandler.java
Modified: oviyam/mayam/trunk/src/in/raster/mayam/delegate/QueryService.java
===================================================================
--- oviyam/mayam/trunk/src/in/raster/mayam/delegate/QueryService.java 2011-07-26 15:49:27 UTC (rev 15716)
+++ oviyam/mayam/trunk/src/in/raster/mayam/delegate/QueryService.java 2011-07-27 06:29:43 UTC (rev 15717)
@@ -109,7 +109,7 @@
}
if (searchDob!=null && searchDob.length() > 0) {
- cfgCDimseService.put("key.PatientBirthDate", searchDob);
+ cfgCDimseService.put("key.PatientBirthDate", searchDob.replace("/", ""));
}
if (searchAccNo!=null && searchAccNo.length() > 0) {
cfgCDimseService.put("key.AccessionNumber", searchAccNo);
Modified: oviyam/mayam/trunk/src/in/raster/mayam/form/ImagePanel.java
===================================================================
--- oviyam/mayam/trunk/src/in/raster/mayam/form/ImagePanel.java 2011-07-26 15:49:27 UTC (rev 15716)
+++ oviyam/mayam/trunk/src/in/raster/mayam/form/ImagePanel.java 2011-07-27 06:29:43 UTC (rev 15717)
@@ -47,6 +47,7 @@
import in.raster.mayam.delegate.SeriesChooserDelegate;
import in.raster.mayam.delegate.SynchronizationDelegate;
import in.raster.mayam.model.Instance;
+import in.raster.mayam.model.PresetModel;
import in.raster.mayam.model.ScoutLineInfoModel;
import in.raster.mayam.model.Series;
import in.raster.mayam.model.Study;
@@ -67,11 +68,13 @@
import java.awt.Color;
import java.awt.Dimension;
+import java.awt.Font;
import java.awt.Graphics;
import java.awt.Graphics2D;
import java.awt.Image;
import java.awt.Rectangle;
import java.awt.RenderingHints;
+import java.awt.event.ActionListener;
import java.awt.event.MouseListener;
import java.awt.event.MouseMotionListener;
import java.awt.event.MouseWheelListener;
@@ -1833,10 +1836,33 @@
mousePressed = true;
if (e.isPopupTrigger()) {
designContext();
+ addContextItem();
jPopupMenu1.show(this, e.getX(), e.getY());
}
}
-
+ public void addContextItem(){
+ JMenu menu;
+ if(widowingFlag){
+ ArrayList presetList = ApplicationContext.databaseRef.getPresetValueForModality(ApplicationContext.imgPanel.getModality());
+ menu = new JMenu("Window Width & Level");
+ //menu.setEnabled(false);
+ jPopupMenu1.addSeparator();
+ for (int i = 0; i < presetList.size(); i++) {
+ final PresetModel presetModel = (PresetModel) presetList.get(i);
+ if (!presetModel.getPresetName().equalsIgnoreCase("PRESETNAME")) {
+ JMenuItem menu1 = new JMenuItem(presetModel.getPresetName());
+ menu.add(menu1);
+ menu1.addActionListener(new ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ ApplicationContext.imgPanel.windowChanged(Integer.parseInt(presetModel.getWindowLevel()),
+ Integer.parseInt(presetModel.getWindowWidth()));
+ }
+ });
+ }
+ }
+ jPopupMenu1.add(menu);
+ }
+ }
public void mouseReleased(MouseEvent e) {
selectSeries(e);
}
Modified: oviyam/mayam/trunk/src/in/raster/mayam/form/QueryRetrieve.form
===================================================================
--- oviyam/mayam/trunk/src/in/raster/mayam/form/QueryRetrieve.form 2011-07-26 15:49:27 UTC (rev 15716)
+++ oviyam/mayam/trunk/src/in/raster/mayam/form/QueryRetrieve.form 2011-07-27 06:29:43 UTC (rev 15717)
@@ -34,10 +34,7 @@
<Layout>
<DimensionLayout dim="0">
<Group type="103" groupAlignment="0" attributes="0">
- <Group type="102" alignment="0" attributes="0">
- <Component id="jPanel9" max="32767" attributes="0"/>
- <EmptySpace max="-2" attributes="0"/>
- </Group>
+ <Component id="jPanel9" alignment="0" max="32767" attributes="0"/>
</Group>
</DimensionLayout>
<DimensionLayout dim="1">
@@ -60,44 +57,46 @@
<Group type="102" alignment="1" attributes="0">
<EmptySpace min="-2" max="-2" attributes="0"/>
<Group type="103" groupAlignment="1" attributes="0">
- <Component id="jScrollPane2" alignment="0" pref="1163" max="32767" attributes="2"/>
+ <Component id="jScrollPane2" alignment="0" pref="1161" max="32767" attributes="2"/>
<Group type="102" alignment="1" attributes="0">
+ <Group type="103" groupAlignment="1" attributes="0">
+ <Component id="serverlistScroll" alignment="0" pref="551" max="32767" attributes="1"/>
+ <Component id="serverNameLabel" alignment="0" pref="551" max="32767" attributes="1"/>
+ <Component id="headerLabel" alignment="0" pref="551" max="32767" attributes="1"/>
+ </Group>
+ <EmptySpace min="-2" max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
- <Component id="serverlistScroll" pref="535" max="32767" attributes="1"/>
- <Component id="serverNameLabel" alignment="1" pref="535" max="32767" attributes="2"/>
- <Component id="headerLabel" alignment="0" pref="535" max="32767" attributes="2"/>
+ <Component id="jPanel8" max="32767" attributes="1"/>
+ <Component id="jPanel7" alignment="1" max="32767" attributes="1"/>
+ <Component id="queryFilterLabel" alignment="0" pref="604" max="32767" attributes="2"/>
</Group>
- <EmptySpace max="-2" attributes="0"/>
- <Group type="103" groupAlignment="0" max="-2" attributes="0">
- <Component id="queryFilterLabel" alignment="0" max="32767" attributes="1"/>
- <Component id="jPanel7" alignment="0" pref="618" max="32767" attributes="1"/>
- <Component id="jPanel8" alignment="0" max="32767" attributes="1"/>
- </Group>
</Group>
</Group>
+ <EmptySpace min="-2" max="-2" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
<DimensionLayout dim="1">
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="0" attributes="0">
+ <EmptySpace min="-2" max="-2" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0">
<Component id="headerLabel" alignment="3" min="-2" pref="20" max="-2" attributes="0"/>
<Component id="queryFilterLabel" alignment="3" min="-2" pref="20" max="-2" attributes="0"/>
</Group>
<EmptySpace min="-2" max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
- <Component id="serverlistScroll" pref="235" max="32767" attributes="1"/>
- <Component id="jPanel7" alignment="0" max="32767" attributes="1"/>
+ <Component id="jPanel7" max="32767" attributes="2"/>
+ <Component id="serverlistScroll" alignment="0" min="0" pref="0" max="32767" attributes="3"/>
</Group>
<EmptySpace max="-2" attributes="0"/>
- <Group type="103" groupAlignment="0" attributes="0">
+ <Group type="103" groupAlignment="1" attributes="0">
<Component id="serverNameLabel" min="-2" pref="23" max="-2" attributes="0"/>
<Component id="jPanel8" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace max="-2" attributes="0"/>
- <Component id="jScrollPane2" pref="516" max="32767" attributes="2"/>
- <EmptySpace max="-2" attributes="0"/>
+ <Component id="jScrollPane2" pref="551" max="32767" attributes="1"/>
+ <EmptySpace min="-2" max="-2" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
@@ -117,12 +116,12 @@
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="0" attributes="0">
<EmptySpace min="-2" pref="9" max="-2" attributes="0"/>
- <Component id="jPanel1" min="-2" pref="157" max="-2" attributes="0"/>
+ <Component id="jPanel1" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="jPanel10" min="-2" max="-2" attributes="0"/>
- <EmptySpace max="-2" attributes="0"/>
+ <EmptySpace type="unrelated" max="-2" attributes="0"/>
<Component id="jPanel2" min="-2" max="-2" attributes="0"/>
- <EmptySpace min="-2" pref="36" max="-2" attributes="0"/>
+ <EmptySpace pref="30" max="32767" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
@@ -130,14 +129,16 @@
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" attributes="0">
<Group type="103" groupAlignment="0" attributes="0">
- <Component id="jPanel2" alignment="0" min="-2" max="-2" attributes="1"/>
- <Group type="102" alignment="0" attributes="0">
- <EmptySpace min="-2" pref="8" max="-2" attributes="0"/>
- <Component id="jPanel10" min="-2" max="-2" attributes="1"/>
+ <Component id="jPanel1" min="-2" max="-2" attributes="1"/>
+ <Group type="103" alignment="0" groupAlignment="1" max="-2" attributes="0">
+ <Group type="102" attributes="1">
+ <EmptySpace min="8" pref="8" max="8" attributes="0"/>
+ <Component id="jPanel10" max="32767" attributes="1"/>
+ </Group>
+ <Component id="jPanel2" alignment="0" min="-2" max="-2" attributes="1"/>
</Group>
- <Component id="jPanel1" alignment="0" min="-2" max="-2" attributes="1"/>
</Group>
- <EmptySpace pref="21" max="32767" attributes="0"/>
+ <EmptySpace max="32767" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
@@ -205,8 +206,9 @@
</Property>
<Property name="selected" type="boolean" value="true"/>
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString bundle="in/raster/mayam/form/i18n/Bundle.properties" key="QueryRetrieve.anydateRadio.text_1" replaceFormat="java.util.ResourceBundle.getBundle("{bundleNameSlashes}",ApplicationContext.currentLocale).getString("{key}")"/>
+ <ResourceString bundle="in/raster/mayam/form/i18n/Bundle.properties" key="QueryRetrieve.Anydate.text_1" replaceFormat="java.util.ResourceBundle.getBundle("{bundleNameSlashes}",ApplicationContext.currentLocale).getString("{key}")"/>
</Property>
+ <Property name="name" type="java.lang.String" value="Anydate" noResource="true"/>
</Properties>
</Component>
<Component class="javax.swing.JRadioButton" name="todayRadio">
@@ -215,8 +217,9 @@
<ComponentRef name="searchDaysGroup"/>
</Property>
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString bundle="in/raster/mayam/form/i18n/Bundle.properties" key="QueryRetrieve.todayRadio.text_1" replaceFormat="java.util.ResourceBundle.getBundle("{bundleNameSlashes}",ApplicationContext.currentLocale).getString("{key}")"/>
+ <ResourceString bundle="in/raster/mayam/form/i18n/Bundle.properties" key="QueryRetrieve.Today.text_1" replaceFormat="java.util.ResourceBundle.getBundle("{bundleNameSlashes}",ApplicationContext.currentLocale).getString("{key}")"/>
</Property>
+ <Property name="name" type="java.lang.String" value="Today" noResource="true"/>
</Properties>
</Component>
<Component class="javax.swing.JRadioButton" name="yesterdayRadio">
@@ -225,8 +228,9 @@
<ComponentRef name="searchDaysGroup"/>
</Property>
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString bundle="in/raster/mayam/form/i18n/Bundle.properties" key="QueryRetrieve.yesterdayRadio.text_1" replaceFormat="java.util.ResourceBundle.getBundle("{bundleNameSlashes}",ApplicationContext.currentLocale).getString("{key}")"/>
+ <ResourceString bundle="in/raster/mayam/form/i18n/Bundle.properties" key="QueryRetrieve.Yesterday.text_1" replaceFormat="java.util.ResourceBundle.getBundle("{bundleNameSlashes}",ApplicationContext.currentLocale).getString("{key}")"/>
</Property>
+ <Property name="name" type="java.lang.String" value="Yesterday" noResource="true"/>
</Properties>
</Component>
<Component class="javax.swing.JRadioButton" name="lastweekRadio">
@@ -235,8 +239,9 @@
<ComponentRef name="searchDaysGroup"/>
</Property>
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString bundle="in/raster/mayam/form/i18n/Bundle.properties" key="QueryRetrieve.lastweekRadio.text_1" replaceFormat="java.util.ResourceBundle.getBundle("{bundleNameSlashes}",ApplicationContext.currentLocale).getString("{key}")"/>
+ <ResourceString bundle="in/raster/mayam/form/i18n/Bundle.properties" key="QueryRetrieve.Last week.text_1" replaceFormat="java.util.ResourceBundle.getBundle("{bundleNameSlashes}",ApplicationContext.currentLocale).getString("{key}")"/>
</Property>
+ <Property name="name" type="java.lang.String" value="Last week" noResource="true"/>
</Properties>
</Component>
<Component class="javax.swing.JRadioButton" name="lastmonthRadio">
@@ -245,8 +250,9 @@
<ComponentRef name="searchDaysGroup"/>
</Property>
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString bundle="in/raster/mayam/form/i18n/Bundle.properties" key="QueryRetrieve.lastmonthRadio.text_1" replaceFormat="java.util.ResourceBundle.getBundle("{bundleNameSlashes}",ApplicationContext.currentLocale).getString("{key}")"/>
+ <ResourceString bundle="in/raster/mayam/form/i18n/Bundle.properties" key="QueryRetrieve.Last month.text_1" replaceFormat="java.util.ResourceBundle.getBundle("{bundleNameSlashes}",ApplicationContext.currentLocale).getString("{key}")"/>
</Property>
+ <Property name="name" type="java.lang.String" value="Last month" noResource="true"/>
</Properties>
</Component>
<Component class="javax.swing.JRadioButton" name="betweenRadio">
@@ -255,8 +261,9 @@
<ComponentRef name="searchDaysGroup"/>
</Property>
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString bundle="in/raster/mayam/form/i18n/Bundle.properties" key="QueryRetrieve.betweenRadio.text_1" replaceFormat="java.util.ResourceBundle.getBundle("{bundleNameSlashes}",ApplicationContext.currentLocale).getString("{key}")"/>
+ <ResourceString bundle="in/raster/mayam/form/i18n/Bundle.properties" key="QueryRetrieve.Between.text_1" replaceFormat="java.util.ResourceBundle.getBundle("{bundleNameSlashes}",ApplicationContext.currentLocale).getString("{key}")"/>
</Property>
+ <Property name="name" type="java.lang.String" value="Between" noResource="true"/>
</Properties>
</Component>
<Component class="javax.swing.JSpinner" name="fromSpinner">
@@ -283,31 +290,26 @@
<Layout>
<DimensionLayout dim="0">
<Group type="103" groupAlignment="0" attributes="0">
- <Group type="102" attributes="0">
+ <Group type="102" alignment="0" attributes="0">
<EmptySpace max="-2" attributes="0"/>
- <Group type="103" groupAlignment="0" attributes="0">
- <Component id="dobLabel" min="-2" max="-2" attributes="0"/>
- <Component id="accessionLabel" alignment="0" min="-2" max="-2" attributes="0"/>
- <Component id="patientIDLabel" alignment="0" min="-2" max="-2" attributes="0"/>
- <Component id="patientNameLabel" alignment="0" min="-2" max="-2" attributes="0"/>
- </Group>
<Group type="103" groupAlignment="1" attributes="0">
- <Group type="102" attributes="0">
- <EmptySpace min="-2" pref="18" max="-2" attributes="0"/>
- <Group type="103" groupAlignment="1" attributes="0">
- <Component id="patientNameText" alignment="0" pref="126" max="32767" attributes="0"/>
- <Component id="patientIDText" alignment="0" pref="126" max="32767" attributes="0"/>
- </Group>
+ <Group type="103" groupAlignment="0" attributes="0">
+ <Component id="patientIDLabel" alignment="0" min="-2" max="-2" attributes="0"/>
+ <Component id="patientNameLabel" alignment="0" min="-2" max="-2" attributes="0"/>
+ <Component id="accessionLabel" alignment="0" min="-2" max="-2" attributes="0"/>
</Group>
- <Group type="102" alignment="1" attributes="0">
- <EmptySpace max="-2" attributes="0"/>
- <Group type="103" groupAlignment="0" max="-2" attributes="0">
- <Component id="jTextField3" alignment="1" max="32767" attributes="1"/>
- <Component id="birthDateSpinner" alignment="1" min="-2" pref="125" max="-2" attributes="1"/>
- </Group>
+ <Component id="dobLabel" alignment="1" min="-2" max="-2" attributes="0"/>
+ </Group>
+ <EmptySpace type="separate" max="-2" attributes="0"/>
+ <Group type="103" groupAlignment="0" attributes="0">
+ <Component id="birthDateSpinner" pref="125" max="32767" attributes="1"/>
+ <Group type="103" alignment="0" groupAlignment="0" max="-2" attributes="0">
+ <Component id="jTextField3" alignment="0" max="32767" attributes="1"/>
+ <Component id="patientIDText" alignment="0" max="32767" attributes="1"/>
+ <Component id="patientNameText" alignment="0" pref="125" max="32767" attributes="1"/>
</Group>
</Group>
- <EmptySpace min="-2" pref="28" max="-2" attributes="0"/>
+ <EmptySpace max="32767" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
@@ -329,23 +331,16 @@
<Component id="accessionLabel" alignment="3" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace max="-2" attributes="0"/>
- <Group type="103" groupAlignment="0" attributes="0">
- <Component id="birthDateSpinner" max="32767" attributes="1"/>
- <Component id="dobLabel" alignment="0" pref="28" max="32767" attributes="1"/>
+ <Group type="103" groupAlignment="3" attributes="0">
+ <Component id="birthDateSpinner" alignment="3" pref="22" max="32767" attributes="1"/>
+ <Component id="dobLabel" alignment="3" min="-2" max="-2" attributes="0"/>
</Group>
- <EmptySpace min="-2" pref="20" max="-2" attributes="0"/>
+ <EmptySpace min="-2" pref="34" max="-2" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
</Layout>
<SubComponents>
- <Component class="javax.swing.JLabel" name="dobLabel">
- <Properties>
- <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString bundle="in/raster/mayam/form/i18n/Bundle.properties" key="QueryRetrieve.dobLabel.text_1" replaceFormat="java.util.ResourceBundle.getBundle("{bundleNameSlashes}",ApplicationContext.currentLocale).getString("{key}")"/>
- </Property>
- </Properties>
- </Component>
<Component class="javax.swing.JSpinner" name="birthDateSpinner">
<Properties>
<Property name="enabled" type="boolean" value="false"/>
@@ -378,6 +373,17 @@
</Component>
<Component class="javax.swing.JTextField" name="jTextField3">
</Component>
+ <Component class="javax.swing.JCheckBox" name="dobLabel">
+ <Properties>
+ <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+ <ResourceString bundle="in/raster/mayam/form/i18n/Bundle.properties" key="QueryRetrieve.dobLabel.text_1" replaceFormat="java.util.ResourceBundle.getBundle("{bundleNameSlashes}").getString("{key}")"/>
+ </Property>
+ <Property name="name" type="java.lang.String" value="Date Of Birth" noResource="true"/>
+ </Properties>
+ <Events>
+ <EventHandler event="itemStateChanged" listener="java.awt.event.ItemListener" parameters="java.awt.event.ItemEvent" handler="dobLabelItemStateChanged"/>
+ </Events>
+ </Component>
</SubComponents>
</Container>
<Container class="javax.swing.JPanel" name="jPanel2">
@@ -392,35 +398,40 @@
<Layout>
<DimensionLayout dim="0">
<Group type="103" groupAlignment="0" attributes="0">
- <Group type="102" alignment="0" attributes="0">
+ <Group type="102" attributes="0">
<Group type="103" groupAlignment="0" attributes="0">
- <Component id="ctCheckBox" alignment="0" min="-2" max="-2" attributes="0"/>
- <Component id="mrCheckBox" alignment="0" min="-2" max="-2" attributes="0"/>
- <Component id="xaCheckBox" alignment="0" min="-2" max="-2" attributes="0"/>
- <Component id="crCheckBox" alignment="0" min="-2" max="-2" attributes="0"/>
- <Component id="scCheckBox" min="-2" max="-2" attributes="0"/>
+ <Group type="102" attributes="0">
+ <Group type="103" groupAlignment="0" attributes="0">
+ <Component id="ctCheckBox" alignment="0" min="-2" max="-2" attributes="0"/>
+ <Component id="mrCheckBox" alignment="0" min="-2" max="-2" attributes="0"/>
+ <Component id="xaCheckBox" alignment="0" min="-2" max="-2" attributes="0"/>
+ <Component id="crCheckBox" alignment="0" min="-2" max="-2" attributes="0"/>
+ <Component id="scCheckBox" min="-2" max="-2" attributes="0"/>
+ </Group>
+ <EmptySpace max="-2" attributes="0"/>
+ <Group type="103" groupAlignment="0" attributes="0">
+ <Component id="nmCheckBox" alignment="0" min="-2" max="-2" attributes="0"/>
+ <Component id="rfCheckBox" alignment="0" min="-2" max="-2" attributes="0"/>
+ <Component id="dxCheckBox" alignment="0" min="-2" max="-2" attributes="0"/>
+ <Component id="pxCheckBox" alignment="0" min="-2" max="-2" attributes="0"/>
+ <Component id="usCheckBox" alignment="0" min="-2" max="-2" attributes="0"/>
+ </Group>
+ <EmptySpace max="-2" attributes="0"/>
+ <Group type="103" groupAlignment="0" attributes="0">
+ <Component id="otCheckBox" alignment="0" min="-2" max="-2" attributes="0"/>
+ <Component id="drCheckBox" alignment="0" min="-2" max="-2" attributes="0"/>
+ <Component id="srCheckBox" alignment="0" min="-2" max="-2" attributes="0"/>
+ <Component id="mgCheckBox" alignment="0" min="-2" max="-2" attributes="0"/>
+ <Component id="rgCheckBox" alignment="0" min="-2" max="-2" attributes="0"/>
+ </Group>
+ </Group>
+ <Group type="102" alignment="0" attributes="0">
+ <EmptySpace max="-2" attributes="0"/>
+ <Component id="modalityText" min="-2" pref="119" max="-2" attributes="0"/>
+ </Group>
</Group>
- <EmptySpace max="-2" attributes="0"/>
- <Group type="103" groupAlignment="0" attributes="0">
- <Component id="nmCheckBox" alignment="0" min="-2" max="-2" attributes="0"/>
- <Component id="rfCheckBox" alignment="0" min="-2" max="-2" attributes="0"/>
- <Component id="dxCheckBox" alignment="0" min="-2" max="-2" attributes="0"/>
- <Component id="pxCheckBox" alignment="0" min="-2" max="-2" attributes="0"/>
- <Component id="usCheckBox" alignment="0" min="-2" max="-2" attributes="0"/>
- </Group>
- <EmptySpace max="-2" attributes="0"/>
- <Group type="103" groupAlignment="0" attributes="0">
- <Component id="otCheckBox" alignment="0" min="-2" max="-2" attributes="0"/>
- <Component id="drCheckBox" alignment="0" min="-2" max="-2" attributes="0"/>
- <Component id="srCheckBox" alignment="0" min="-2" max="-2" attributes="0"/>
- <Component id="mgCheckBox" alignment="0" min="-2" max="-2" attributes="0"/>
- <Component id="rgCheckBox" alignment="0" min="-2" max="-2" attributes="0"/>
- </Group>
+ <EmptySpace max="32767" attributes="0"/>
</Group>
- <Group type="102" alignment="0" attributes="0">
- <EmptySpace min="20" pref="20" max="20" attributes="0"/>
- <Component id="modalityText" min="-2" pref="119" max="-2" attributes="0"/>
- </Group>
</Group>
</DimensionLayout>
<DimensionLayout dim="1">
@@ -464,7 +475,7 @@
</Group>
</Group>
</Group>
- <EmptySpace type="unrelated" min="-2" max="-2" attributes="0"/>
+ <EmptySpace pref="7" max="32767" attributes="0"/>
<Component id="modalityText" min="-2" max="-2" attributes="0"/>
</Group>
</Group>
@@ -614,7 +625,7 @@
<Component id="retrieveButton" min="-2" max="-2" attributes="0"/>
<EmptySpace min="-2" pref="47" max="-2" attributes="0"/>
<Component id="jLabel6" min="-2" pref="198" max="-2" attributes="0"/>
- <EmptySpace pref="106" max="32767" attributes="0"/>
+ <EmptySpace pref="150" max="32767" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
Modified: oviyam/mayam/trunk/src/in/raster/mayam/form/QueryRetrieve.java
===================================================================
--- oviyam/mayam/trunk/src/in/raster/mayam/form/QueryRetrieve.java 2011-07-26 15:49:27 UTC (rev 15716)
+++ oviyam/mayam/trunk/src/in/raster/mayam/form/QueryRetrieve.java 2011-07-27 06:29:43 UTC (rev 15717)
@@ -90,6 +90,7 @@
/** Creates new form QueryRetrieve */
public QueryRetrieve() {
initComponents();
+ System.out.println("Date Of Birth : "+ java.util.ResourceBundle.getBundle("in/raster/mayam/form/i18n/Bundle").getString("QueryRetrieve.dobLabel.text"));
refreshModels();
addSearchDateitemListener();
addModalityitemListener();
@@ -176,7 +177,6 @@
fromSpinner = new javax.swing.JSpinner();
toSpinner = new javax.swing.JSpinner();
jPanel10 = new javax.swing.JPanel();
- dobLabel = new javax.swing.JLabel();
birthDateSpinner = new javax.swing.JSpinner();
patientNameLabel = new javax.swing.JLabel();
patientNameText = new javax.swing.JTextField();
@@ -184,6 +184,7 @@
patientIDText = new javax.swing.JTextField();
accessionLabel = new javax.swing.JLabel();
jTextField3 = new javax.swing.JTextField();
+ dobLabel = new javax.swing.JCheckBox();
jPanel2 = new javax.swing.JPanel();
ctCheckBox = new javax.swing.JCheckBox();
mrCheckBox = new javax.swing.JCheckBox();
@@ -226,22 +227,28 @@
searchDaysGroup.add(anydateRadio);
anydateRadio.setSelected(true);
- anydateRadio.setText(bundle.getString("QueryRetrieve.anydateRadio.text_1")); // NOI18N
+ anydateRadio.setText(bundle.getString("QueryRetrieve.Anydate.text_1")); // NOI18N
+ anydateRadio.setName("Anydate"); // NOI18N
searchDaysGroup.add(todayRadio);
- todayRadio.setText(bundle.getString("QueryRetrieve.todayRadio.text_1")); // NOI18N
+ todayRadio.setText(bundle.getString("QueryRetrieve.Today.text_1")); // NOI18N
+ todayRadio.setName("Today"); // NOI18N
searchDaysGroup.add(yesterdayRadio);
- yesterdayRadio.setText(bundle.getString("QueryRetrieve.yesterdayRadio.text_1")); // NOI18N
+ yesterdayRadio.setText(bundle.getString("QueryRetrieve.Yesterday.text_1")); // NOI18N
+ yesterdayRadio.setName("Yesterday"); // NOI18N
searchDaysGroup.add(lastweekRadio);
- lastweekRadio.setText(bundle.getString("QueryRetrieve.lastweekRadio.text_1")); // NOI18N
+ lastweekRadio.setText(bundle.getString("QueryRetrieve.Last week.text_1")); // NOI18N
+ lastweekRadio.setName("Last week"); // NOI18N
searchDaysGroup.add(lastmonthRadio);
- lastmonthRadio.setText(bundle.getString("QueryRetrieve.lastmonthRadio.text_1")); // NOI18N
+ lastmonthRadio.setText(bundle.getString("QueryRetrieve.Last month.text_1")); // NOI18N
+ lastmonthRadio.setName("Last month"); // NOI18N
searchDaysGroup.add(betweenRadio);
- betweenRadio.setText(bundle.getString("QueryRetrieve.betweenRadio.text_1")); // NOI18N
+ betweenRadio.setText(bundle.getString("QueryRetrieve.Between.text_1")); // NOI18N
+ betweenRadio.setName("Between"); // NOI18N
fromSpinner.setEnabled(false);
@@ -293,8 +300,6 @@
jPanel10.setBorder(javax.swing.BorderFactory.createEmptyBorder(1, 1, 1, 1));
- dobLabel.setText(bundle.getString("QueryRetrieve.dobLabel.text_1")); // NOI18N
-
birthDateSpinner.setEnabled(false);
patientNameLabel.setText(bundle.getString("QueryRetrieve.patientNameLabel.text_1")); // NOI18N
@@ -303,29 +308,35 @@
accessionLabel.setText(bundle.getString("QueryRetrieve.accessionLabel.text_1")); // NOI18N
+ java.util.ResourceBundle bundle1 = java.util.ResourceBundle.getBundle("in/raster/mayam/form/i18n/Bundle"); // NOI18N
+ dobLabel.setText(bundle1.getString("QueryRetrieve.dobLabel.text_1")); // NOI18N
+ dobLabel.setName("Date Of Birth"); // NOI18N
+ dobLabel.addItemListener(new java.awt.event.ItemListener() {
+ public void itemStateChanged(java.awt.event.ItemEvent evt) {
+ dobLabelItemStateChanged(evt);
+ }
+ });
+
org.jdesktop.layout.GroupLayout jPanel10Layout = new org.jdesktop.layout.GroupLayout(jPanel10);
jPanel10.setLayout(jPanel10Layout);
jPanel10Layout.setHorizontalGroup(
jPanel10Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
.add(jPanel10Layout.createSequentialGroup()
.addContainerGap()
+ .add(jPanel10Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
+ .add(jPanel10Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(patientIDLabel)
+ .add(patientNameLabel)
+ .add(accessionLabel))
+ .add(dobLabel))
+ .add(18, 18, 18)
.add(jPanel10Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(dobLabel)
- .add(accessionLabel)
- .add(patientIDLabel)
- .add(patientNameLabel))
- .add(jPanel10Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
- .add(jPanel10Layout.createSequentialGroup()
- .add(18, 18, 18)
- .add(jPanel10Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
- .add(org.jdesktop.layout.GroupLayout.LEADING, patientNameText, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 126, Short.MAX_VALUE)
- .add(org.jdesktop.layout.GroupLayout.LEADING, patientIDText, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 126, Short.MAX_VALUE)))
- .add(jPanel10Layout.createSequentialGroup()
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(jPanel10Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING, false)
- .add(org.jdesktop.layout.GroupLayout.TRAILING, jTextField3)
- .add(org.jdesktop.layout.GroupLayout.TRAILING, birthDateSpinner, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 125, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))))
- .add(28, 28, 28))
+ .add(birthDateSpinner, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 125, Short.MAX_VALUE)
+ .add(jPanel10Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING, false)
+ .add(jTextField3)
+ .add(patientIDText)
+ .add(patientNameText, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 125, Short.MAX_VALUE)))
+ .addContainerGap(org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
);
jPanel10Layout.setVerticalGroup(
jPanel10Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
@@ -342,10 +353,10 @@
.add(jTextField3, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
.add(accessionLabel))
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(jPanel10Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(birthDateSpinner)
- .add(dobLabel, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 28, Short.MAX_VALUE))
- .add(20, 20, 20))
+ .add(jPanel10Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
+ .add(birthDateSpinner, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 22, Short.MAX_VALUE)
+ .add(dobLabel))
+ .add(34, 34, 34))
);
jPanel2.setBorder(javax.swing.BorderFactory.createEmptyBorder(1, 1, 1, 1));
@@ -386,28 +397,31 @@
jPanel2Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
.add(jPanel2Layout.createSequentialGroup()
.add(jPanel2Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(ctCheckBox)
- .add(mrCheckBox)
- .add(xaCheckBox)
- .add(crCheckBox)
- .add(scCheckBox))
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(jPanel2Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(nmCheckBox)
- .add(rfCheckBox)
- .add(dxCheckBox)
- .add(pxCheckBox)
- .add(usCheckBox))
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(jPanel2Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(otCheckBox)
- .add(drCheckBox)
- .add(srCheckBox)
- .add(mgCheckBox)
- .add(rgCheckBox)))
- .add(jPanel2Layout.createSequentialGroup()
- .add(20, 20, 20)
- .add(modalityText, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 119, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
+ .add(jPanel2Layout.createSequentialGroup()
+ .add(jPanel2Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(ctCheckBox)
+ .add(mrCheckBox)
+ .add(xaCheckBox)
+ .add(crCheckBox)
+ .add(scCheckBox))
+ .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+ .add(jPanel2Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(nmCheckBox)
+ .add(rfCheckBox)
+ .add(dxCheckBox)
+ .add(pxCheckBox)
+ .add(usCheckBox))
+ .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+ .add(jPanel2Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(otCheckBox)
+ .add(drCheckBox)
+ .add(srCheckBox)
+ .add(mgCheckBox)
+ .add(rgCheckBox)))
+ .add(jPanel2Layout.createSequentialGroup()
+ .addContainerGap()
+ .add(modalityText, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 119, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)))
+ .addContainerGap(org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
);
jPanel2Layout.setVerticalGroup(
jPanel2Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
@@ -444,7 +458,7 @@
.add(xaCheckBox)
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
.add(crCheckBox))))
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
+ .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED, 7, Short.MAX_VALUE)
.add(modalityText, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
);
@@ -454,23 +468,24 @@
jPanel7Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
.add(jPanel7Layout.createSequentialGroup()
.add(9, 9, 9)
- .add(jPanel1, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 157, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+ .add(jPanel1, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
.add(jPanel10, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+ .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
.add(jPanel2, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .add(36, 36, 36))
+ .addContainerGap(30, Short.MAX_VALUE))
);
jPanel7Layout.setVerticalGroup(
jPanel7Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
.add(jPanel7Layout.createSequentialGroup()
.add(jPanel7Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(jPanel2, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .add(jPanel7Layout.createSequentialGroup()
- .add(8, 8, 8)
- .add(jPanel10, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
- .add(jPanel1, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
- .addContainerGap(21, Short.MAX_VALUE))
+ .add(jPanel1, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+ .add(jPanel7Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING, false)
+ .add(jPanel7Layout.createSequentialGroup()
+ .add(8, 8, 8)
+ .add(jPanel10, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+ .add(org.jdesktop.layout.GroupLayout.LEADING, jPanel2, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)))
+ .addContainerGap(org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
);
serverListTable.setModel(new ServerTableModel());
@@ -516,7 +531,7 @@
.add(retrieveButton)
.add(47, 47, 47)
.add(jLabel6, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 198, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .addContainerGap(106, Short.MAX_VALUE))
+ .addContainerGap(150, Short.MAX_VALUE))
);
jPanel8Layout.setVerticalGroup(
jPanel8Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
@@ -569,34 +584,36 @@
.add(org.jdesktop.layout.GroupLayout.TRAILING, jPanel9Layout.createSequentialGroup()
.addContainerGap()
.add(jPanel9Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
- .add(org.jdesktop.layout.GroupLayout.LEADING, jScrollPane2, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 1163, Short.MAX_VALUE)
+ .add(org.jdesktop.layout.GroupLayout.LEADING, jScrollPane2, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 1161, Short.MAX_VALUE)
.add(jPanel9Layout.createSequentialGroup()
+ .add(jPanel9Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
+ .add(org.jdesktop.layout.GroupLayout.LEADING, serverlistScroll, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 551, Short.MAX_VALUE)
+ .add(org.jdesktop.layout.GroupLayout.LEADING, serverNameLabel, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 551, Short.MAX_VALUE)
+ .add(org.jdesktop.layout.GroupLayout.LEADING, headerLabel, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 551, Short.MAX_VALUE))
+ .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
.add(jPanel9Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(serverlistScroll, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 535, Short.MAX_VALUE)
- .add(org.jdesktop.layout.GroupLayout.TRAILING, serverNameLabel, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 535, Short.MAX_VALUE)
- .add(headerLabel, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 535, Short.MAX_VALUE))
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(jPanel9Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING, false)
- .add(queryFilterLabel, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .add(jPanel7, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 618, Short.MAX_VALUE)
- .add(jPanel8, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)))))
+ .add(jPanel8, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .add(org.jdesktop.layout.GroupLayout.TRAILING, jPanel7, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .add(queryFilterLabel, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 604, Short.MAX_VALUE))))
+ .addContainerGap())
);
jPanel9Layout.setVerticalGroup(
jPanel9Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
.add(jPanel9Layout.createSequentialGroup()
+ .addContainerGap()
.add(jPanel9Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
.add(headerLabel, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 20, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
.add(queryFilterLabel, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 20, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
.add(jPanel9Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(serverlistScroll, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 235, Short.MAX_VALUE)
- .add(jPanel7, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+ .add(jPanel7, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .add(serverlistScroll, 0, 0, Short.MAX_VALUE))
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(jPanel9Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(jPanel9Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
.add(serverNameLabel, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 23, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
.add(jPanel8, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(jScrollPane2, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 516, Short.MAX_VALUE)
+ .add(jScrollPane2, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 551, Short.MAX_VALUE)
.addContainerGap())
);
@@ -604,9 +621,7 @@
getContentPane().setLayout(layout);
layout.setHorizontalGroup(
layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(layout.createSequentialGroup()
- .add(jPanel9, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .addContainerGap())
+ .add(jPanel9, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
);
layout.setVerticalGroup(
layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
@@ -620,16 +635,20 @@
queryParam.setPatientId(patientIDText.getText());
queryParam.setPatientName(patientNameText.getText());
queryParam.setAccessionNo(jTextField3.getText());
- SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/dd");
- Date d1 = (Date) birthDateSpinner.getModel().getValue();
- String dateOfBirth = sdf.format(d1);
- queryParam.setBirthDate(dateOfBirth);
+// SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/dd");
+// Date d1 = (Date) birthDateSpinner.getModel().getValue();
+// String dateOfBirth = sdf.format(d1);
+// queryParam.setBirthDate(dateOfBirth);
if (!queryParam.getSearchDays().equalsIgnoreCase("Between")) {
resetFromAndToDate();
} else {
setFromToDate();
}
-
+ if (!dobLabel.isSelected()) {
+ resetBirthDate();
+ } else {
+ setBirthDate();
+ }
}
private boolean startSearch = false;
private void queryButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_queryButtonActionPerformed
@@ -656,11 +675,12 @@
private void doQuery(AEModel ae, DcmURL url, int noFilterQuery) {
QueryService qs = new QueryService();
setPatientInfoToQueryParam();
- if (queryParam.getPatientId().equalsIgnoreCase("") && queryParam.getPatientName().equalsIgnoreCase("") && queryParam.getSearchDate().equalsIgnoreCase("") && modalityText.getText().equalsIgnoreCase("") && queryParam.getAccessionNo().equalsIgnoreCase("")) {
+ //System.out.println("Birth Date Filter :" + queryParam.getBirthDate());
+ if (queryParam.getPatientId().equalsIgnoreCase("") && queryParam.getPatientName().equalsIgnoreCase("") && queryParam.getSearchDate().equalsIgnoreCase("") && queryParam.getBirthDate().equalsIgnoreCase("") && modalityText.getText().equalsIgnoreCase("") && queryParam.getAccessionNo().equalsIgnoreCase("")) {
noFilterQuery = JOptionPane.showConfirmDialog(this, "No filters have been selected. It will take long time to query and display result...!", "Confirm Dialog", JOptionPane.YES_NO_OPTION);
}
if (noFilterQuery == 0) {
- qs.callFindWithQuery(queryParam.getPatientId(), queryParam.getPatientName(), "", queryParam.getSearchDate(), modalityText.getText(), queryParam.getAccessionNo(), null, url);
+ qs.callFindWithQuery(queryParam.getPatientId(), queryParam.getPatientName(), queryParam.getBirthDate(), queryParam.getSearchDate(), modalityText.getText(), queryParam.getAccessionNo(), null, url);
Vector studyList = new Vector();
for (int dataSetCount = 0; dataSetCount < qs.getDatasetVector().size(); dataSetCount++) {
try {
@@ -844,24 +864,37 @@
}
}//GEN-LAST:event_studyListTableMouseClicked
+ private void dobLabelItemStateChanged(java.awt.event.ItemEvent evt) {//GEN-FIRST:event_dobLabelItemStateChanged
+ if (evt.getStateChange() == 1) {
+ birthDateSpinner.setEnabled(true);
+ //SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/dd");
+ //Date d1 = (Date) birthDateSpinner.getModel().getValue();
+ //dateOfBirth = sdf.format(d1);
+ //queryParam.setBirthDate("Date Of Birth");
+ } else {
+ birthDateSpinner.setEnabled(false);
+ //queryParam.setBirthDate(null);
+ }
+ }//GEN-LAST:event_dobLabelItemStateChanged
+
private class SearchDaysHandler implements ItemListener {
public void itemStateChanged(ItemEvent e) {
if (e.getStateChange() == ItemEvent.SELECTED) {
if (searchDaysGroup.getSelection() == ((JRadioButton) e.getItem()).getModel()) {
- if (((JRadioButton) e.getItem()).getActionCommand().equalsIgnoreCase("Between")) {
+ if (((JRadioButton) e.getItem()).getName().equalsIgnoreCase("Between")) {
fromSpinner.setEnabled(true);
toSpinner.setEnabled(true);
} else {
fromSpinner.setEnabled(false);
toSpinner.setEnabled(false);
}
- queryParam.setSearchDays(((JRadioButton) e.getItem()).getActionCommand());
+ queryParam.setSearchDays(((JRadioButton) e.getItem()).getName());
}
}
}
}
-
+
private class ModalityHandler implements ItemListener {
public void itemStateChanged(ItemEvent e) {
@@ -971,8 +1004,21 @@
queryParam.setFrom(null);
queryParam.setTo(null);
}
+ public void setBirthDate() {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/dd");
+ Date d1 = (Date) birthDateSpinner.getModel().getValue();
+ String birthDate = sdf.format(d1);
+ queryParam.setBirthDate(birthDate);
+ }
/**
+ *This routine used to reset the from and to date.
+ */
+ public void resetBirthDate() {
+ queryParam.setBirthDate(null);
+ }
+
+ /**
* @param args the command line arguments
*/
public static void main(String args[]) {
@@ -990,7 +1036,7 @@
private javax.swing.JSpinner birthDateSpinner;
private javax.swing.JCheckBox crCheckBox;
private javax.swing.JCheckBox ctCheckBox;
- private javax.swing.JLabel dobLabel;
+ private javax.swing.JCheckBox dobLabel;
private javax.swing.JCheckBox drCheckBox;
private javax.swing.JCheckBox dxCheckBox;
private javax.swing.JSpinner fromSpinner;
Modified: oviyam/mayam/trunk/src/in/raster/mayam/form/ServerManager.form
===================================================================
--- oviyam/mayam/trunk/src/in/raster/mayam/form/ServerManager.form 2011-07-26 15:49:27 UTC (rev 15716)
+++ oviyam/mayam/trunk/src/in/raster/mayam/form/ServerManager.form 2011-07-27 06:29:43 UTC (rev 15717)
@@ -18,7 +18,7 @@
<Group type="103" groupAlignment="0" attributes="0">
<Component id="serverLabel" alignment="0" pref="557" max="32767" attributes="0"/>
<Group type="102" alignment="1" attributes="0">
- <EmptySpace pref="261" max="32767" attributes="0"/>
+ <EmptySpace pref="268" max="32767" attributes="0"/>
<Component id="verifyButton" linkSize="1" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="addButton" linkSize="1" min="-2" max="-2" attributes="0"/>
@@ -28,7 +28,7 @@
</Group>
<Group type="102" alignment="0" attributes="0">
<EmptySpace max="-2" attributes="0"/>
- <Component id="jScrollPane1" pref="517" max="32767" attributes="0"/>
+ <Component id="jScrollPane1" pref="537" max="32767" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
</Group>
</Group>
@@ -103,6 +103,7 @@
</Properties>
<AuxValues>
<AuxValue name="JavaCodeGenerator_ListenersCodePost" type="java.lang.String" value="serverListTable.setDefaultRenderer(Object.class, new CellRenderer());
//serverListTable.getTableHeader().setPreferredSize(new Dimension(jScrollPane1.WIDTH,25));
//serverListTable.setRowHeight(25);

serverListTable.getTableHeader().setPreferredSize(new Dimension(this.getWidth(), 25));
Font ff=new Font("Lucida Grande",Font.BOLD,12);
serverListTable.getTableHeader().setFont(ff);
serverListTable.setRowHeight(20);
serverListTable.getTableHeader().setF...
[truncated message content] |
