Changeset 13336


Ignore:
Timestamp:
2012-10-12T12:40:32+02:00 (12 years ago)
Author:
adeas31
Message:
  • Fix OMEdit for msl 3.2.1
File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/OMEdit/OMEditGUI/OMCProxy.cpp

    r12963 r13336  
    742742  QString versionStr = versionLst.empty() ? "" : versionLst.at(0);
    743743  Helper::OpenModelicaLibraryVersion = versionStr;
    744   double version = versionStr.toDouble();
    745 
    746   if (version >= 3.0 && version < 4.0) {
    747     /* adrpo: DO NOT DELETE Modeilca.Fluid anymore! deleteClass("Modelica.Fluid"); */
    748   } else if (!versionLst.empty()) {
    749     if (version < 2) sendCommand("setAnnotationVersion(\"1.x\")");
    750     else if (version < 3) sendCommand("setAnnotationVersion(\"2.x\")");
    751     QMessageBox::warning(mpParentMainWindow, Helper::applicationName + tr(" requires Modelica 3 annotations"),
    752                          tr("Modelica Standard Library version ") + versionStr + tr(" is unsupported."), Helper::ok);
     744  bool ok;
     745  double version = versionStr.toDouble(&ok);
     746  if (ok) {
     747    if (version >= 3.0 && version < 4.0) {
     748      /* adrpo: DO NOT DELETE Modeilca.Fluid anymore! deleteClass("Modelica.Fluid"); */
     749    } else if (!versionLst.empty()) {
     750      if (version < 2) sendCommand("setAnnotationVersion(\"1.x\")");
     751      else if (version < 3) sendCommand("setAnnotationVersion(\"2.x\")");
     752      QMessageBox::warning(mpParentMainWindow, Helper::applicationName + tr(" requires Modelica 3 annotations"),
     753                           tr("Modelica Standard Library version ") + versionStr + tr(" is unsupported."), Helper::ok);
     754    }
    753755  }
    754756}
Note: See TracChangeset for help on using the changeset viewer.