fudaa-svn-commit Mailing List for Fudaa (Page 181)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 4079
          http://fudaa.svn.sourceforge.net/fudaa/?rev=4079&view=rev
Author:   emmanuel_martin
Date:     2008-10-17 15:17:26 +0000 (Fri, 17 Oct 2008)

Log Message:
-----------
ajout des natures dans les fichier st et changement mineur dans l'aspect du tableau d'importation dans la wizard

Modified Paths:
--------------
    branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/rubar/io/RubarStReader.java
    branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlWizardImportStepDestination.java

Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/rubar/io/RubarStReader.java
===================================================================

--- branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/rubar/io/RubarStReader.java	2008-10-17 08:08:51 UTC (rev 4078)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/rubar/io/RubarStReader.java	2008-10-17 15:17:26 UTC (rev 4079)
@@ -118,7 +118,7 @@
         if (str != null) {
           lignes.add(str);
           if ("".equals(name)) {
-            names.add(CtuluLib.getS(isSt_?"_P":"_N")+((GISGeometry)str).getId());
+            names.add(CtuluLib.getS(isSt_?"P":"_N")+((GISGeometry)str).getId());
           }
           else {
             names.add(name);
@@ -135,7 +135,7 @@
     if (str != null) {
       lignes.add(str);
       if ("".equals(name)) {
-        names.add(CtuluLib.getS("_P")+((GISGeometry)str).getId());
+        names.add(CtuluLib.getS("P")+((GISGeometry)str).getId());
       }
       else {
         names.add(name);
@@ -147,7 +147,7 @@
     if (lignes.size() > 0) {
       final GISZoneCollectionLigneBrisee zligs = new GISZoneCollectionLigneBrisee(null);
       zligs.addAllLineStringClosedOrNode((LineString[]) lignes.toArray(new LineString[lignes.size()]), null);
-      zligs.setAttributes(new GISAttributeInterface[] { GISAttributeConstants.BATHY, GISAttributeConstants.TITRE}, null);
+      zligs.setAttributes(new GISAttributeInterface[] { GISAttributeConstants.BATHY, GISAttributeConstants.TITRE, GISAttributeConstants.NATURE}, null);
       if(zligs.getAttributeIsZ()!=null)
         zligs.setAttributeIsZ(GISAttributeConstants.BATHY);
       zligs.postImport(0);
@@ -157,6 +157,11 @@
       for (int i=0; i<names.size(); i++) {
         attmod.setObject(i,attmod.getAttribute().createDataForGeom(names.get(i),1),null);
       }
+      // Affectation de l'attribut nature
+      attmod=zligs.getModel(GISAttributeConstants.NATURE);
+      for (int i=0; i<attmod.getSize(); i++) {
+        attmod.setObject(i,attmod.getAttribute().createDataForGeom(GISAttributeConstants.ATT_NATURE_PF,1),null);
+      }
       ret[0]=zligs;
     }
     
@@ -171,7 +176,7 @@
       }
       
       zdirs.addAllLineStringClosedOrNode(ldirs, null);
-      zdirs.setAttributes(new GISAttributeInterface[] { GISAttributeConstants.BATHY, GISAttributeConstants.TITRE}, null);
+      zdirs.setAttributes(new GISAttributeInterface[] { GISAttributeConstants.BATHY, GISAttributeConstants.TITRE, GISAttributeConstants.NATURE}, null);
       if(zdirs.getAttributeIsZ()!=null)
         zdirs.setAttributeIsZ(GISAttributeConstants.BATHY);
       zdirs.postImport(0);
@@ -181,6 +186,11 @@
       for (int i=0; i<namedirs.length; i++) {
         attmod.setObject(i,attmod.getAttribute().createDataForGeom(namedirs[i],1),null);
       }
+      // Affectation de l'attribut nature
+      attmod=zdirs.getModel(GISAttributeConstants.NATURE);
+      for (int i=0; i<attmod.getSize(); i++) {
+        attmod.setObject(i,attmod.getAttribute().createDataForGeom(GISAttributeConstants.ATT_NATURE_LD,1),null);
+      }
       ret[1]=zdirs;
     }
     return ret;

Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlWizardImportStepDestination.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlWizardImportStepDestination.java	2008-10-17 08:08:51 UTC (rev 4078)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlWizardImportStepDestination.java	2008-10-17 15:17:26 UTC (rev 4079)
@@ -208,10 +208,23 @@
         String value=_value.toString();
         if (_value==ModelTableImport.NEW_CALQUE||_value==ModelTableImport.NO_CALQUE)
           value=FSigLib.getS(value);
-        return new BuLabel(value);
+        BuLabel lbl =new BuLabel(value);
+        lbl.setHorizontalAlignment(BuLabel.CENTER);
+        return lbl;
       }
-      else
-        return new BuLabel(_value.toString());
+      else if (_column==1){
+        BuLabel lbl =new BuLabel(_value.toString());
+        lbl.setHorizontalAlignment(BuLabel.CENTER);
+        return  lbl;
+      }
+      else {
+        BuLabel lbl =new BuLabel(_value.toString());
+        lbl.setHorizontalAlignment(BuLabel.CENTER);
+        if(_isSelected){
+          lbl.setText("<html><b>"+lbl.getText()+"</b></html>");
+        }
+        return  lbl;
+      }
     }
   }
   
@@ -456,6 +469,8 @@
     pnInfo_.setSrc(data_);
     // Update du panel d'import
     table_.setModel(new ModelTableImport(generateTitleColumnTable(), generateDataTable()));
+    table_.getColumnModel().getColumn(0).setCellRenderer(new ImportTableRenderer());
+    table_.getColumnModel().getColumn(1).setCellRenderer(new ImportTableRenderer());
     table_.getColumnModel().getColumn(2).setCellRenderer(new ImportTableRenderer());
     table_.getColumnModel().getColumn(3).setCellRenderer(new ImportTableRenderer());
     ImportTableEditorForBCalqueSelection editor=new ImportTableEditorForBCalqueSelection();
@@ -531,7 +546,7 @@
   }
   
   protected void fillAttributsPanel(){
-    // Si rien n'est selectionn\xE9, on iter sur les lignes jusqu'\xE0 en trouver une ayant des truc amapper mapper
+    // Si rien n'est selectionn\xE9, on iter sur les lignes jusqu'\xE0 en trouver une ayant des truc a mapper
     if(table_.getSelectedRow()!=-1)
       generateMappingAttribute(table_.getSelectedRow());
     else{


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




2008	Jan	Feb	Mar	Apr	May	Jun (46)	Jul (37)	Aug (154)	Sep (140)	Oct (132)	Nov (104)	Dec (67)
2009	Jan (113)	Feb (73)	Mar (102)	Apr (106)	May (114)	Jun (67)	Jul (116)	Aug (48)	Sep (108)	Oct (296)	Nov (56)	Dec (53)
2010	Jan (95)	Feb (31)	Mar (40)	Apr (12)	May (10)	Jun (27)	Jul (19)	Aug (81)	Sep (48)	Oct (45)	Nov (40)	Dec (7)
2011	Jan (16)	Feb (32)	Mar (55)	Apr (38)	May (24)	Jun (37)	Jul (12)	Aug (16)	Sep (97)	Oct (90)	Nov (101)	Dec (89)
2012	Jan (18)	Feb (2)	Mar (54)	Apr (69)	May (97)	Jun (131)	Jul (70)	Aug (48)	Sep (48)	Oct (119)	Nov (194)	Dec (60)
2013	Jan (73)	Feb (35)	Mar (42)	Apr (28)	May (7)	Jun (17)	Jul (27)	Aug (10)	Sep (38)	Oct (12)	Nov (4)	Dec (16)
2014	Jan (33)	Feb (37)	Mar (19)	Apr (3)	May (47)	Jun (26)	Jul (22)	Aug	Sep (10)	Oct (30)	Nov (24)	Dec (19)
2015	Jan (13)	Feb (16)	Mar (36)	Apr (19)	May (5)	Jun (5)	Jul (3)	Aug (11)	Sep (22)	Oct (7)	Nov (14)	Dec
2016	Jan	Feb (26)	Mar (13)	Apr (61)	May	Jun	Jul (4)	Aug	Sep	Oct (27)	Nov (14)	Dec (21)
2017	Jan (30)	Feb (4)	Mar (3)	Apr (5)	May (69)	Jun (29)	Jul (1)	Aug	Sep	Oct	Nov	Dec

fudaa-svn-commit Mailing List for Fudaa (Page 181)

https://gitlab.com/fudaa

fudaa-svn-commit — svn commit with diffs