Changeset 3434 in Sophya for trunk/SophyaPI

Timestamp:

Dec 11, 2007, 3:51:49 PM (18 years ago)

Author:

ansari

Message:

Adaptation commande mollgrid aux nouvelles limites 0..360 degres, -90-90 degres , Reza 11/12/2007

File:

• trunk/SophyaPI/ProgPI/sopiamodule.cc (modified) (3 diffs)

trunk/SophyaPI/ProgPI/sopiamodule.cc

@@ -342 +342 @@
 hgrp = "SophyaCmd";
 
-kw = "mollgridsph";
-usage = "Creates a spherical coordinate grid in Molleweide projection ";
-usage += "\n Usage: mollgridsph NameSphericalMap [Nb_Parallel Nb_Meridien graphic_att] ";
-mpiac->RegisterCommand(kw, usage, this, hgrp);
-
 kw = "mollgrid";
 usage = "Creates a spherical coordinate grid in Molleweide projection ";
-usage += "\n Usage: mollgrid [Nb_Parallel Nb_Meridien graphic_att] ";
+usage += "\n Usage: mollgrid [Nb_Parallel] [Nb_Meridien] [graphic_att] ";
 mpiac->RegisterCommand(kw, usage, this, hgrp);
 
@@ -419 +414 @@
   Set_Project_Mol_DefVal(atof(tokens[0].c_str()) );
 }
-
-else if ( (kw == "mollgridsph") || (kw == "mollgrid") ) {
+// Grille de coordonnees en projection molleweide
+else if (kw == "mollgrid") {
    NamedObjMgr omg;
    MollweideGridDrawer * mollgrid = NULL;
    string dopt="";
-   if (kw == "mollgridsph") {
-     if (tokens.size() < 1) {
-       cout << "Usage: mollgridsph NameSphericalMap [Nb_Parallel Nb_Meridien graphic_att]"
-            << endl;
-       return(0);
-     }
-     int np = 5;
-     int nm = 5;
-     dopt = "same,thinline";
-     if (tokens.size() > 1)  np = atoi(tokens[1].c_str());
-     if (tokens.size() > 2)  nm = atoi(tokens[2].c_str());
-     if (tokens.size() > 3)  dopt = tokens[3];
-     NObjMgrAdapter* obja = omg.GetObjAdapter(tokens[0]);
-     if (obja == NULL) {
-       cout << "mollgridsph Error , No object with name " << tokens[0] << endl; 
-       return(0);
-     }
-     P2DArrayAdapter* arr = obja->Get2DArray(dopt);
-     if (arr == NULL) {
-       cout << "mollgridsph Error , object has non 2DArrayAdapter - Not a spherical map "
-            << endl;
-       return(0);       
-     }
-     int nx = arr->XSize();
-     int ny = arr->YSize();
-     delete arr;
-     mollgrid = new MollweideGridDrawer(np, nm, nx, ny);
-     cout << " mollgridsph: Creating MollweideGridDrawer() for object" << tokens[0] << endl;
-   }
-   else if (kw == "mollgrid") {
-     int np = 5;
-     int nm = 5;
-     if (tokens.size() > 0)  np = atoi(tokens[0].c_str());
-     if (tokens.size() > 1)  nm = atoi(tokens[1].c_str());
-     if (tokens.size() > 2)  dopt = tokens[2];
-     mollgrid = new MollweideGridDrawer(np, nm);
-     cout << " mollgrid: Creating MollweideGridDrawer(" << np << "," << nm << ")" << endl;
-   }
-
+   int np = 5;
+   int nm = 5;
+   if (tokens.size() > 0)  np = atoi(tokens[0].c_str());
+   if (tokens.size() > 1)  nm = atoi(tokens[1].c_str());
+   if (tokens.size() > 2)  dopt = tokens[2];
+   mollgrid = new MollweideGridDrawer(np, nm, 360., 180., 180., 0.);
+   cout << " mollgrid: Creating MollweideGridDrawer(" << np << "," << nm << ")" << endl;
+   
    if (mollgrid == NULL) {
      cout << "mollgridsph Error/BUG !!! mollgrid = NULL "  << endl; 
@@ -473 +437 @@
    string name = "mollgrid";
    wrsid = omg.GetImgApp()->DispScDrawer(mollgrid, name, dopt); 
- }
+}
+// Trace d'ellipse d'erreur 
 else if (kw == "errorellipse") {
   if ((tokens.size()<5) || ((tokens.size()>0)&&(tokens[0]=="-fill")&&(tokens.size()<6))) {