From: rnv <rnv@opencascade.com>
Date: Fri, 18 Aug 2017 15:29:09 +0000 (+0300)
Subject: Merge master branch into V9_dev
X-Git-Tag: V9_0_0~10
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=9cc7ec32c0e279567ed811e3645f6ba4bb012a7e;p=modules%2Fyacs.git

Merge master branch into V9_dev
---

9cc7ec32c0e279567ed811e3645f6ba4bb012a7e
diff --cc src/py2yacsgui/py2yacsgui.cxx
index 4d9ae26e3,c1f40633f..90f6f27e2
--- a/src/py2yacsgui/py2yacsgui.cxx
+++ b/src/py2yacsgui/py2yacsgui.cxx
@@@ -16,9 -16,9 +16,10 @@@
  //
  // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
  //
++
 +#include "RuntimeSALOME.hxx"
- #include "Py2YacsDialog.hxx"
+ #include "Py2YacsDialog_raw.hxx"
  #include <QApplication>
 -#include "RuntimeSALOME.hxx"
  #include "Proc.hxx"
  
  #include <iostream>
diff --cc src/py2yacsgui/py2yacsgui_rich.cxx
index 000000000,f31011c5b..6f1bf932a
mode 000000,100644..100644
--- a/src/py2yacsgui/py2yacsgui_rich.cxx
+++ b/src/py2yacsgui/py2yacsgui_rich.cxx
@@@ -1,0 -1,44 +1,44 @@@
+ // Copyright (C) 2016-2017  CEA/DEN, EDF R&D
+ //
+ // This library is free software; you can redistribute it and/or
+ // modify it under the terms of the GNU Lesser General Public
+ // License as published by the Free Software Foundation; either
+ // version 2.1 of the License, or (at your option) any later version.
+ //
+ // This library is distributed in the hope that it will be useful,
+ // but WITHOUT ANY WARRANTY; without even the implied warranty of
+ // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ // Lesser General Public License for more details.
+ //
+ // You should have received a copy of the GNU Lesser General Public
+ // License along with this library; if not, write to the Free Software
+ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+ //
+ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+ //
++#include "RuntimeSALOME.hxx"
+ #include "Py2YacsDialog.hxx"
+ #include <QApplication>
 -#include "RuntimeSALOME.hxx"
+ #include "Proc.hxx"
+ #include <PyEditor_StdSettings.h>
+ #include <iostream>
+ 
+ int main(int argc, char *argv[])
+ {
+   QApplication app(argc,argv);
+   app.setOrganizationName( "salome" );
+   app.setOrganizationDomain( "www.salome-platform.org" );
+   app.setApplicationName( "py2yacs" );
+ 
+   YACS::ENGINE::RuntimeSALOME::setRuntime();
+   Py2YacsDialog mygui;
+   if(mygui.exec())
+   {
+     std::cout << "Accepted:" << mygui.getYacsFile().toStdString() << std::endl;
+   }
+   else
+   {
+     std::cout << "Not accepted" << std::endl;
+   }
+   return 0;
+ }