merge 6.0 into master 18/19918/1
Clément DAVID [Wed, 28 Mar 2018 08:28:19 +0000 (10:28 +0200)]
Change-Id: Iae721cc0ff5e01afda3037c48911d04fd3b8e121

23 files changed:
1  2 
scilab/modules/atoms/locales/atoms.pot
scilab/modules/cacsd/locales/cacsd.pot
scilab/modules/differential_equations/locales/differential_equations.pot
scilab/modules/graphics/locales/graphics.pot
scilab/modules/helptools/locales/helptools.pot
scilab/modules/m2sci/locales/m2sci.pot
scilab/modules/optimization/locales/optimization.pot
scilab/modules/scicos/locales/scicos.pot
scilab/modules/scicos/macros/scicos_scicos/mfrequ_clk.sci
scilab/modules/scicos/src/cpp/view_scilab/GraphicsAdapter.cpp
scilab/modules/scicos/src/cpp/view_scilab/ModelAdapter.cpp
scilab/modules/scicos/tests/unit_tests/model/Deep_cloning.dia.ref
scilab/modules/scicos/tests/unit_tests/model/Diagram.dia.ref
scilab/modules/scicos/tests/unit_tests/model/SuperBlock_in_SuperBlock.dia.ref
scilab/modules/scicos/tests/unit_tests/model/from_mlist.dia.ref
scilab/modules/scinotes/locales/scinotes.pot
scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/SciNotes.java
scilab/modules/signal_processing/locales/signal_processing.pot
scilab/modules/slint/locales/slint.pot
scilab/modules/umfpack/locales/umfpack.pot
scilab/modules/xcos/etc/Xcos-style.xml
scilab/modules/xcos/src/java/org/scilab/modules/xcos/io/ScilabTypeCoder.java
scilab/modules/xcos/src/java/org/scilab/modules/xcos/palette/PaletteCtrl.java

@@@ -133,13 -133,10 +133,13 @@@ public final class PaletteCtrl 
              }
  
              // add to the 'recently used blocks' panel
 -            PaletteManagerView.get().getPanel().addRecentltyUsedBlock(blockCtrl.getModel());
 +            PaletteManagerView pmv = PaletteManagerView.get();
 +            if (pmv != null) {
 +                pmv.getPanel().addRecentltyUsedBlock(blockCtrl.getModel());
 +            }
  
              // render and export it
-             final double margin = 15.0;
+             final double margin = internalGraph.getGridSize();
              basicBlock.getGeometry().setX(margin + BLOCK_POSITION.width * column);
              basicBlock.getGeometry().setY(margin + BLOCK_POSITION.height * row);
              ++column;