Merge branch 'master' of https://github.com/OpenModelica/OMEdit

OpenModelica · Jun 10, 2015 · 38edcd2 · 38edcd2
2 parents 305ac7d + 3c417a6
commit 38edcd2
Show file tree

Hide file tree

Showing 11 changed files with 22 additions and 8 deletions.
diff --git a/OMEdit/OMEditGUI/Modeling/ModelWidgetContainer.cpp b/OMEdit/OMEditGUI/Modeling/ModelWidgetContainer.cpp
@@ -418,7 +418,7 @@ bool GraphicsView::addComponent(QString className, QPointF position)
     // get the model defaultComponentName
     QString defaultName = pMainWindow->getOMCProxy()->getDefaultComponentName(className);
     if (defaultName.isEmpty()) {
-      name = getUniqueComponentName(name.toLower());
+      name = getUniqueComponentName(StringHandler::toCamelCase(name));
     } else {
       if (checkComponentName(defaultName)) {
         name = defaultName;

diff --git a/OMEdit/OMEditGUI/OMEditGUI.pro b/OMEdit/OMEditGUI/OMEditGUI.pro
@@ -123,9 +123,9 @@ SOURCES += main.cpp \
   Simulation/SimulationOutputHandler.cpp \
   TLM/FetchInterfaceDataDialog.cpp \
   TLM/FetchInterfaceDataThread.cpp \
-  Simulation/TLMCoSimulationDialog.cpp \
-  Simulation/TLMCoSimulationOutputWidget.cpp \
-  Simulation/TLMCoSimulationThread.cpp \
+  TLM/TLMCoSimulationDialog.cpp \
+  TLM/TLMCoSimulationOutputWidget.cpp \
+  TLM/TLMCoSimulationThread.cpp \
   FMI/ImportFMUDialog.cpp \
   Plotting/VariablesWidget.cpp \
   Options/NotificationsDialog.cpp \
@@ -187,10 +187,10 @@ HEADERS  += Util/Helper.h \
   Simulation/SimulationOutputHandler.h \
   TLM/FetchInterfaceDataDialog.h \
   TLM/FetchInterfaceDataThread.h \
-  Simulation/TLMCoSimulationOptions.h \
-  Simulation/TLMCoSimulationDialog.h \
-  Simulation/TLMCoSimulationOutputWidget.h \
-  Simulation/TLMCoSimulationThread.h \
+  TLM/TLMCoSimulationOptions.h \
+  TLM/TLMCoSimulationDialog.h \
+  TLM/TLMCoSimulationOutputWidget.h \
+  TLM/TLMCoSimulationThread.h \
   FMI/ImportFMUDialog.h \
   Plotting/VariablesWidget.h \
   Options/NotificationsDialog.h \

diff --git a/...tGUI/Simulation/TLMCoSimulationDialog.cpp → ...t/OMEditGUI/TLM/TLMCoSimulationDialog.cpp b/...tGUI/Simulation/TLMCoSimulationDialog.cpp → ...t/OMEditGUI/TLM/TLMCoSimulationDialog.cpp
diff --git a/...ditGUI/Simulation/TLMCoSimulationDialog.h → OMEdit/OMEditGUI/TLM/TLMCoSimulationDialog.h b/...ditGUI/Simulation/TLMCoSimulationDialog.h → OMEdit/OMEditGUI/TLM/TLMCoSimulationDialog.h
diff --git a/...itGUI/Simulation/TLMCoSimulationOptions.h → ...it/OMEditGUI/TLM/TLMCoSimulationOptions.h b/...itGUI/Simulation/TLMCoSimulationOptions.h → ...it/OMEditGUI/TLM/TLMCoSimulationOptions.h
diff --git a/...imulation/TLMCoSimulationOutputWidget.cpp → ...itGUI/TLM/TLMCoSimulationOutputWidget.cpp b/...imulation/TLMCoSimulationOutputWidget.cpp → ...itGUI/TLM/TLMCoSimulationOutputWidget.cpp
diff --git a/.../Simulation/TLMCoSimulationOutputWidget.h → ...EditGUI/TLM/TLMCoSimulationOutputWidget.h b/.../Simulation/TLMCoSimulationOutputWidget.h → ...EditGUI/TLM/TLMCoSimulationOutputWidget.h
diff --git a/...tGUI/Simulation/TLMCoSimulationThread.cpp → ...t/OMEditGUI/TLM/TLMCoSimulationThread.cpp b/...tGUI/Simulation/TLMCoSimulationThread.cpp → ...t/OMEditGUI/TLM/TLMCoSimulationThread.cpp
diff --git a/...ditGUI/Simulation/TLMCoSimulationThread.h → OMEdit/OMEditGUI/TLM/TLMCoSimulationThread.h b/...ditGUI/Simulation/TLMCoSimulationThread.h → OMEdit/OMEditGUI/TLM/TLMCoSimulationThread.h
diff --git a/OMEdit/OMEditGUI/Util/StringHandler.cpp b/OMEdit/OMEditGUI/Util/StringHandler.cpp
@@ -1482,3 +1482,16 @@ QString StringHandler::makeClassNameRelative(QString draggedClassName, QString d
     return draggedClassName;
   }
 }
+
+/*!
+ * \brief StringHandler::toCamelCase
+ * Converts the string to camel case.
+ * \param str
+ * \return the string converted to camel case.
+ */
+QString StringHandler::toCamelCase(QString str)
+{
+  QString s = str;
+  s[0] = s[0].toLower();
+  return s;
+}
diff --git a/OMEdit/OMEditGUI/Util/StringHandler.h b/OMEdit/OMEditGUI/Util/StringHandler.h
@@ -148,6 +148,7 @@ class StringHandler : public QObject
   static QString getSimulationMessageTypeString(StringHandler::SimulationMessageType type);
   static QColor getSimulationMessageTypeColor(StringHandler::SimulationMessageType type);
   static QString makeClassNameRelative(QString draggedClassName, QString droppedClassName);
+  static QString toCamelCase(QString str);
 protected:
   static QString mLastOpenDir;
 };