Move the instance api flag from command line to options (#10280)

Fixes #10272

Author: adeas31

OMEdit/OMEditGUI/main.cpp

@@ -133,7 +133,6 @@ void printOMEditUsage()
 {
   printf("Usage: OMEdit --Debug=true|false] [files]\n");
   printf("    --Debug=[true|false]        Enables the debugging features like QUndoView, diffModelicaFileListings view. Default is false.\n");
-  printf("    --NAPI=[true|false]         Enables the use of new json based api. Default is false.\n");
   printf("    files                       List of Modelica files(*.mo) to open.\n");
 }
 

OMEdit/OMEditLIB/Element/ElementProperties.cpp

@@ -197,7 +197,7 @@ Parameter::Parameter(ModelInstance::Component *pComponent, ElementParameters *pE
     }
   } else if (mpModelInstanceComponent->getModel() && mpModelInstanceComponent->getModel()->isEnumeration()) {
     mValueType = Parameter::Enumeration;
-  } else if (OptionsDialog::instance()->getGeneralSettingsPage()->getReplaceableSupport() && mpModelInstanceComponent->getPrefixes()->getReplaceable()) {
+  } else if (mpModelInstanceComponent->getPrefixes()->getReplaceable()) {
     // replaceable component or short element definition
     if (mpModelInstanceComponent->getModel()) {
       mValueType = Parameter::ReplaceableClass;

OMEdit/OMEditLIB/OMEditApplication.cpp

@@ -108,7 +108,6 @@ OMEditApplication::OMEditApplication(int &argc, char **argv, threadData_t* threa
   setlocale(LC_NUMERIC, "C");
   // if user has requested to open the file by passing it in argument then,
   bool debug = false;
-  bool newApi = false;
   QString fileName = "";
   QStringList fileNames, invalidFlags;
   if (arguments().size() > 1 && !testsuiteRunning) {
@@ -121,14 +120,6 @@ OMEditApplication::OMEditApplication(int &argc, char **argv, threadData_t* threa
         } else {
           debug = false;
         }
-      } else if (strncmp(arguments().at(i).toUtf8().constData(), "--NAPI=",7) == 0) {
-        QString napiArg = arguments().at(i);
-        napiArg.remove("--NAPI=");
-        if (0 == strcmp("true", napiArg.toUtf8().constData())) {
-          newApi = true;
-        } else {
-          newApi = false;
-        }
       } else {
         fileName = arguments().at(i);
         if (!fileName.isEmpty()) {
@@ -151,7 +142,6 @@ OMEditApplication::OMEditApplication(int &argc, char **argv, threadData_t* threa
   // MainWindow Initialization
   MainWindow *pMainwindow = MainWindow::instance();
   pMainwindow->setDebug(debug);
-  pMainwindow->setNewApi(newApi);
   pMainwindow->setTestsuiteRunning(testsuiteRunning);
   pMainwindow->setUpMainWindow(threadData);
   if (pMainwindow->getExitApplicationStatus()) {        // if there is some issue in running the application.

OMEdit/OMEditLIB/Options/OptionsDefaults.h

@@ -66,6 +66,7 @@ namespace OptionsDefaults
     int recentFilesAndLatestNewsSize = 15;
     bool replaceableSupport = false;
     bool enableNewInstantiationAPI = true;
+    bool enableInstanceAPI = false;
   }
 
   namespace Libraries {

OMEdit/OMEditLIB/Options/OptionsDialog.cpp

@@ -314,6 +314,13 @@ void OptionsDialog::readGeneralSettings()
   } else {
     mpGeneralSettingsPage->getEnableNewInstantiationAPICheckBox()->setChecked(OptionsDefaults::GeneralSettings::enableNewInstantiationAPI);
   }
+  // read instance API
+  if (mpSettings->contains("simulation/instanceAPI")) {
+    mpGeneralSettingsPage->getEnableInstanceAPICheckBox()->setChecked(mpSettings->value("simulation/instanceAPI").toBool());
+  } else {
+    mpGeneralSettingsPage->getEnableInstanceAPICheckBox()->setChecked(OptionsDefaults::GeneralSettings::enableInstanceAPI);
+  }
+  MainWindow::instance()->setNewApi(mpGeneralSettingsPage->getEnableInstanceAPICheckBox()->isChecked());
 }
 
 //! Reads the Libraries section settings from omedit.ini
@@ -1703,6 +1710,13 @@ void OptionsDialog::saveGeneralSettings()
   } else {
     mpSettings->setValue("replaceableSupport", replaceableSupport);
   }
+  // save instance API
+  bool enableInstanceAPI = mpGeneralSettingsPage->getEnableInstanceAPICheckBox()->isChecked();
+  if (enableInstanceAPI == OptionsDefaults::GeneralSettings::enableInstanceAPI) {
+    mpSettings->remove("simulation/instanceAPI");
+  } else {
+    mpSettings->setValue("simulation/instanceAPI", enableInstanceAPI);
+  }
 }
 
 /*!
@@ -3702,11 +3716,15 @@ GeneralSettingsPage::GeneralSettingsPage(OptionsDialog *pOptionsDialog)
   /* Enable new instantiation use in OMC API */
   mpEnableNewInstantiationAPICheckBox = new QCheckBox(tr("Enable new frontend use in the OMC API (faster GUI response)"));
   mpEnableNewInstantiationAPICheckBox->setChecked(OptionsDefaults::GeneralSettings::enableNewInstantiationAPI);
+  // Enable instance api
+  mpEnableInstanceAPICheckBox = new QCheckBox(tr("Enable instance API *"));
+  mpEnableInstanceAPICheckBox->setChecked(OptionsDefaults::GeneralSettings::enableInstanceAPI);
   // Optional Features Layout
   QGridLayout *pOptionalFeaturesLayout = new QGridLayout;
   pOptionalFeaturesLayout->setAlignment(Qt::AlignTop | Qt::AlignLeft);
   pOptionalFeaturesLayout->addWidget(mpReplaceableSupport, 0, 0);
   pOptionalFeaturesLayout->addWidget(mpEnableNewInstantiationAPICheckBox, 1, 0);
+  pOptionalFeaturesLayout->addWidget(mpEnableInstanceAPICheckBox, 2, 0);
   mpOptionalFeaturesGroupBox->setLayout(pOptionalFeaturesLayout);
   // set the layout
   QVBoxLayout *pMainLayout = new QVBoxLayout;

OMEdit/OMEditLIB/Options/OptionsDialog.h

@@ -293,6 +293,7 @@ class GeneralSettingsPage : public QWidget
   void setReplaceableSupport(bool value) {mpReplaceableSupport->setChecked(value);}
   bool getReplaceableSupport() {return mpReplaceableSupport->isChecked();}
   QCheckBox* getEnableNewInstantiationAPICheckBox() {return mpEnableNewInstantiationAPICheckBox;}
+  QCheckBox* getEnableInstanceAPICheckBox() {return mpEnableInstanceAPICheckBox;}
 private:
   OptionsDialog *mpOptionsDialog;
   QGroupBox *mpGeneralSettingsGroupBox;
@@ -334,6 +335,7 @@ class GeneralSettingsPage : public QWidget
   QGroupBox *mpOptionalFeaturesGroupBox;
   QCheckBox *mpReplaceableSupport;
   QCheckBox *mpEnableNewInstantiationAPICheckBox;
+  QCheckBox *mpEnableInstanceAPICheckBox;
 public slots:
   void selectWorkingDirectory();
   void selectTerminalCommand();