Changeset 3448 in Sophya

Timestamp:

Jan 31, 2008, 7:16:49 PM (18 years ago)

Author:

ansari

Message:

1/ Ajout operations compactdim/compactalldim pour TArray (objaoper/PerformOperation())
2/ Changement du nom des macros declares par spiapp/c++exec

DispplayObj() -> DispObj() , ExecuteCommand() -> ExecCmd()

Reza 31/01/2008

Location:

trunk/SophyaPI/PIext

Files:

• cxxexecutor.cc (modified) (1 diff)
• nomtarradapter.cc (modified) (1 diff)

trunk/SophyaPI/PIext/cxxexecutor.cc

@@ -455 +455 @@
 
 os<<"//---- Macro Displaying objects and command execution"<<endl;
-os<<"#define DisplayObj(obj, att) Display_Object(obj, att, #obj); \n" << endl;
-os<<"#define ExecuteCommand(cmd) srvo.ExecuteCommand(cmd); \n" << endl;
+os<<"#define DispObj(obj, att) Display_Object(obj, att, #obj); \n" << endl;
+os<<"#define ExecCmd(cmd) srvo.ExecuteCommand(cmd); \n" << endl;
 
 return;

trunk/SophyaPI/PIext/nomtarradapter.cc

@@ -166 +166 @@
     if (ok) {
       string nslice;
-      if (opts.size() > 2)  nslice = opts[2];
+      if(opts.size() > 2)  nslice = opts[2];
       else nslice = buff;
       NamedObjMgr omg;
       omg.AddObj(slice, nslice, true); 
-      return 0;
-    }
-  }
-  
-  cout << "NOMAdapter_TArray<T>::PerformOperation(): Error operation/arguments !" << endl;
-  cout << "...Valid args: slicexy idxZ [slicename], sliceyz idxX [nm] slicexz idxY [nm]" << endl;
-  return 1; 
+    }
+    else delete slice;
+    return 0;
+  }
+  else if (opts.size() >= 1) {
+    if (opts[0] == "compactalldim") {
+      mArr->CompactAllDimensions();   ok = true;
+      cout << "PerformOperation(): mArr->CompactAllDimensions() " << endl;
+    }
+    else if (opts[0] == "compactdim") {
+      mArr->CompactTrailingDimensions();   ok = true;
+      cout << "PerformOperation(): mArr->CompactTrailingDimensions() " << endl;
+    }
+    else ok = false;
+    if (ok) return 0;
+  }
+
+  if (!ok) {
+    cout << "NOMAdapter_TArray<T>::PerformOperation(): Error operation/arguments !" << endl;
+    cout << "...Valid args: slicexy idxZ [slicename], sliceyz idxX [nm] slicexz idxY [nm]" << endl;
+    cout << "... compactdim (=CompactTrailingDimensions()), compactalldim (=CompactAllDimensions())" << endl;
+    return 1; 
+  }
 }