Menu
▾
▴
[dcm4che-commits] SF.net SVN: dcm4che:[13812] oviyam/mayam/trunk/src/in/raster/mayam/form
|
From: <bab...@us...> - 2010-07-28 08:14:04
|
Revision: 13812
http://dcm4che.svn.sourceforge.net/dcm4che/?rev=13812&view=rev
Author: babuhussain
Date: 2010-07-28 08:13:55 +0000 (Wed, 28 Jul 2010)
Log Message:
-----------
1. Split pane implemented between study and series,quick view panel.
2. Visibility checking in SeriesPanel for dicomTagViewer in order to set the dicom tag info.
3. Measurement scale for patient protocol in quick view panel removed.
Modified Paths:
--------------
oviyam/mayam/trunk/src/in/raster/mayam/form/MainScreen.form
oviyam/mayam/trunk/src/in/raster/mayam/form/MainScreen.java
oviyam/mayam/trunk/src/in/raster/mayam/form/SeriesPanel.java
oviyam/mayam/trunk/src/in/raster/mayam/form/WindowingCanvas.java
oviyam/mayam/trunk/src/in/raster/mayam/form/WindowingImagePanel.java
Modified: oviyam/mayam/trunk/src/in/raster/mayam/form/MainScreen.form
===================================================================
--- oviyam/mayam/trunk/src/in/raster/mayam/form/MainScreen.form 2010-07-27 14:47:42 UTC (rev 13811)
+++ oviyam/mayam/trunk/src/in/raster/mayam/form/MainScreen.form 2010-07-28 08:13:55 UTC (rev 13812)
@@ -203,6 +203,7 @@
<Component id="headerPanel" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="contentArea" max="32767" attributes="0"/>
+ <EmptySpace max="-2" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
@@ -215,10 +216,12 @@
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="0" attributes="0">
<EmptySpace max="-2" attributes="0"/>
- <Component id="jLabel1" min="-2" max="-2" attributes="0"/>
- <EmptySpace pref="1189" max="32767" attributes="0"/>
+ <Group type="103" groupAlignment="0" attributes="0">
+ <Component id="jSplitPane1" alignment="0" pref="1280" max="32767" attributes="0"/>
+ <Component id="jLabel1" alignment="0" min="-2" max="-2" attributes="0"/>
+ </Group>
+ <EmptySpace max="-2" attributes="0"/>
</Group>
- <Component id="studyAndSeriesDisplayPanel" alignment="0" max="32767" attributes="0"/>
</Group>
</DimensionLayout>
<DimensionLayout dim="1">
@@ -227,81 +230,38 @@
<EmptySpace max="-2" attributes="0"/>
<Component id="jLabel1" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
- <Component id="studyAndSeriesDisplayPanel" max="32767" attributes="0"/>
+ <Component id="jSplitPane1" pref="763" max="32767" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
</Layout>
<SubComponents>
- <Container class="javax.swing.JPanel" name="studyAndSeriesDisplayPanel">
+ <Component class="javax.swing.JLabel" name="jLabel1">
+ <Properties>
+ <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
+ <Font name="Tahoma" size="14" style="1"/>
+ </Property>
+ <Property name="text" type="java.lang.String" value=" Local Database"/>
+ </Properties>
+ </Component>
+ <Container class="javax.swing.JSplitPane" name="jSplitPane1">
+ <Properties>
+ <Property name="dividerLocation" type="int" value="256"/>
+ <Property name="dividerSize" type="int" value="4"/>
+ <Property name="orientation" type="int" value="0"/>
+ </Properties>
- <Layout>
- <DimensionLayout dim="0">
- <Group type="103" groupAlignment="0" attributes="0">
- <Group type="102" alignment="1" attributes="0">
- <EmptySpace min="-2" max="-2" attributes="0"/>
- <Group type="103" groupAlignment="1" attributes="0">
- <Component id="studyTableScroll" alignment="0" pref="1278" max="32767" attributes="2"/>
- <Group type="102" alignment="1" attributes="0">
- <Group type="103" groupAlignment="0" max="-2" attributes="0">
- <Component id="thumbnailScroll" pref="318" max="32767" attributes="1"/>
- <Component id="jLabel2" alignment="1" pref="318" max="32767" attributes="1"/>
- </Group>
- <EmptySpace min="-2" max="-2" attributes="0"/>
- <Component id="windowingPanelCanvas" pref="950" max="32767" attributes="0"/>
- </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" attributes="0">
- <Component id="studyTableScroll" min="-2" pref="261" max="-2" attributes="0"/>
- <EmptySpace max="-2" attributes="0"/>
- <Group type="103" groupAlignment="1" attributes="0">
- <Group type="102" alignment="0" attributes="0">
- <Component id="jLabel2" min="-2" pref="16" max="-2" attributes="0"/>
- <EmptySpace max="-2" attributes="0"/>
- <Component id="thumbnailScroll" pref="508" max="32767" attributes="0"/>
- </Group>
- <Component id="windowingPanelCanvas" alignment="0" pref="532" max="32767" attributes="2"/>
- </Group>
- <EmptySpace min="-2" max="-2" attributes="0"/>
- </Group>
- </Group>
- </DimensionLayout>
- </Layout>
+ <Layout class="org.netbeans.modules.form.compat2.layouts.support.JSplitPaneSupportLayout"/>
<SubComponents>
- <Container class="javax.swing.JPanel" name="windowingPanelCanvas">
- <Properties>
- <Property name="background" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
- <Color blue="0" green="0" red="0" type="rgb"/>
- </Property>
- <Property name="autoscrolls" type="boolean" value="true"/>
- <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
- <Dimension value="[50, 50]"/>
- </Property>
- </Properties>
-
- <Layout>
- <DimensionLayout dim="0">
- <Group type="103" groupAlignment="0" attributes="0">
- <EmptySpace min="0" pref="950" max="32767" attributes="0"/>
- </Group>
- </DimensionLayout>
- <DimensionLayout dim="1">
- <Group type="103" groupAlignment="0" attributes="0">
- <EmptySpace min="0" pref="532" max="32767" attributes="0"/>
- </Group>
- </DimensionLayout>
- </Layout>
- </Container>
<Container class="javax.swing.JScrollPane" name="studyTableScroll">
<AuxValues>
<AuxValue name="autoScrollPane" type="java.lang.Boolean" value="true"/>
</AuxValues>
+ <Constraints>
+ <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JSplitPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JSplitPaneSupportLayout$JSplitPaneConstraintsDescription">
+ <JSplitPaneConstraints position="top"/>
+ </Constraint>
+ </Constraints>
<Layout class="org.netbeans.modules.form.compat2.layouts.support.JScrollPaneSupportLayout"/>
<SubComponents>
@@ -327,53 +287,103 @@
</Component>
</SubComponents>
</Container>
- <Container class="javax.swing.JScrollPane" name="thumbnailScroll">
- <Properties>
- <Property name="verticalScrollBarPolicy" type="int" value="22"/>
- </Properties>
- <AuxValues>
- <AuxValue name="JavaCodeGenerator_InitCodePost" type="java.lang.String" value="thumbnailScroll.getVerticalScrollBar().setUnitIncrement(24);
"/>
- </AuxValues>
+ <Container class="javax.swing.JPanel" name="studyAndSeriesDisplayPanel">
+ <Constraints>
+ <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JSplitPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JSplitPaneSupportLayout$JSplitPaneConstraintsDescription">
+ <JSplitPaneConstraints position="right"/>
+ </Constraint>
+ </Constraints>
- <Layout class="org.netbeans.modules.form.compat2.layouts.support.JScrollPaneSupportLayout"/>
+ <Layout>
+ <DimensionLayout dim="0">
+ <Group type="103" groupAlignment="0" attributes="0">
+ <Group type="102" attributes="0">
+ <Group type="103" groupAlignment="0" attributes="0">
+ <Component id="jLabel2" pref="339" max="32767" attributes="1"/>
+ <Component id="thumbnailScroll" alignment="1" pref="339" max="32767" attributes="1"/>
+ </Group>
+ <EmptySpace max="-2" attributes="0"/>
+ <Component id="windowingPanelCanvas" pref="927" max="32767" attributes="0"/>
+ </Group>
+ </Group>
+ </DimensionLayout>
+ <DimensionLayout dim="1">
+ <Group type="103" groupAlignment="0" attributes="0">
+ <Group type="102" alignment="0" attributes="1">
+ <Component id="jLabel2" min="-2" pref="16" max="-2" attributes="0"/>
+ <EmptySpace max="-2" attributes="0"/>
+ <Component id="thumbnailScroll" pref="477" max="32767" attributes="0"/>
+ </Group>
+ <Component id="windowingPanelCanvas" alignment="0" pref="501" max="32767" attributes="2"/>
+ </Group>
+ </DimensionLayout>
+ </Layout>
<SubComponents>
- <Container class="javax.swing.JPanel" name="thumbnailDisplay">
+ <Container class="javax.swing.JPanel" name="windowingPanelCanvas">
<Properties>
+ <Property name="background" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
+ <Color blue="0" green="0" red="0" type="rgb"/>
+ </Property>
<Property name="autoscrolls" type="boolean" value="true"/>
- <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
- <Dimension value="[1000, 1000]"/>
+ <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[50, 50]"/>
</Property>
- <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
- <Dimension value="[13, 2]"/>
- </Property>
</Properties>
- <Layout class="org.netbeans.modules.form.compat2.layouts.DesignFlowLayout"/>
+ <Layout>
+ <DimensionLayout dim="0">
+ <Group type="103" groupAlignment="0" attributes="0">
+ <EmptySpace min="0" pref="927" max="32767" attributes="0"/>
+ </Group>
+ </DimensionLayout>
+ <DimensionLayout dim="1">
+ <Group type="103" groupAlignment="0" attributes="0">
+ <EmptySpace min="0" pref="501" max="32767" attributes="0"/>
+ </Group>
+ </DimensionLayout>
+ </Layout>
</Container>
+ <Container class="javax.swing.JScrollPane" name="thumbnailScroll">
+ <Properties>
+ <Property name="verticalScrollBarPolicy" type="int" value="22"/>
+ </Properties>
+ <AuxValues>
+ <AuxValue name="JavaCodeGenerator_InitCodePost" type="java.lang.String" value="thumbnailScroll.getVerticalScrollBar().setUnitIncrement(24);
"/>
+ </AuxValues>
+
+ <Layout class="org.netbeans.modules.form.compat2.layouts.support.JScrollPaneSupportLayout"/>
+ <SubComponents>
+ <Container class="javax.swing.JPanel" name="thumbnailDisplay">
+ <Properties>
+ <Property name="autoscrolls" type="boolean" value="true"/>
+ <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[1000, 1000]"/>
+ </Property>
+ <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[13, 2]"/>
+ </Property>
+ </Properties>
+
+ <Layout class="org.netbeans.modules.form.compat2.layouts.DesignFlowLayout"/>
+ </Container>
+ </SubComponents>
+ </Container>
+ <Component class="javax.swing.JLabel" name="jLabel2">
+ <Properties>
+ <Property name="background" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
+ <Color blue="71" green="71" red="75" type="rgb"/>
+ </Property>
+ <Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
+ <Color blue="68" green="0" red="0" type="rgb"/>
+ </Property>
+ <Property name="text" type="java.lang.String" value="Series "/>
+ <Property name="opaque" type="boolean" value="true"/>
+ </Properties>
+ </Component>
</SubComponents>
</Container>
- <Component class="javax.swing.JLabel" name="jLabel2">
- <Properties>
- <Property name="background" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
- <Color blue="71" green="71" red="75" type="rgb"/>
- </Property>
- <Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
- <Color blue="68" green="0" red="0" type="rgb"/>
- </Property>
- <Property name="text" type="java.lang.String" value="Series "/>
- <Property name="opaque" type="boolean" value="true"/>
- </Properties>
- </Component>
</SubComponents>
</Container>
- <Component class="javax.swing.JLabel" name="jLabel1">
- <Properties>
- <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
- <Font name="Tahoma" size="14" style="1"/>
- </Property>
- <Property name="text" type="java.lang.String" value=" Local Database"/>
- </Properties>
- </Component>
</SubComponents>
</Container>
<Container class="javax.swing.JPanel" name="headerPanel">
@@ -409,7 +419,7 @@
<Component id="viewerButton" min="-2" pref="67" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="queueButton" min="-2" pref="72" max="-2" attributes="0"/>
- <EmptySpace pref="601" max="32767" attributes="0"/>
+ <EmptySpace pref="603" max="32767" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
Modified: oviyam/mayam/trunk/src/in/raster/mayam/form/MainScreen.java
===================================================================
--- oviyam/mayam/trunk/src/in/raster/mayam/form/MainScreen.java 2010-07-27 14:47:42 UTC (rev 13811)
+++ oviyam/mayam/trunk/src/in/raster/mayam/form/MainScreen.java 2010-07-28 08:13:55 UTC (rev 13812)
@@ -228,14 +228,15 @@
container = new javax.swing.JPanel();
contentArea = new javax.swing.JPanel();
+ jLabel1 = new javax.swing.JLabel();
+ jSplitPane1 = new javax.swing.JSplitPane();
+ studyTableScroll = new javax.swing.JScrollPane();
+ studyListTable = new javax.swing.JTable();
studyAndSeriesDisplayPanel = new javax.swing.JPanel();
windowingPanelCanvas = new javax.swing.JPanel();
- studyTableScroll = new javax.swing.JScrollPane();
- studyListTable = new javax.swing.JTable();
thumbnailScroll = new javax.swing.JScrollPane();
thumbnailDisplay = new javax.swing.JPanel();
jLabel2 = new javax.swing.JLabel();
- jLabel1 = new javax.swing.JLabel();
headerPanel = new javax.swing.JPanel();
importButton = new javax.swing.JButton();
exportButton = new javax.swing.JButton();
@@ -273,6 +274,25 @@
setDefaultCloseOperation(javax.swing.WindowConstants.EXIT_ON_CLOSE);
setTitle("Raster Images | Mayam");
+ jLabel1.setFont(new java.awt.Font("Tahoma", 1, 14));
+ jLabel1.setText(" Local Database");
+
+ jSplitPane1.setDividerLocation(256);
+ jSplitPane1.setDividerSize(4);
+ jSplitPane1.setOrientation(javax.swing.JSplitPane.VERTICAL_SPLIT);
+
+ studyListTable.setModel(new StudyListModel());
+ studyListTable.setSelectionMode(javax.swing.ListSelectionModel.SINGLE_SELECTION);
+ studyListTable.setDefaultRenderer(Object.class, new CellRenderer());
+ studyListTable.addMouseListener(new java.awt.event.MouseAdapter() {
+ public void mouseClicked(java.awt.event.MouseEvent evt) {
+ studyListTableMouseClicked(evt);
+ }
+ });
+ studyTableScroll.setViewportView(studyListTable);
+
+ jSplitPane1.setTopComponent(studyTableScroll);
+
windowingPanelCanvas.setBackground(new java.awt.Color(0, 0, 0));
windowingPanelCanvas.setAutoscrolls(true);
windowingPanelCanvas.setPreferredSize(new java.awt.Dimension(50, 50));
@@ -281,23 +301,13 @@
windowingPanelCanvas.setLayout(windowingPanelCanvasLayout);
windowingPanelCanvasLayout.setHorizontalGroup(
windowingPanelCanvasLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(0, 950, Short.MAX_VALUE)
+ .add(0, 927, Short.MAX_VALUE)
);
windowingPanelCanvasLayout.setVerticalGroup(
windowingPanelCanvasLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(0, 532, Short.MAX_VALUE)
+ .add(0, 501, Short.MAX_VALUE)
);
- studyListTable.setModel(new StudyListModel());
- studyListTable.setSelectionMode(javax.swing.ListSelectionModel.SINGLE_SELECTION);
- studyListTable.setDefaultRenderer(Object.class, new CellRenderer());
- studyListTable.addMouseListener(new java.awt.event.MouseAdapter() {
- public void mouseClicked(java.awt.event.MouseEvent evt) {
- studyListTableMouseClicked(evt);
- }
- });
- studyTableScroll.setViewportView(studyListTable);
-
thumbnailScroll.setVerticalScrollBarPolicy(javax.swing.ScrollPaneConstants.VERTICAL_SCROLLBAR_ALWAYS);
thumbnailScroll.getVerticalScrollBar().setUnitIncrement(24);
@@ -315,34 +325,23 @@
studyAndSeriesDisplayPanel.setLayout(studyAndSeriesDisplayPanelLayout);
studyAndSeriesDisplayPanelLayout.setHorizontalGroup(
studyAndSeriesDisplayPanelLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(org.jdesktop.layout.GroupLayout.TRAILING, studyAndSeriesDisplayPanelLayout.createSequentialGroup()
- .addContainerGap()
- .add(studyAndSeriesDisplayPanelLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
- .add(org.jdesktop.layout.GroupLayout.LEADING, studyTableScroll, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 1278, Short.MAX_VALUE)
- .add(studyAndSeriesDisplayPanelLayout.createSequentialGroup()
- .add(studyAndSeriesDisplayPanelLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING, false)
- .add(thumbnailScroll, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 318, Short.MAX_VALUE)
- .add(org.jdesktop.layout.GroupLayout.TRAILING, jLabel2, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 318, Short.MAX_VALUE))
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(windowingPanelCanvas, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 950, Short.MAX_VALUE)))
- .addContainerGap())
+ .add(studyAndSeriesDisplayPanelLayout.createSequentialGroup()
+ .add(studyAndSeriesDisplayPanelLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(jLabel2, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 339, Short.MAX_VALUE)
+ .add(org.jdesktop.layout.GroupLayout.TRAILING, thumbnailScroll, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 339, Short.MAX_VALUE))
+ .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+ .add(windowingPanelCanvas, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 927, Short.MAX_VALUE))
);
studyAndSeriesDisplayPanelLayout.setVerticalGroup(
studyAndSeriesDisplayPanelLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
.add(studyAndSeriesDisplayPanelLayout.createSequentialGroup()
- .add(studyTableScroll, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 261, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+ .add(jLabel2, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 16, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(studyAndSeriesDisplayPanelLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
- .add(org.jdesktop.layout.GroupLayout.LEADING, studyAndSeriesDisplayPanelLayout.createSequentialGroup()
- .add(jLabel2, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 16, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(thumbnailScroll, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 508, Short.MAX_VALUE))
- .add(org.jdesktop.layout.GroupLayout.LEADING, windowingPanelCanvas, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 532, Short.MAX_VALUE))
- .addContainerGap())
+ .add(thumbnailScroll, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 477, Short.MAX_VALUE))
+ .add(windowingPanelCanvas, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 501, Short.MAX_VALUE)
);
- jLabel1.setFont(new java.awt.Font("Tahoma", 1, 14));
- jLabel1.setText(" Local Database");
+ jSplitPane1.setRightComponent(studyAndSeriesDisplayPanel);
org.jdesktop.layout.GroupLayout contentAreaLayout = new org.jdesktop.layout.GroupLayout(contentArea);
contentArea.setLayout(contentAreaLayout);
@@ -350,9 +349,10 @@
contentAreaLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
.add(contentAreaLayout.createSequentialGroup()
.addContainerGap()
- .add(jLabel1)
- .addContainerGap(1189, Short.MAX_VALUE))
- .add(studyAndSeriesDisplayPanel, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .add(contentAreaLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(jSplitPane1, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 1280, Short.MAX_VALUE)
+ .add(jLabel1))
+ .addContainerGap())
);
contentAreaLayout.setVerticalGroup(
contentAreaLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
@@ -360,7 +360,7 @@
.addContainerGap()
.add(jLabel1)
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(studyAndSeriesDisplayPanel, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+ .add(jSplitPane1, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 763, Short.MAX_VALUE))
);
headerPanel.setBorder(javax.swing.BorderFactory.createMatteBorder(0, 0, 1, 0, new java.awt.Color(13, 13, 13)));
@@ -514,7 +514,7 @@
.add(viewerButton, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 67, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
.add(queueButton, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 72, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .addContainerGap(601, Short.MAX_VALUE))
+ .addContainerGap(603, Short.MAX_VALUE))
);
headerPanelLayout.setVerticalGroup(
headerPanelLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
@@ -547,7 +547,8 @@
.add(containerLayout.createSequentialGroup()
.add(headerPanel, 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(contentArea, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+ .add(contentArea, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addContainerGap())
);
jMenu1.setText("File");
@@ -1045,6 +1046,7 @@
private javax.swing.JSeparator jSeparator2;
private javax.swing.JSeparator jSeparator3;
private javax.swing.JSeparator jSeparator4;
+ private javax.swing.JSplitPane jSplitPane1;
private javax.swing.JMenuBar menuBar;
private javax.swing.JButton metaDataButton;
private javax.swing.JMenuItem motifLFMenu;
Modified: oviyam/mayam/trunk/src/in/raster/mayam/form/SeriesPanel.java
===================================================================
--- oviyam/mayam/trunk/src/in/raster/mayam/form/SeriesPanel.java 2010-07-27 14:47:42 UTC (rev 13811)
+++ oviyam/mayam/trunk/src/in/raster/mayam/form/SeriesPanel.java 2010-07-28 08:13:55 UTC (rev 13812)
@@ -287,8 +287,10 @@
public void mousePressed(MouseEvent e) {
if (!ApplicationContext.mainScreen.getCanvas().getFilePath().equalsIgnoreCase(this.getFileUrl())) {
WindowingPanelLoader.loadImageOnWindowingPanel(this.getFileUrl());
+ if(MainScreen.dicomTagsViewer.isVisible()){
ArrayList<DicomTags> dcmTags = DicomTagsReader.getTags(new File(this.getFileUrl()));
MainScreen.dicomTagsViewer.setDataModelOnTable(dcmTags);
+ }
}
if (!instanceListAdded) {
updateInstanceList();
Modified: oviyam/mayam/trunk/src/in/raster/mayam/form/WindowingCanvas.java
===================================================================
--- oviyam/mayam/trunk/src/in/raster/mayam/form/WindowingCanvas.java 2010-07-27 14:47:42 UTC (rev 13811)
+++ oviyam/mayam/trunk/src/in/raster/mayam/form/WindowingCanvas.java 2010-07-28 08:13:55 UTC (rev 13812)
@@ -99,14 +99,14 @@
@Override
public void paint(Graphics g) {
super.paint(g);
- if (firstTime) {
+ if (firstTime) {
this.setSize(layeredCanvas.getSize().width, layeredCanvas.getSize().height);
firstTime = false;
centerImage();
repaint();
- }
+ }
if (this.layeredCanvas.imgpanel != null) {
- if (this.layeredCanvas.imgpanel.getPixelSpacingY() != -1) {
+ if (this.layeredCanvas.imgpanel.getPixelSpacingY() != -1&&this.layeredCanvas.imgpanel.getPixelSpacingY() != 0) {
int viewScaleHeight = (int) ((int) (100 / this.layeredCanvas.imgpanel.getPixelSpacingY()) * this.layeredCanvas.imgpanel.getScaleFactor() * this.layeredCanvas.imgpanel.getCurrentScaleFactor());
int y1 = (this.getHeight() - viewScaleHeight) / 2;
int hx = 20;
Modified: oviyam/mayam/trunk/src/in/raster/mayam/form/WindowingImagePanel.java
===================================================================
--- oviyam/mayam/trunk/src/in/raster/mayam/form/WindowingImagePanel.java 2010-07-27 14:47:42 UTC (rev 13811)
+++ oviyam/mayam/trunk/src/in/raster/mayam/form/WindowingImagePanel.java 2010-07-28 08:13:55 UTC (rev 13812)
@@ -252,7 +252,9 @@
initialPixelSpacingX = pixelSpacingX = Double.parseDouble(dataset.getString(
Tags.PixelSpacing, 1));
- } catch (NullPointerException e) {e.printStackTrace();
+ } catch (NullPointerException e) {
+ initialPixelSpacingX=0;
+ initialPixelSpacingY=0;
}
int nWindow = cmParam.getNumberOfWindows();
if (nWindow > 0) {
@@ -413,6 +415,7 @@
*/
@Override
public void paintComponent(Graphics gs) {
+ super.paintComponent(gs);
Graphics2D g = (Graphics2D) gs;
g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BICUBIC);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|