Changeset 26605

Timestamp:

2013-01-08T21:34:52+13:00 (10 years ago)

Author:

davidb

Message:

Adding more code for the Collection Space feature back into GlamED, including a setCollectionSpace method for the Collection class.

Location:

other-projects/GlamED/trunk/src/org/honours

Files:

• CollectionSpace/CollectionSpace.java (modified) (1 diff)
• collection/Collection.java (modified) (3 diffs)

other-projects/GlamED/trunk/src/org/honours/CollectionSpace/CollectionSpace.java

@@ -83 +83 @@
     private void writeThumbnails(){
         
+        Frame currFrame = null;
+        int currX = _startX;
+        int currY = _startY;
+        
+        int frameIter = 1;
+        
+        generateNavigationLinks(frameIter);
+        generateDropBox(frameIter);
+        
+        for(int i = 0; i < _thumbnails.size(); i++)
+        {
+            Picture currPic = _thumbnails.get(i);
+            
+            if(i % _columns ==0 && i == 0){
+                
+            }else if(i % _columns == 0 && i > 0){
+                currX = _startX;
+                currY += _gap + _imageSize;
+            }else{
+                currX += _gap + _imageSize;
+            }
+            
+            //Create a new frame to display next lot of items.
+            if(i % (_columns * _rows) == 0 && i < _columns * _rows){
+                currFrame = FrameIO.LoadFrame(_name + frameIter);
+                
+            }else if(i % (_columns * _rows) == 0 && i >= _columns * _rows){
+                frameIter++;
+                Frame check = FrameIO.LoadFrame(_name + frameIter);
+                if(check == null){
+                    //create new frame
+                    HonoursFrameIO.generateFrame(frameIter, _name);
+                    currFrame = FrameIO.LoadFrame(_name + frameIter);
+                    
+                    currX = _startX;
+                    currY = _startY;
+                    generateNavigationLinks(frameIter);
+                    generateDropBox(frameIter);
+                }
+
+            }
+            
+            currFrame.addText(currX, currY, currPic.getSource().getText(),
+                    null, currPic.getLink());
+            currFrame.setSaved();
+        }
+        
+        _associatedCollection.setCollectionSpace(this);
     }
     
     private void generateNavigationLinks(int frameIter){
         
+        String backText = "<<";
+        String forwardText = ">>";
+        
+        int backButtonX = _startX/2;
+        int forwardButtonX = _startX + (_columns*_gap)+(_columns*_imageSize);
+        int buttonPosY = ((_rows*_imageSize) + (_rows*_gap))/2;
+        
+        Frame currFrame = FrameIO.LoadFrame(_name+frameIter);
+        currFrame.addText(backButtonX,buttonPosY,backText,"RotateBack");
+        currFrame.addText(forwardButtonX,buttonPosY,forwardText,"RotateNext");
+        currFrame.setSaved();
     }
     

other-projects/GlamED/trunk/src/org/honours/collection/Collection.java

@@ -6 +6 @@
 import org.expeditee.gui.Frame;
 import org.honours.Main;
+import org.honours.CollectionSpace.*;
 
 public class Collection {
@@ -12 +13 @@
     private CopyOnWriteArrayList<CollectionItem> _items;
     private CollectionInformation _collectionInfo;
+    
+    private CollectionSpace _collectionSpace;
     
     public Collection() {}
@@ -48 +51 @@
         //_items = new ArrayList<CollectionItem>();
         _items = new CopyOnWriteArrayList<CollectionItem>();
+    }
+    
+    public void setCollectionSpace(CollectionSpace cs){
+        _collectionSpace = cs;
     }