Permalink
Browse files

migrated some settings variables from geocamCore to geocamAware

  • Loading branch information...
1 parent a999470 commit f2ca1e9eae2abecc2947e42836bc109b001e064f @trey0 trey0 committed Apr 6, 2012
Showing with 7 additions and 7 deletions.
  1. +2 −2 geocamLens/ViewLensAbstract.py
  2. +5 −5 geocamLens/models.py
@@ -99,8 +99,8 @@ def getExportSettings(self):
'DATA_URL',
'GEOCAM_AWARE_GALLERY_PAGE_COLS',
'GEOCAM_AWARE_GALLERY_PAGE_ROWS',
- 'GEOCAM_CORE_GALLERY_THUMB_SIZE',
- 'GEOCAM_CORE_DESC_THUMB_SIZE',
+ 'GEOCAM_AWARE_GALLERY_THUMB_SIZE',
+ 'GEOCAM_AWARE_DESC_THUMB_SIZE',
'GEOCAM_AWARE_MAP_BACKEND',
'GEOCAM_AWARE_USE_MARKER_CLUSTERING',
'GEOCAM_AWARE_USE_TRACKING',
View
@@ -224,7 +224,7 @@ def makeThumbnail(self, thumbSize):
self.makeThumbnail0(previewOriginalPath, thumbSize)
def galleryThumb(self):
- w0, h0 = settings.GEOCAM_CORE_GALLERY_THUMB_SIZE
+ w0, h0 = settings.GEOCAM_AWARE_GALLERY_THUMB_SIZE
w, h = self.getThumbSize(w0)
tmpl = """<td style="vertical-align: top; width: %dpx; height: %dpx;">
<img src="%s" width="%d" height="%d"/>
@@ -248,8 +248,8 @@ def process(self, importFile=None):
if not os.path.exists(self.getDir()):
mkdirP(self.getDir())
shutil.copyfile(importFile, self.getImagePath())
- self.makeThumbnail(settings.GEOCAM_CORE_GALLERY_THUMB_SIZE)
- self.makeThumbnail(settings.GEOCAM_CORE_DESC_THUMB_SIZE)
+ self.makeThumbnail(settings.GEOCAM_AWARE_GALLERY_THUMB_SIZE)
+ self.makeThumbnail(settings.GEOCAM_AWARE_DESC_THUMB_SIZE)
# remember to call save() after process()
def getCaptionHtml(self):
@@ -261,10 +261,10 @@ def getBalloonHtml(self, request):
viewerUrl = request.build_absolute_uri(self.getViewerUrl())
if self.widthPixels != 0:
- dw, dh = self.getThumbSize(settings.GEOCAM_CORE_DESC_THUMB_SIZE[0])
+ dw, dh = self.getThumbSize(settings.GEOCAM_AWARE_DESC_THUMB_SIZE[0])
thumbnailUrl = (request.build_absolute_uri
(self.getThumbnailUrl
- (settings.GEOCAM_CORE_DESC_THUMB_SIZE[0])))
+ (settings.GEOCAM_AWARE_DESC_THUMB_SIZE[0])))
result.append("""
<a href="%(viewerUrl)s"
title="Show high-res view">

0 comments on commit f2ca1e9

Please sign in to comment.