-# Copyright (C) 2007-2011 CEA/DEN, EDF R&D
+# Copyright (C) 2007-2012 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
-# Copyright (C) 2007-2011 CEA/DEN, EDF R&D
+# Copyright (C) 2007-2012 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
-// Copyright (C) 2007-2011 CEA/DEN, EDF R&D
+// Copyright (C) 2007-2012 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
-# Copyright (C) 2007-2011 CEA/DEN, EDF R&D
+# Copyright (C) 2007-2012 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
-# Copyright (C) 2007-2011 CEA/DEN, EDF R&D
+# Copyright (C) 2007-2012 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
-# Copyright (C) 2007-2011 CEA/DEN, EDF R&D
+# Copyright (C) 2007-2012 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
-# Copyright (C) 2007-2011 CEA/DEN, EDF R&D
+# Copyright (C) 2007-2012 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
-# Copyright (C) 2007-2011 CEA/DEN, EDF R&D
+# Copyright (C) 2007-2012 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
-# Copyright (C) 2007-2011 CEA/DEN, EDF R&D
+# Copyright (C) 2007-2012 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
-# Copyright (C) 2007-2011 CEA/DEN, EDF R&D
+# Copyright (C) 2007-2012 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
-# Copyright (C) 2007-2011 CEA/DEN, EDF R&D
+# Copyright (C) 2007-2012 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
-# Copyright (C) 2007-2011 CEA/DEN, EDF R&D
+# Copyright (C) 2007-2012 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
-# Copyright (C) 2007-2011 CEA/DEN, EDF R&D
+# Copyright (C) 2007-2012 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
#!/bin/sh
-# Copyright (C) 2007-2011 CEA/DEN, EDF R&D
+# Copyright (C) 2007-2012 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
-@REM Copyright (C) 2007-2011 CEA/DEN, EDF R&D
+@REM Copyright (C) 2007-2012 CEA/DEN, EDF R&D
@REM
@REM This library is free software; you can redistribute it and/or
@REM modify it under the terms of the GNU Lesser General Public
#!/bin/bash
-# Copyright (C) 2007-2011 CEA/DEN, EDF R&D
+# Copyright (C) 2007-2012 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
#!/bin/bash
-# Copyright (C) 2007-2011 CEA/DEN, EDF R&D
+# Copyright (C) 2007-2012 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
#!/bin/bash
-# Copyright (C) 2007-2011 CEA/DEN, EDF R&D
+# Copyright (C) 2007-2012 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
# Author : Vadim SANDLER, Open CASCADE S.A.S (vadim.sandler@opencascade.com)
# ---
#
-AC_INIT([Salome2 Project GHS3DPRLPLUGIN module], [6.4.0], [webmaster.salome@opencascade.com], [SalomeGHS3DPRLPLUGIN])
+AC_INIT([Salome2 Project GHS3DPRLPLUGIN module], [6.5.0], [webmaster.salome@opencascade.com], [SalomeGHS3DPRLPLUGIN])
AC_CONFIG_AUX_DIR(adm_local/unix/config_files)
AC_CANONICAL_HOST
AC_CANONICAL_TARGET
-# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
-# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
-# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
-# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
-#
-# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
-# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
-#
-# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
padding: 5px 5px 5px 10px;
}
+.title {
+ font-size: 150%;
+ font-weight: bold;
+ margin: 10px 2px;
+}
+
dl
{
padding: 0 0 0 10px;
</div>
<div class="footer1">
<div style="text-align: center;">
- Copyright © 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE<br>
+ Copyright © 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE<br>
Copyright © 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS<br>
</div>
</div>
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
<title>$title</title>
<link href="$relpath$tabs.css" rel="stylesheet" type="text/css"/>
-<link href="$relpath$search/search.css" rel="stylesheet" type="text/css"/>
-<script type="text/javascript" src="$relpath$search/search.js"></script>
-<link href="$relpath$navtree.css" rel="stylesheet" type="text/css"/>
-<script type="text/javascript" src="$relpath$jquery.js"></script>
-<script type="text/javascript" src="$relpath$navtree.js"></script>
-<script type="text/javascript" src="$relpath$resize.js"></script>
+$treeview
+$search
+$mathjax
<script type="text/javascript">
$(document).ready(initResizable);
</script>
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
<title>$title</title>
<link href="$relpath$tabs.css" rel="stylesheet" type="text/css"/>
-<link href="$relpath$search/search.css" rel="stylesheet" type="text/css"/>
-<script type="text/javascript" src="$relpath$search/search.js"></script>
-<link href="$relpath$navtree.css" rel="stylesheet" type="text/css"/>
-<script type="text/javascript" src="$relpath$jquery.js"></script>
-<script type="text/javascript" src="$relpath$navtree.js"></script>
-<script type="text/javascript" src="$relpath$resize.js"></script>
+$treeview
+$search
+$mathjax
<script type="text/javascript">
$(document).ready(initResizable);
</script>
-# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
-// Copyright (C) 2007-2011 CEA/DEN, EDF R&D
+// Copyright (C) 2007-2012 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
-# Copyright (C) 2007-2011 CEA/DEN, EDF R&D
+# Copyright (C) 2007-2012 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
BASEIDL_FILES = GHS3DPRLPlugin_Algorithm.idl
+BASEIDL_FILES_PY=$(BASEIDL_FILES:%.idl=%_idl.py)
+
# This variable defines the files to be installed
dist_salomeidl_DATA = $(BASEIDL_FILES)
$(OMNIORB_IDL) $(IDLPYFLAGS) -C$(DESTDIR)$(salomepythondir) $$file ; \
done
-# uninstall-local removes too much, but it works in distcheck
+# we want to remove only staff generated for IDL files and nothing more
uninstall-local:
- rm -rf $(DESTDIR)$(salomepythondir)/*
+ @for modulen in GHS3DPRLPlugin ; do \
+ test -d $(DESTDIR)$(salomepythondir)/$${modulen} && echo "Removing $(DESTDIR)$(salomepythondir)/$${modulen}" && rm -rf $(DESTDIR)$(salomepythondir)/$${modulen} ; \
+ test -d $(DESTDIR)$(salomepythondir)/$${modulen}__POA && echo "Removing $(DESTDIR)$(salomepythondir)/$${modulen}__POA" && rm -rf $(DESTDIR)$(salomepythondir)/$${modulen}__POA ; \
+ done ; \
+ for filen in $(BASEIDL_FILES_PY) ; do \
+ echo "Removing $(DESTDIR)$(salomepythondir)/$${filen}" && rm -f $(DESTDIR)$(salomepythondir)/$${filen}* ; \
+ done
mostlyclean-local:
-rm -f *.hh *.cc .depidl
<?xml version='1.0' encoding='us-ascii'?>
<!DOCTYPE meshers PUBLIC "" "desktop.dtd">
<!--
- Copyright (C) 2004-2011 CEA/DEN, EDF R&D
+ Copyright (C) 2004-2012 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
-# Copyright (C) 2007-2011 CEA/DEN, EDF R&D
+# Copyright (C) 2007-2012 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
<!--
- Copyright (C) 2004-2011 CEA/DEN, EDF R&D
+ Copyright (C) 2004-2012 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
-# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012 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
#
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
#
-#
from smesh import Mesh_Algorithm, AssureGeomPublished
--- /dev/null
+// Copyright (C) 2004-2012 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.
+//
+// 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
+//
+
+//=============================================================================
+// File : GHS3DPlugin_Defs.hxx
+// Author : Alexander A. BORODIN
+//
+#ifndef _GHS3DPRLPlugin_DEFS_HXX_
+#define _GHS3DPRLPlugin_DEFS_HXX_
+
+#ifdef WIN32
+ #if defined GHS3DPRLPLUGIN_EXPORTS || defined GHS3DPRLEngine_EXPORTS
+ #define GHS3DPRLPLUGIN_EXPORT __declspec( dllexport )
+ #else
+ #define GHS3DPRLPLUGIN_EXPORT __declspec( dllimport )
+ #endif
+#else
+ #define GHS3DPRLPLUGIN_EXPORT
+#endif
+
+#endif
-// Copyright (C) 2007-2011 CEA/DEN, EDF R&D
+// Copyright (C) 2007-2012 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
ofstream theFile;
theFile.open(namefile.ToCString(),ios::out);
#ifdef WIN32
- Ok=theFile->is_open();
+ Ok = theFile.is_open();
#else
Ok=theFile.rdbuf()->is_open();
#endif
removeFile(namefile);
theFile.open(namefile.ToCString(),ios::out);
#ifdef WIN32
- Ok=theFile->is_open();
+ Ok=theFile.is_open();
#else
Ok=theFile.rdbuf()->is_open();
#endif
int line = 1, EndOfFile = 0, nbElem = 0, nField = 10, nbRef = 0, aGHS3DPRLNodeID = 0;
const char * theField;
- const char * tabField [nField];
- int tabRef [nField];
+ vector<const char*> tabField = vector<const char*>(nField);
+ vector<int> tabRef = vector<int>(nField);
tabField[0] = "MeshVersionFormatted"; tabRef[0] = 0;
tabField[1] = "Dimension"; tabRef[1] = 0;
if ( strcmp(theField, "Vertices") == 0 ) {
int aGHS3DPRLID;
- double coord[nbRef];
+ vector<double> coord = vector<double>(nbRef);
SMDS_MeshNode * aGHS3DPRLNode;
for ( int iElem = 0; iElem < nbElem; iElem++ ) {
}
}
else {
- const SMDS_MeshNode * node[nbRef];
+ vector<const SMDS_MeshNode*> node = vector<const SMDS_MeshNode*>(nbRef);
SMDS_MeshElement* aGHS3DPRLElement;
map <int,const SMDS_MeshNode*>::iterator itOnGHS3DPRLNode;
-// Copyright (C) 2007-2011 CEA/DEN, EDF R&D
+// Copyright (C) 2007-2012 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
#ifndef _GHS3DPRLPlugin_GHS3DPRL_HXX_
#define _GHS3DPRLPlugin_GHS3DPRL_HXX_
+#include "GHS3DPRLPlugin_Defs.hxx"
+
#include "SMESH_3D_Algo.hxx"
#include "SMESH_Mesh.hxx"
#include "Utils_SALOME_Exception.hxx"
class SMESH_Mesh;
class GHS3DPRLPlugin_Hypothesis;
-class GHS3DPRLPlugin_GHS3DPRL: public SMESH_3D_Algo
+class GHS3DPRLPLUGIN_EXPORT GHS3DPRLPlugin_GHS3DPRL: public SMESH_3D_Algo
{
public:
GHS3DPRLPlugin_GHS3DPRL(int hypId, int studyId, SMESH_Gen* gen);
-// Copyright (C) 2007-2011 CEA/DEN, EDF R&D
+// Copyright (C) 2007-2012 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
-// Copyright (C) 2007-2011 CEA/DEN, EDF R&D
+// Copyright (C) 2007-2012 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
#ifndef _GHS3DPRLPlugin_GHS3DPRL_I_HXX_
#define _GHS3DPRLPlugin_GHS3DPRL_I_HXX_
+#include "GHS3DPRLPlugin_Defs.hxx"
+
#include <SALOMEconfig.h>
#include CORBA_SERVER_HEADER(GHS3DPRLPlugin_Algorithm)
#include CORBA_SERVER_HEADER(SALOME_Exception)
// ======================================================
// GHS3DPRL 3d algorithm
// ======================================================
-class GHS3DPRLPlugin_GHS3DPRL_i:
+class GHS3DPRLPLUGIN_EXPORT GHS3DPRLPlugin_GHS3DPRL_i:
public virtual POA_GHS3DPRLPlugin::GHS3DPRLPlugin_GHS3DPRL,
public virtual SMESH_3D_Algo_i
{
-// Copyright (C) 2007-2011 CEA/DEN, EDF R&D
+// Copyright (C) 2007-2012 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
for (int i = 0, j = 0; i < len; i++)
{
- ushort ucs = (ushort)(str1[i]);
+ unsigned short ucs = (unsigned short)(str1[i]);
if ((9 <= ucs && ucs <= 13) || ucs == 32)
{
if (!del)
-// Copyright (C) 2007-2011 CEA/DEN, EDF R&D
+// Copyright (C) 2007-2012 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
#ifndef _GHS3DPRLPlugin_Hypothesis_HXX_
#define _GHS3DPRLPlugin_Hypothesis_HXX_
+#include "GHS3DPRLPlugin_Defs.hxx"
+
#include "SMESH_Hypothesis.hxx"
#include "Utils_SALOME_Exception.hxx"
// Parameters for work of GHS3DPRL
//
-class GHS3DPRLPlugin_Hypothesis: public SMESH_Hypothesis
+class GHS3DPRLPLUGIN_EXPORT GHS3DPRLPlugin_Hypothesis: public SMESH_Hypothesis
{
public:
-// Copyright (C) 2007-2011 CEA/DEN, EDF R&D
+// Copyright (C) 2007-2012 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
-// Copyright (C) 2007-2011 CEA/DEN, EDF R&D
+// Copyright (C) 2007-2012 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
#ifndef _GHS3DPRLPlugin_Hypothesis_i_HXX_
#define _GHS3DPRLPlugin_Hypothesis_i_HXX_
+#include "GHS3DPRLPlugin_Defs.hxx"
+
#include <SALOMEconfig.h>
#include CORBA_SERVER_HEADER(GHS3DPRLPlugin_Algorithm)
// GHS3DPRLPlugin parameters hypothesis
-class GHS3DPRLPlugin_Hypothesis_i:
+class GHS3DPRLPLUGIN_EXPORT GHS3DPRLPlugin_Hypothesis_i:
public virtual POA_GHS3DPRLPlugin::GHS3DPRLPlugin_Hypothesis,
public virtual SMESH_Hypothesis_i
{
-// Copyright (C) 2007-2011 CEA/DEN, EDF R&D
+// Copyright (C) 2007-2012 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
// Author : Christian VAN WAMBEKE (CEA) (from Hexotic plugin Lioka RAZAFINDRAZAKA)
// ---
//
+#include "GHS3DPRLPlugin_Defs.hxx"
#include "SMESH_Hypothesis_i.hxx"
#include "utilities.h"
extern "C"
{
- GenericHypothesisCreator_i* GetHypothesisCreator (const char* aHypName)
+
+ GHS3DPRLPLUGIN_EXPORT GenericHypothesisCreator_i* GetHypothesisCreator (const char* aHypName);
+
+ GHS3DPRLPLUGIN_EXPORT GenericHypothesisCreator_i* GetHypothesisCreator (const char* aHypName)
{
MESSAGE("GetHypothesisCreator " << aHypName);
-# Copyright (C) 2007-2011 CEA/DEN, EDF R&D
+# Copyright (C) 2007-2012 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
lib_LTLIBRARIES = libGHS3DPRLEngine.la
dist_libGHS3DPRLEngine_la_SOURCES = \
- GHS3DPRLPlugin_GHS3DPRL.hxx \
- GHS3DPRLPlugin_GHS3DPRL.cxx \
+ GHS3DPRLPlugin_Defs.hxx \
+ GHS3DPRLPlugin_GHS3DPRL.hxx \
+ GHS3DPRLPlugin_GHS3DPRL.cxx \
GHS3DPRLPlugin_GHS3DPRL_i.hxx \
GHS3DPRLPlugin_GHS3DPRL_i.cxx \
GHS3DPRLPlugin_Hypothesis.hxx \
libGHS3DPRLEngine_la_LDFLAGS = \
../../idl/libSalomeIDLGHS3DPRLPLUGIN.la \
- $(SMESH_LDFLAGS) -lSMESHimpl -lSMESHEngine -lStdMeshersEngine \
- $(KERNEL_LDFLAGS) -lSalomeGenericObj
+ $(SMESH_LDFLAGS) -lSMESHimpl -lSMESHEngine -lStdMeshersEngine \
+ $(KERNEL_LDFLAGS) -lSalomeGenericObj -lSALOMELocalTrace \
+ $(MED_LDFLAGS) -lSalomeIDLMED \
+ $(CAS_LDFLAGS) -lTKBRep -lTKG3d -lTKTopAlgo\
+ $(SMESH_LDFLAGS) -lSMDS -lSMESHDS -lTKG2d
# Scripts to be installed.
dist_salomescript_DATA= GHS3DPRLPluginDC.py
-# Copyright (C) 2007-2011 CEA/DEN, EDF R&D
+# Copyright (C) 2007-2012 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
-// Copyright (C) 2007-2011 CEA/DEN, EDF R&D
+// Copyright (C) 2007-2012 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
//=============================================================================
extern "C"
{
- SMESHGUI_GenericHypothesisCreator* GetHypothesisCreator( const QString& aHypType )
+ GHS3DPRLPLUGINGUI_EXPORT SMESHGUI_GenericHypothesisCreator* GetHypothesisCreator( const QString& aHypType )
{
SMESHGUI_GenericHypothesisCreator* aCreator = NULL;
if( aHypType=="GHS3DPRL_Parameters" )
-// Copyright (C) 2007-2011 CEA/DEN, EDF R&D
+// Copyright (C) 2007-2012 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
: SMESHGUI_GenericHypothesisCreator( theHypType ),
myIs3D( true )
{
+ printf("Hypo creator !!!!!!!!!!!!!!!!!!!!!!!!!! RNV");
}
GHS3DPRLPluginGUI_HypothesisCreator::~GHS3DPRLPluginGUI_HypothesisCreator()
-// Copyright (C) 2007-2011 CEA/DEN, EDF R&D
+// Copyright (C) 2007-2012 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
#ifndef GHS3DPRLPLUGINGUI_HypothesisCreator_H
#define GHS3DPRLPLUGINGUI_HypothesisCreator_H
+#ifdef WIN32
+ #if defined GHS3DPRLPluginGUI_EXPORTS
+ #define GHS3DPRLPLUGINGUI_EXPORT __declspec( dllexport )
+ #else
+ #define GHS3DPRLPLUGINGUI_EXPORT __declspec( dllimport )
+ #endif
+#else
+ #define GHS3DPRLPLUGINGUI_EXPORT
+#endif
+
+
#include <SMESHGUI_Hypotheses.h>
class QtxIntSpinBox;
/*!
* \brief Class for creation of GHS3DPRL hypotheses
*/
-class GHS3DPRLPluginGUI_HypothesisCreator : public SMESHGUI_GenericHypothesisCreator
+class GHS3DPRLPLUGINGUI_EXPORT GHS3DPRLPluginGUI_HypothesisCreator : public SMESHGUI_GenericHypothesisCreator
{
Q_OBJECT
-# Copyright (C) 2007-2011 CEA/DEN, EDF R&D
+# Copyright (C) 2007-2012 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
-I$(top_builddir)/idl
libGHS3DPRLPluginGUI_la_LDFLAGS = \
+ $(QT_LIBS) \
../GHS3DPRLPlugin/libGHS3DPRLEngine.la \
${SMESH_LDFLAGS} -lSMESH \
- $(CAS_KERNEL)
+ $(CAS_KERNEL) \
+ $(GUI_LDFLAGS) -lsuit -lqtx -lSalomeApp
# resources files
nodist_salomeres_DATA = \
-# Copyright (C) 2007-2011 CEA/DEN, EDF R&D
+# Copyright (C) 2007-2012 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
-// Copyright (C) 2007-2011 CEA/DEN, EDF R&D
+// Copyright (C) 2007-2012 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
-// Copyright (C) 2007-2011 CEA/DEN, EDF R&D
+// Copyright (C) 2007-2012 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
-// Copyright (C) 2007-2011 CEA/DEN, EDF R&D
+// Copyright (C) 2007-2012 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
#include <libxml/parser.h>
#include <libxml/xpath.h>
#include <libxml/xpathInternals.h>
+#ifdef WIN32
+#include <io.h>
+#include <windows.h>
+#include <time.h>
+#define F_OK 0
+#undef max
+#undef min
+#endif
#include <QFile>
#include <QRegExp>
//Description tag
node = xmlNewChild(root_node,0, BAD_CAST "description",0);
xmlNewProp(node, BAD_CAST "what", BAD_CAST "tetrahedral mesh by tepal");
+#ifdef WIN32
+ SYSTEMTIME present;
+ GetLocalTime ( &present );
+ sprintf(buff,"%04d/%02d/%02d %02dh%02dm",
+ present.wYear,present.wMonth,present.wDay,
+ present.wHour,present.wMinute);
+#else
time_t present;
time(&present);
struct tm *time_asc = localtime(&present);
sprintf(buff,"%04d/%02d/%02d %02dh%02dm",
time_asc->tm_year+1900,time_asc->tm_mon+1,time_asc->tm_mday,
time_asc->tm_hour,time_asc->tm_min);
+#endif
xmlNewProp(node, BAD_CAST "when", BAD_CAST buff);
xmlNewProp(node, BAD_CAST "from", BAD_CAST "tepal2med");
cmd=pathini+casename+"_skin.med";
int ret = access(cmd.toLatin1().constData(),F_OK); //on regarde si le fichier existe
if (ret >= 0) {
- cmd="cp "+pathini+casename+"_skin.med "+tmp;
+#ifdef WIN32
+ cmd="copy ";
+#else
+ cmd="cp ";
+#endif
+ cmd = cmd+pathini+casename+"_skin.med "+tmp;
//std::cout<<"Copy skin.med Command = "<<cmd<<std::endl;
system(cmd.toLatin1().constData());
if (verbose>0) std::cout<<"CreateMEDFile for initial skin <"<<tmp.toLatin1().constData()<<">\n"; }
return ires;
}
-
-// Copyright (C) 2007-2011 CEA/DEN, EDF R&D
+// Copyright (C) 2007-2012 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
-// Copyright (C) 2007-2011 CEA/DEN, EDF R&D
+// Copyright (C) 2007-2012 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
-// Copyright (C) 2007-2011 CEA/DEN, EDF R&D
+// Copyright (C) 2007-2012 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
-// Copyright (C) 2007-2011 CEA/DEN, EDF R&D
+// Copyright (C) 2007-2012 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
#include <iostream>
#include <sstream>
#include <fstream>
+#include <vector>
#include <qstring.h>
#include "ghs3dprl_msg_parser.h"
#include "dlg_ghs3dmain.h"
+#ifdef WIN32
+#include <io.h>
+#include <windows.h>
+#define F_OK 0
+#endif
+
//#include "MEDMEM_Exception.hxx"
//#include "MEDMEM_define.hxx"
med_bool tran;
//version qt3
- char chaine[nomfilemed.length()+1];
+ char* chaine = (char*)malloc((nomfilemed.length()+1)*sizeof(char));
strncpy(chaine,nomfilemed.toLatin1().constData(),nomfilemed.length()+1);
//std::cout<<"*** ReadFileMED *** "<<chaine<<"\n";
fid=ouvre_fichier_MED(chaine,mymailw->verbose);
+ free(chaine);
if (fid == 0) {
std::cerr<<"Problem opening file "<<nomfilemed.toLatin1().constData()<<"\n";
return false;
return false;
}
-med_int famdelete[nfam],ifamdelete=0,idelete;
+med_int ifamdelete=0,idelete;
+std::vector<med_int> famdelete = std::vector<med_int>(nfam);
{
med_int ngro;
char *gro;
"\n --deletegroups=\""<<deletegroups.toLatin1().constData()<<"\"\n";
//utile si appel par plugin ghs3dprl sur big meshes et tepal sur plusieurs jours
+#ifndef WIN32
if (background=="yes"){
pid_t pid = fork();
if (pid > 0) {
setsid();
system("sleep 10"); //for debug
}
+#else
+ printf("background mode is not supported on win32 platform !\n");
+#endif
//"tepal -f exemple1 -n 4"
if (launchtepal=="yes"){
-# Copyright (C) 2007-2011 CEA/DEN, EDF R&D
+# Copyright (C) 2007-2012 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
#!/usr/bin/env python
# -*- coding: utf-8 -*-
-# Copyright (C) 2007-2011 CEA/DEN, EDF R&D
+# Copyright (C) 2007-2012 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
#!/usr/bin/env python
# -*- coding: utf-8 -*-
-# Copyright (C) 2007-2011 CEA/DEN, EDF R&D
+# Copyright (C) 2007-2012 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
