Changeset 148 in flair-src for trunk/lib/FlairFilter

Timestamp:

Feb 28, 2017, 4:18:13 PM (8 years ago)

Author:

Sanahuja Guillaume

Message:

m

Location:

trunk/lib/FlairFilter/src

Files:

• ButterworthLowPass_impl.cpp (modified) (1 diff)
• ControlLaw.cpp (modified) (1 diff)
• EulerDerivative_impl.cpp (modified) (2 diffs)
• JoyReference_impl.cpp (modified) (1 diff)
• LowPassFilter_impl.cpp (modified) (2 diffs)
• PidThrust_impl.cpp (modified) (1 diff)
• Pid_impl.cpp (modified) (1 diff)
• TrajectoryGenerator1D_impl.cpp (modified) (1 diff)
• TrajectoryGenerator2DCircle_impl.cpp (modified) (1 diff)
• X4X8Multiplex_impl.cpp (modified) (1 diff)

trunk/lib/FlairFilter/src/ButterworthLowPass_impl.cpp

@@ -42 +42 @@
   desc->SetElementName(0, 0, "output");
   output = new cvmatrix(self, desc, floatType, name);
-
-  output->SetValue(0, 0, 0);
+  delete desc;
 
   f = new PoleFilter(order);

trunk/lib/FlairFilter/src/ControlLaw.cpp

@@ -41 +41 @@
     }
     output = new cvmatrix(this, desc, floatType, name);
+    delete desc;
   }
 

trunk/lib/FlairFilter/src/EulerDerivative_impl.cpp

@@ -44 +44 @@
     }
     output = new cvmatrix(self, desc,init_value->GetDataType().GetElementDataType(), name);
+    delete desc;
     for (int i = 0; i < init_value->Rows(); i++) {
       for (int j = 0; j < init_value->Cols(); j++) {
@@ -54 +55 @@
     desc->SetElementName(0, 0, "output");
     output = new cvmatrix(self, desc, floatType, name);
-    output->SetValue(0, 0, 0);
+    delete desc;
   }
   

trunk/lib/FlairFilter/src/JoyReference_impl.cpp

@@ -49 +49 @@
   desc->SetElementName(3, 0, "trim_pitch");
   output = new cvmatrix(self, desc, floatType, name);
+  delete desc;
 
   reglages_groupbox = new GroupBox(position, name);

trunk/lib/FlairFilter/src/LowPassFilter_impl.cpp

@@ -51 +51 @@
       }
     }
+    delete desc;
   } else {
     // if NULL, assume dimension 1, and init=0
@@ -56 +57 @@
     desc->SetElementName(0, 0, "output");
     output = new cvmatrix(self, desc, floatType, name);
-    output->SetValue(0, 0, 0);
+    delete desc;
   }
 

trunk/lib/FlairFilter/src/PidThrust_impl.cpp

@@ -45 +45 @@
   desc->SetElementName(4, 0, "p+i+d+offset");
   state = new cvmatrix(self, desc, floatType, name);
+  delete desc;
 
   GroupBox *reglages_groupbox = new GroupBox(position, name);

trunk/lib/FlairFilter/src/Pid_impl.cpp

@@ -42 +42 @@
   desc->SetElementName(3, 0, "p+i+d");
   state = new cvmatrix(self, desc, floatType, name);
+  delete desc;
 
   GroupBox *reglages_groupbox = new GroupBox(position, name);

trunk/lib/FlairFilter/src/TrajectoryGenerator1D_impl.cpp

@@ -64 +64 @@
   desc->SetElementName(1, 0, "vel");
   output = new cvmatrix(self, desc, floatType, name);
+  delete desc;
 
   output->SetValue(0, 0, pos);

trunk/lib/FlairFilter/src/TrajectoryGenerator2DCircle_impl.cpp

@@ -57 +57 @@
   desc->SetElementName(1, 1, "vel.y");
   output = new cvmatrix(self, desc, floatType, name);
-
-  output->SetValue(0, 0, 0);
-  output->SetValue(0, 1, 0);
-  output->SetValue(1, 0, 0);
-  output->SetValue(1, 1, 0);
+  delete desc;
 }
 

trunk/lib/FlairFilter/src/X4X8Multiplex_impl.cpp

@@ -56 +56 @@
 
   output = new cvmatrix(self, desc, floatType);
-
+  delete desc;
   self->AddDataToLog(output);
 }