[Cdk-commits] CVS: cdk/org/openscience/cdk/applications Viewer.java,1.5,1.6

[Egon W. <eg...@us...>]

Update of /cvsroot/cdk/cdk/org/openscience/cdk/applications
In directory usw-pr-cvs1:/tmp/cvs-serv7429/org/openscience/cdk/applications

Modified Files:
	Viewer.java 
Log Message:
Atoms in non-accelerated 3D viewer now get painted at filled circles.
Still hardly functional.


Index: Viewer.java
===================================================================
RCS file: /cvsroot/cdk/cdk/org/openscience/cdk/applications/Viewer.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** Viewer.java	2002/01/25 14:06:12	1.5
--- Viewer.java	2002/02/06 12:47:14	1.6
***************
*** 56,60 ****
            logger.info("Expecting XYZ format...");
          } else if (inFile.endsWith(".cml")) {
!   	      reader = new CMLReader(new FileReader(inFile));
            logger.info("Expecting CML format...");
          } else if (inFile.endsWith(".pdb")) {
--- 56,61 ----
            logger.info("Expecting XYZ format...");
          } else if (inFile.endsWith(".cml")) {
!           String url = "file:" + System.getProperty("user.dir") + "/" + inFile;
!           reader = new CMLReader(url);
            logger.info("Expecting CML format...");
          } else if (inFile.endsWith(".pdb")) {
***************
*** 124,137 ****
                        logger.debug(".. done");
                    }
! 			  } else if (GeometryTools.has2DCoordinates(m)) {
! 			      logger.info("Viewing with 2D viewer");
                    MoleculeViewer2D mv = new MoleculeViewer2D(m);
                    mv.display();
! 			  } else {
! 			      System.out.println("Molecule has no coordinates.");
! 			  }
              }
            }
! 	      }
      }
      
--- 125,138 ----
                        logger.debug(".. done");
                    }
!               } else if (GeometryTools.has2DCoordinates(m)) {
!                   logger.info("Viewing with 2D viewer");
                    MoleculeViewer2D mv = new MoleculeViewer2D(m);
                    mv.display();
!               } else {
!                   System.out.println("Molecule has no coordinates.");
!               }
              }
            }
!       }
      }
      
***************
*** 147,151 ****
              for (int i=1; i<args.length; i++) {
                  String opt = args[i-1];
!                 if (opt.equals("--nojava3D")) {
                      useJava3D = false;
                  } else {
--- 148,152 ----
              for (int i=1; i<args.length; i++) {
                  String opt = args[i-1];
!                 if ("--nojava3d".equalsIgnoreCase(opt)) {
                      useJava3D = false;
                  } else {
***************
*** 160,164 ****
              System.out.println();
              System.out.println("options: --nojava3D    Disable Java3D support");
! 			System.exit(0);
          }
  
--- 161,165 ----
              System.out.println();
              System.out.println("options: --nojava3D    Disable Java3D support");
!             System.exit(0);
          }