[dcm4che-commits] SF.net SVN: dcm4che:[13810] oviyam/mayam/trunk/src/in/raster/mayam/form/ ImageToolbar.java

[<bab...@us...>]

Revision: 13810
          http://dcm4che.svn.sourceforge.net/dcm4che/?rev=13810&view=rev
Author:   babuhussain
Date:     2010-07-27 14:43:20 +0000 (Tue, 27 Jul 2010)

Log Message:
-----------
When multiple tabs are opened in image view, if layout is changed then it displays wrong series-solved.

Modified Paths:
--------------
    oviyam/mayam/trunk/src/in/raster/mayam/form/ImageToolbar.java

Modified: oviyam/mayam/trunk/src/in/raster/mayam/form/ImageToolbar.java
===================================================================
--- oviyam/mayam/trunk/src/in/raster/mayam/form/ImageToolbar.java	2010-07-27 09:20:19 UTC (rev 13809)
+++ oviyam/mayam/trunk/src/in/raster/mayam/form/ImageToolbar.java	2010-07-27 14:43:20 UTC (rev 13810)
@@ -1,41 +1,41 @@
 /* ***** BEGIN LICENSE BLOCK *****
-* Version: MPL 1.1/GPL 2.0/LGPL 2.1
-*
-* The contents of this file are subject to the Mozilla Public License Version
-* 1.1 (the "License"); you may not use this file except in compliance with
-* the License. You may obtain a copy of the License at
-* http://www.mozilla.org/MPL/
-*
-* Software distributed under the License is distributed on an "AS IS" basis,
-* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-* for the specific language governing rights and limitations under the
-* License.
-*
-*
-* The Initial Developer of the Original Code is
-* Raster Images
-* Portions created by the Initial Developer are Copyright (C) 2009-2010
-* the Initial Developer. All Rights Reserved.
-*
-* Contributor(s):
-* Babu Hussain A
-* Meer Asgar Hussain B
-* Prakash J
-* Suresh V
-*
-* Alternatively, the contents of this file may be used under the terms of
-* either the GNU General Public License Version 2 or later (the "GPL"), or
-* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-* in which case the provisions of the GPL or the LGPL are applicable instead
-* of those above. If you wish to allow use of your version of this file only
-* under the terms of either the GPL or the LGPL, and not to allow others to
-* use your version of this file under the terms of the MPL, indicate your
-* decision by deleting the provisions above and replace them with the notice
-* and other provisions required by the GPL or the LGPL. If you do not delete
-* the provisions above, a recipient may use your version of this file under
-* the terms of any one of the MPL, the GPL or the LGPL.
-*
-* ***** END LICENSE BLOCK ***** */
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ *
+ * The Initial Developer of the Original Code is
+ * Raster Images
+ * Portions created by the Initial Developer are Copyright (C) 2009-2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ * Babu Hussain A
+ * Meer Asgar Hussain B
+ * Prakash J
+ * Suresh V
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
 package in.raster.mayam.form;
 
 import in.raster.mayam.context.ApplicationContext;
@@ -45,7 +45,6 @@
 import in.raster.mayam.util.DicomTagsReader;
 import in.raster.mayam.form.display.Display;
 import in.raster.mayam.delegate.CineTimer;
-import in.raster.mayam.form.tab.component.ButtonTabComp;
 import in.raster.mayam.model.Instance;
 import in.raster.mayam.model.PresetModel;
 import in.raster.mayam.model.Series;
@@ -1033,17 +1032,16 @@
     public void storeAnnotationHook() {
         for (int i = 0; i < ApplicationContext.imgView.jTabbedPane1.getComponentCount(); i++) {
             for (int j = 0; j < ((JPanel) ApplicationContext.imgView.jTabbedPane1.getComponent(i)).getComponentCount(); j++) {
-                try {                   
-                    if(((JPanel) ApplicationContext.imgView.jTabbedPane1.getComponent(i)).getComponent(j) instanceof LayeredCanvas)
-                    {                       
-                       LayeredCanvas tempCanvas= ((LayeredCanvas) ((JPanel) ApplicationContext.imgView.jTabbedPane1.getComponent(i)).getComponent(j));
-                       if(tempCanvas.imgpanel!=null)
-                       tempCanvas.imgpanel.storeAnnotation();                
+                try {
+                    if (((JPanel) ApplicationContext.imgView.jTabbedPane1.getComponent(i)).getComponent(j) instanceof LayeredCanvas) {
+                        LayeredCanvas tempCanvas = ((LayeredCanvas) ((JPanel) ApplicationContext.imgView.jTabbedPane1.getComponent(i)).getComponent(j));
+                        if (tempCanvas.imgpanel != null) {
+                            tempCanvas.imgpanel.storeAnnotation();
+                        }
                     }
+                } catch (Exception e) {
+                    e.printStackTrace();
                 }
-                catch (Exception e) {
-                  e.printStackTrace();
-                }
             }
         }
     }
@@ -1056,12 +1054,14 @@
 
     public void changeLayout(int row, int col) {
         String siuid;
-        if (ApplicationContext.imgPanel != null) {
-            siuid = ApplicationContext.imgPanel.getStudyUID();
+        LayeredCanvas tempCanvas = null;
+        if (((JPanel) ApplicationContext.imgView.jTabbedPane1.getSelectedComponent()).getComponent(0) instanceof LayeredCanvas) {
+            tempCanvas = ((LayeredCanvas) ((JPanel) ApplicationContext.imgView.jTabbedPane1.getSelectedComponent()).getComponent(0));
+            siuid = tempCanvas.imgpanel.getStudyUID();
         } else {
-            siuid = ApplicationContext.layeredCanvas.getStudyUID();
+            tempCanvas = ((LayeredCanvas) ((JPanel) ApplicationContext.imgView.jTabbedPane1.getSelectedComponent()).getComponent(1));
+            siuid = tempCanvas.imgpanel.getStudyUID();
         }
-
         GridLayout g = new GridLayout(row, col);
         ArrayList<Instance> instanceArray = getInstanceArray();
         ArrayList tempRef = ApplicationContext.databaseRef.getUrlBasedOnStudyIUID(siuid);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.