Project

General

Profile

« Previous | Next » 

Revision 38102

Added by Ioannis Diplas almost 9 years ago

-Otan svineis dataseries tha se pigainei sto amesws proigoumeno
-den mporei na patithei to "add new filter" an den exei epilexthei x-axis
-Bug fix tis listas twn dataseries(an tin ekanes oli delete kai tin ksanaeftiaxnes eskage)

View differences:

FiltersPanel.java
35 35 
    private SchemaAnswer schemaFromServer;
36 36 
    private int numberOfCurrentColumn;
37 37
38 
    private ArrayList <Image> listOfImages = new ArrayList<Image>();
39 38
39
40 
    public Button getAddNewFilter() {
41 
		return addNewFilter;
42 
	}
43 

  		




  
  44
  
    
	private ArrayList <Image> listOfImages = new ArrayList<Image>();


  		




  
  45
  
    
    


  		




  40
  46
  
    
    public FiltersPanel(SchemaAnswer schemaFromServer,int numberOfCurrentColumn,boolean loaded) {


  		




  41
  47
  
    
    	


  		




  42
  48
  
    
    	this.numberOfCurrentColumn = numberOfCurrentColumn;


  		




  ......




  49
  55
  
    
    }


  		




  50
  56
  
    

  		




  51
  57
  
    
    public void init(){


  		




  
  58
  
    
    	if(ValuesOfFields.getInstance().getColumnsDataList().get(numberOfCurrentColumn).getX_values().equals("")){//x-axis not applied yet


  		




  
  59
  
    
    		addNewFilter.setText("Please add value for x-axis");


  		




  
  60
  
    
    		addNewFilter.setEnabled(false);


  		




  
  61
  
    
    	}else{


  		




  
  62
  
    
    		addNewFilter.setText("Add new filter");


  		




  
  63
  
    
    		addNewFilter.setEnabled(true);


  		




  
  64
  
    
    	}


  		




  52
  65
  
    
    	


  		




  53
  
  
    
    	addNewFilter.setText("Add new filter");


  		




  54
  66
  
    
    	addNewFilter.addStyleName("addNewFilterButton");


  		




  55
  67
  
    
    	addNewFilter.setType(ButtonType.PRIMARY);


  		




  56
  68
  
    
    	


  		




  ......




  134
  146
  
    
			public void onClick(ClickEvent event) {


  		




  135
  147
  
    
				// TODO Auto-generated method stub


  		




  136
  148
  
    
				int index = listOfImages.indexOf(event.getSource());


  		




  137
  
  
    
				ValuesOfFields.getInstance().getColumnsDataList().get(numberOfCurrentColumn).getFilters().remove(index);


  		




  
  149
  
    
				if(index < ValuesOfFields.getInstance().getColumnsDataList().get(numberOfCurrentColumn).getFilters().size()){//an diagrapsei to panel xwris na exei kanei apply kapoio filtro


  		




  
  150
  
    
					ValuesOfFields.getInstance().getColumnsDataList().get(numberOfCurrentColumn).getFilters().remove(index);


  		




  
  151
  
    
				}


  		




  138
  152
  
    
				listOfImages.remove(index);


  		




  139
  153
  
    
				filtersPanel.remove(filterOptionsGroupPanel);


  		




  140
  154
  
    
				eu.dnetlib.client.Generate.getInstance().generateURLs(ValuesOfFields.getInstance(), 1);


  		












Also available in:  Unified diff