diff options
| author | Eric Messick <ericm@nanorex.com> | 2008-03-11 04:37:52 +0000 |
|---|---|---|
| committer | Eric Messick <ericm@nanorex.com> | 2008-03-11 04:37:52 +0000 |
| commit | 2b4377c7b0499c5d056541e6429dc02b972196da (patch) | |
| tree | 42c2e0061d8afcc6b626ef57b565726951a9c0d5 /cad/src/analysis | |
| parent | e8d1e252aacc540b3abcac66bef174136a4bff70 (diff) | |
| download | nanoengineer-theirix-2b4377c7b0499c5d056541e6429dc02b972196da.tar.gz nanoengineer-theirix-2b4377c7b0499c5d056541e6429dc02b972196da.zip | |
move files into history, model, model_updater, modelTree, ne1_startup, ne1_ui
Diffstat (limited to 'cad/src/analysis')
| -rwxr-xr-x | cad/src/analysis/ESP/ESPImage.py | 10 | ||||
| -rwxr-xr-x | cad/src/analysis/ESP/NanoHive.py | 2 | ||||
| -rwxr-xr-x | cad/src/analysis/GAMESS/GamessJob.py | 2 | ||||
| -rwxr-xr-x | cad/src/analysis/GAMESS/files_gms.py | 6 | ||||
| -rwxr-xr-x | cad/src/analysis/GAMESS/jig_Gamess.py | 4 |
5 files changed, 12 insertions, 12 deletions
diff --git a/cad/src/analysis/ESP/ESPImage.py b/cad/src/analysis/ESP/ESPImage.py index 806d5b497..12166898d 100755 --- a/cad/src/analysis/ESP/ESPImage.py +++ b/cad/src/analysis/ESP/ESPImage.py @@ -63,8 +63,8 @@ import foundation.env as env from utilities import debug_flags from foundation.state_utils import DataMixin -from chunk import Chunk -from chem import Atom +from model.chunk import Chunk +from model.chem import Atom from graphics.drawing.drawer import drawPlane from graphics.drawing.drawer import drawwirecube @@ -77,7 +77,7 @@ from geometry.Slab import Slab from utilities.Log import redmsg, greenmsg from debug_prefs import debug_pref, Choice_boolean_False -from jigs import Jig # REVIEW: all uses of this are suspicious! +from model.jigs import Jig # REVIEW: all uses of this are suspicious! from graphics.images.ImageUtils import nEImageOps from constants import black @@ -86,8 +86,8 @@ from constants import green from constants import START_NEW_SELECTION from constants import SUBTRACT_FROM_SELECTION -from jigs_planes import RectGadget -from jigs_planes import povStrVec +from model.jigs_planes import RectGadget +from model.jigs_planes import povStrVec from analysis.ESP.ESPImageProp import ESPImageProp from PlatformDependent import find_or_make_Nanorex_subdir diff --git a/cad/src/analysis/ESP/NanoHive.py b/cad/src/analysis/ESP/NanoHive.py index 87df49579..d1060f1f0 100755 --- a/cad/src/analysis/ESP/NanoHive.py +++ b/cad/src/analysis/ESP/NanoHive.py @@ -73,7 +73,7 @@ class NanoHive(QWidget, Ui_NanoHiveDialog): # This is where What's This descriptions should go for the Nano-Hive dialog. # Mark 050831. - from gui.WhatsThisText_for_MainWindow import create_whats_this_descriptions_for_NanoHive_dialog + from ne1_ui.WhatsThisText_for_MainWindow import create_whats_this_descriptions_for_NanoHive_dialog create_whats_this_descriptions_for_NanoHive_dialog(self) return diff --git a/cad/src/analysis/GAMESS/GamessJob.py b/cad/src/analysis/GAMESS/GamessJob.py index d2ce650b7..2640856d3 100755 --- a/cad/src/analysis/GAMESS/GamessJob.py +++ b/cad/src/analysis/GAMESS/GamessJob.py @@ -43,7 +43,7 @@ from icon_utilities import geticon from ServerManager import ServerManager ## from PlatformDependent import open_file_in_editor from debug import print_compact_traceback -from UserPrefs import get_filename_and_save_in_prefs +from ne1_ui.UserPrefs import get_filename_and_save_in_prefs from PlatformDependent import hhmmss_str from prefs_constants import gmspath_prefs_key diff --git a/cad/src/analysis/GAMESS/files_gms.py b/cad/src/analysis/GAMESS/files_gms.py index b6ff21d82..e1a03f7a9 100755 --- a/cad/src/analysis/GAMESS/files_gms.py +++ b/cad/src/analysis/GAMESS/files_gms.py @@ -13,10 +13,10 @@ to make it more modular and consistent. """ import os, re, time -from chunk import Chunk -from chem import Atom +from model.chunk import Chunk +from model.chem import Atom from string import capitalize -from elements import PeriodicTable +from model.elements import PeriodicTable from PlatformDependent import get_gms_name from utilities.Log import redmsg, orangemsg from geometry.VQT import A diff --git a/cad/src/analysis/GAMESS/jig_Gamess.py b/cad/src/analysis/GAMESS/jig_Gamess.py index b0b8729be..17f22d8b8 100755 --- a/cad/src/analysis/GAMESS/jig_Gamess.py +++ b/cad/src/analysis/GAMESS/jig_Gamess.py @@ -9,14 +9,14 @@ jig_Gamess.py import sys -from jigs import Jig +from model.jigs import Jig from graphics.drawing.drawer import drawwirecube from graphics.rendering.povray.povheader import povpoint # Fix for bug 692 Mark 050628 from analysis.GAMESS.files_gms import get_energy_from_gms_outfile, get_atompos_from_gms_outfile from utilities.Log import redmsg, greenmsg import foundation.env as env from utilities.Log import redmsg -from chem import move_alist_and_snuggle +from model.chem import move_alist_and_snuggle import foundation.state_utils as state_utils from debug import print_compact_traceback |