Merge branch 'master' into bugfix-1681-export-io-attributes

doc/Reference.tex

@@ -178,7 +178,7 @@ \subsection{copy}\label{Operation:copy} This just copies its input to its output
 \subsection{integrate $\int dt$}\label{IntOp}  Creates an integration (or stock)
 variable. Editable attributes include the variable's name and its
 initial value at $t=0$. The function to be integrated needs to be
-connected to the top port. The bottom port can optionally be connected
+connected to the top port, labelled `$f$'. The bottom port, labelled `0', can optionally be connected
 to a constant, parameter or variable, which is used to specify the
 initial value of the integral.
 

model/intOp.cc

@@ -75,9 +75,15 @@ namespace minsky
       if (textFlipped) cairo_rotate(cairo, M_PI);
       double sf = scaleFactor();  
       cairo_scale(cairo,sf,sf);		  
-      cairo_move_to(cairo,-7,4.5);
+      cairo_move_to(cairo,-7,3.5);
       cairo_show_text(cairo,"\xE2\x88\xAB");
-      cairo_show_text(cairo,"dt"); 
+      cairo_show_text(cairo,"dt");
+      // label the initial condition port
+      cairo_scale(cairo,0.5,0.5);
+      cairo_move_to(cairo,-19,19);
+      cairo_show_text(cairo,"0");
+      cairo_move_to(cairo,-19,-15);
+      cairo_show_text(cairo,"f");
       cairo_restore(cairo);
 
       int intVarWidth=0;

model/variable.cc

@@ -257,7 +257,7 @@ bool VariableBase::ioVar() const
 {return dynamic_cast<Group*>(controller.lock().get());}
 
 
-void VariableBase::ensureValueExists(VariableValue* vv, const std::string& nm) const
+void VariableBase::ensureValueExists(VariableValue* vv, const std::string&/* nm*/) const
 {	
   string valueId=this->valueId();
   // disallow blank names
@@ -267,14 +267,14 @@ void VariableBase::ensureValueExists(VariableValue* vv, const std::string& nm) c
       assert(isValueId(valueId));
       // Ensure value of variable is preserved after rename. 	      
       if (vv==nullptr)
-        minsky().variableValues.emplace(valueId,VariableValuePtr(type(), name(),"")).
-          first->second->m_scope=minsky::scope(group.lock(),name());
+        minsky().variableValues.emplace(valueId,VariableValuePtr(type(), m_name,"")).
+          first->second->m_scope=minsky::scope(group.lock(),m_name);
       // Ensure variable names are updated correctly everywhere they appear. 
       else
         {
           auto iter=minsky().variableValues.emplace(valueId,VariableValuePtr(type(),*vv)).first->second;
-          iter->name=nm;
-          iter->m_scope=minsky::scope(group.lock(),nm);
+          iter->name=m_name;
+          iter->m_scope=minsky::scope(group.lock(),m_name);
         }
 
     }

schema/schema3.cc

@@ -547,8 +547,8 @@ namespace schema3
         if (y.name) x1->table.title=*y.name;
         if (y.editorMode && *y.editorMode!=x1->editorMode())
           x1->toggleEditorMode();
-        if (y.variableDisplay && *y.variableDisplay!=x1->variableDisplay())
-          x1->toggleVariableDisplay();
+        if (y.variableDisplay)
+          SchemaHelper::setVariableDisplay(*x1, *y.variableDisplay);
         if (y.buttonDisplay && *y.buttonDisplay!=x1->buttonDisplay())
           x1->toggleButtons();
         if (y.currency) x1->currency=*y.currency;

schema/schemaHelper.h

@@ -76,6 +76,11 @@ namespace minsky
     {
       setPrivates(g.table, data, assetClass);
     }
+
+    static void setVariableDisplay(minsky::GodleyIcon& g, bool variableDisplay)
+    {
+      g.m_variableDisplay=variableDisplay;
+    }
 
     static void setStockAndFlow(minsky::GodleyIcon& g,
                          const minsky::GodleyIcon::Variables& flowVars,