- Removed plot2, plotparametric2 and the script files associated with…

… it.

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@11758 f25d12d1-65f4-0310-ae8a-bbce733d8d8e

Compiler/FrontEnd/ModelicaBuiltin.mo

@@ -1907,21 +1907,6 @@ external "builtin";
 annotation(preferredView="text");
 end plotAll;
 
-function plot2 "Uses the Java-based plot window (ptplot.jar) to launch a plot,
-  similar to the plot() command. This command accepts fewer options, but works
-  even when OpenModelica was not compiled with sendData support.
-  
-  Example command sequences:
-  simulate(A);plot2({x,y});
-  simulate(A,fileNamePrefix=\"B\");simulate(C);plot2(x,\"B.mat\");
-  "
-  input VariableNames vars;
-  input String fileName := "<default>";
-  output Boolean success "Returns true on success";
-external "builtin";
-annotation(preferredView="text");
-end plot2;
-
 function visualize "Uses the 3D visualization package, SimpleVisual.mo, to
   visualize the model. See chapter 3.4 (3D Animation) of the OpenModelica
   System Documentation for more details.
@@ -1939,20 +1924,6 @@ function visualize "Uses the 3D visualization package, SimpleVisual.mo, to
 annotation(preferredView="text");
 end visualize;
 
-function plotParametric2 "Plots the y-variables as a function of the x-variable.
-
-  Example command sequences:
-  simulate(A);plotParametric2(x,y);
-  simulate(A,fileNamePrefix=\"B\");simulate(C);plotParametric2(x,{y1,y2,y3},\"B.mat\");
-  "
-  input VariableName xVariable;
-  input VariableNames yVariables;
-  input String fileName := "<default>";
-  output Boolean success "Returns true on success";
-external "builtin";
-annotation(preferredView="text");
-end plotParametric2;
-
 function plotParametric "Launches a plotParametric window using OMPlot. Returns true on success.
   Don't require sendData support.
   

Compiler/Makefile.in

@@ -1,7 +1,7 @@
 #
 # Makefile for omc
 #
-# David Kågedal <x97davka@ida.liu.se>
+# David Kågedal <x97davka@ida.liu.se>
 #
 # $Id$
 #
@@ -34,7 +34,7 @@ PROG = omc
 PROGD = omcd
 PROGP = omcp
 
-SCRIPT_FILES = doPlot openmodelica.lefty convert_lines.pl default_profiling.xsl replace-startValue.sh replace-startValue.xsl
+SCRIPT_FILES = openmodelica.lefty convert_lines.pl default_profiling.xsl replace-startValue.sh replace-startValue.xsl
 
 #SUBDIRS= ast runtime
 SUBDIRS	= runtime modpar

Compiler/Script/CevalScript.mo

@@ -1841,29 +1841,6 @@ algorithm
         b = Config.getPlotSilent();
       then
         (cache,Values.BOOL(b),st);
-
-    case (cache,env,"plot2",{Values.ARRAY(valueLst = cvars),Values.STRING(filename)},st,msg)
-      equation
-        vars_1 = List.map(cvars, ValuesUtil.printCodeVariableName);
-        vars_2 = List.unionElt("time", vars_1);
-        (cache,filename) = cevalCurrentSimulationResultExp(cache,env,filename,st,msg);
-        value = ValuesUtil.readDataset(filename, vars_2, 0);
-        pwd = System.pwd();
-        cit = winCitation();
-        omhome = Settings.getInstallationDirectoryPath();
-        omhome_1 = System.trim(omhome, "\"");
-        pd = System.pathDelimiter();
-        plotCmd = stringAppendList({cit,omhome_1,pd,"share",pd,"omc",pd,"scripts",pd,"doPlot",cit});
-        uniqueStr = intString(tick());
-        tmpPlotFile = stringAppendList({pwd,pd,"tmpPlot_",uniqueStr,".plt"});
-        resI = ValuesUtil.writePtolemyplotDataset(tmpPlotFile, value, vars_2, "Plot by OpenModelica");
-        call = stringAppendList({cit,plotCmd," \"",tmpPlotFile,"\"",cit});
-
-        _ = System.systemCall(call);
-      then (cache,Values.BOOL(true),st);
-
-        // plot error
-    case (cache,env,"plot2",_,st,msg) then (cache,Values.BOOL(false),st);
 
     //plotAll(model)
     case (cache,env,"plotAll",
@@ -2266,32 +2243,6 @@ algorithm
         (cache,ValuesUtil.makeArray(vals),st);
 
     case (cache,env,"getNthImport",_,st,msg) then (cache,ValuesUtil.makeArray({}),st);
-
-        /* plotparametric This rule represents the normal case when an array of at least two elements
-         *  is given as an argument
-         */
-    case (cache,env,"plotParametric2",{cvar,Values.ARRAY(valueLst=cvars),Values.STRING(filename)},st,msg)
-      equation
-        vars_1 = List.map(cvar::cvars, ValuesUtil.printCodeVariableName);
-        length = listLength(vars_1);
-        (length > 1) = true;
-        (cache,filename) = cevalCurrentSimulationResultExp(cache,env,filename,st,msg);
-        value = ValuesUtil.readDataset(filename, vars_1, 0);
-        pwd = System.pwd();
-        cit = winCitation();
-        omhome = Settings.getInstallationDirectoryPath();
-        omhome_1 = System.trim(omhome, "\"");
-        pd = System.pathDelimiter();
-        plotCmd = stringAppendList({cit,omhome_1,pd,"share",pd,"omc",pd,"scripts",pd,"doPlot",cit});
-        uniqueStr = intString(tick());
-        tmpPlotFile = stringAppendList({pwd,pd,"tmpPlot_",uniqueStr,".plt"});
-        resI = ValuesUtil.writePtolemyplotDataset(tmpPlotFile, value, vars_1, "Plot by OpenModelica");
-        call = stringAppendList({cit,plotCmd," \"",tmpPlotFile,"\"",cit});
-        _ = System.systemCall(call);
-      then
-        (cache,Values.BOOL(true),st);
-
-    case (cache,env,"plotParametric2",_,st,msg) then (cache,Values.BOOL(false),st);
 
     // plotParametric
     case (cache,env,"plotParametric",