Changeset ddb7de2 in OpenModelica

Timestamp:

2016-04-01T15:39:36+02:00 (8 years ago)

Author:

Adeel Asghar <adeel.asghar@…>

Branches:

Added-citation-metadata, maintenance/v1.14, maintenance/v1.15, maintenance/v1.16, maintenance/v1.17, maintenance/v1.18, maintenance/v1.19, maintenance/v1.20, maintenance/v1.21, maintenance/v1.22, maintenance/v1.23, master, omlib-staging

Children:

bb3bd55b

Parents:

26abcb97

Message:

Do not interface as variable.
Already defined in basetyps.h in MinGW.

Location:

OMEdit/OMEditGUI

Files:

• Editors/MetaModelEditor.cpp (modified) (3 diffs)
• Editors/MetaModelEditor.h (modified) (1 diff)
• TLM/TLMCoSimulationThread.cpp (modified) (1 diff)

OMEdit/OMEditGUI/Editors/MetaModelEditor.cpp

@@ -553 +553 @@
  * \brief MetaModelEditor::getPositionAndRotationVectors
  * Extracts position and rotation vectors for specified TLM interface, both between CG and model X and between X and interface C
- * \param interface Interface on the form "submodel.interface"
+ * \param interfacePoint Interface on the form "submodel.interface"
  * \param CG_X_PHI_CG Rotation vector between CG abd X
  * \param X_C_PHI_X Rotation vector between X and C
@@ -560 +560 @@
  * \return
  */
-bool MetaModelEditor::getPositionAndRotationVectors(QString interface,
+bool MetaModelEditor::getPositionAndRotationVectors(QString interfacePoint,
                                                     QGenericMatrix<3,1,double> &CG_X_PHI_CG,
                                                     QGenericMatrix<3,1,double> &X_C_PHI_X,
@@ -567 +567 @@
 {
   //Extract submodel and interface names
-  QString modelName = interface.split(".").at(0);
-  QString interfaceName = interface.split(".").at(1);
+  QString modelName = interfacePoint.split(".").at(0);
+  QString interfaceName = interfacePoint.split(".").at(1);
 
   //Read positions and rotations from XML

OMEdit/OMEditGUI/Editors/MetaModelEditor.h

@@ -93 +93 @@
   XMLDocument mXmlDocument;
   QGenericMatrix<3,3,double> getRotationMatrix(QGenericMatrix<3,1,double> rotation);
-  bool getPositionAndRotationVectors(QString interface, QGenericMatrix<3,1,double> &CG_X_PHI_CG, QGenericMatrix<3,1,double> &X_C_PHI_X, QGenericMatrix<3,1,double> &CG_X_R_CG, QGenericMatrix<3,1,double> &X_C_R_X);
+  bool getPositionAndRotationVectors(QString interfacePoint, QGenericMatrix<3,1,double> &CG_X_PHI_CG, QGenericMatrix<3,1,double> &X_C_PHI_X,
+                                     QGenericMatrix<3,1,double> &CG_X_R_CG, QGenericMatrix<3,1,double> &X_C_R_X);
   bool interfacesAligned(QString interface1, QString interface2);
   bool fuzzyCompare(double p1, double p2);

OMEdit/OMEditGUI/TLM/TLMCoSimulationThread.cpp

@@ -77 +77 @@
   environment.insert("TLMPluginPath", tlmCoSimulationOptions.getTLMPluginPath());
   mpManagerProcess->setProcessEnvironment(environment);
-    // start the executable
+  // start the executable
   mpManagerProcess->start(fileName, args);
   emit sendManagerOutput(QString("%1 %2").arg(fileName).arg(args.join(" ")), StringHandler::OMEditInfo);