/[svn]/gigedit/trunk/src/gigedit/mainwindow.cpp
ViewVC logotype

Diff of /gigedit/trunk/src/gigedit/mainwindow.cpp

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 3158 by schoenebeck, Mon May 8 18:05:35 2017 UTC revision 3160 by schoenebeck, Mon May 8 21:31:45 2017 UTC
# Line 957  void MainWindow::onMacroSelected(int iMa Line 957  void MainWindow::onMacroSelected(int iMa
957    
958  void MainWindow::setupMacros() {  void MainWindow::setupMacros() {
959      MacrosSetup* setup = new MacrosSetup();      MacrosSetup* setup = new MacrosSetup();
960      setup->setMacros(m_macros);      gig::DimensionRegion* pDimRgn = m_DimRegionChooser.get_main_dimregion();
961        setup->setMacros(m_macros, &m_serializationArchive, pDimRgn);
962      setup->signal_macros_changed().connect(      setup->signal_macros_changed().connect(
963          sigc::mem_fun(*this, &MainWindow::onMacrosSetupChanged)          sigc::mem_fun(*this, &MainWindow::onMacrosSetupChanged)
964      );      );
# Line 3920  void MainWindow::applyMacro(Serializatio Line 3921  void MainWindow::applyMacro(Serializatio
3921      {      {
3922          gig::DimensionRegion* pDimRgn = *itDimReg;          gig::DimensionRegion* pDimRgn = *itDimReg;
3923          dimreg_to_be_changed_signal.emit(pDimRgn);          dimreg_to_be_changed_signal.emit(pDimRgn);
3924          m_serializationArchive.deserialize(pDimRgn);          macro.deserialize(pDimRgn);
3925          dimreg_changed_signal.emit(pDimRgn);          dimreg_changed_signal.emit(pDimRgn);
3926      }      }
3927      //region_changed()      //region_changed()

Legend:
Removed from v.3158  
changed lines
  Added in v.3160

  ViewVC Help
Powered by ViewVC