Revision: 77977
http://sourceforge.net/p/brlcad/code/77977
Author: starseeker
Date: 2020-12-16 14:47:25 +0000 (Wed, 16 Dec 2020)
Log Message:
-----------
Merge from trunk - r77945 through r77974 (last commit was only partial)
Modified Paths:
--------------
brlcad/branches/extbuild/misc/repoconv/github_ci_actions.yml
brlcad/branches/extbuild/src/external/Creo/creo-brl.h
brlcad/branches/extbuild/src/external/Creo/csg.cpp
brlcad/branches/extbuild/src/external/Creo/shim.cpp
brlcad/branches/extbuild/src/external/Creo/shim.h
brlcad/branches/extbuild/src/external/Creo/util.cpp
Property Changed:
----------------
brlcad/branches/extbuild/
Index: brlcad/branches/extbuild
===================================================================
--- brlcad/branches/extbuild 2020-12-16 14:46:16 UTC (rev 77976)
+++ brlcad/branches/extbuild 2020-12-16 14:47:25 UTC (rev 77977)
Property changes on: brlcad/branches/extbuild
___________________________________________________________________
Modified: svn:mergeinfo
## -11,4 +11,4 ##
/brlcad/branches/osg:62110-62113
/brlcad/branches/prep-cache:68236-68933
/brlcad/branches/tcltk86:68300-75257
-/brlcad/trunk:77547-77956
\ No newline at end of property
+/brlcad/trunk:77547-77974
\ No newline at end of property
Modified: brlcad/branches/extbuild/misc/repoconv/github_ci_actions.yml
===================================================================
--- brlcad/branches/extbuild/misc/repoconv/github_ci_actions.yml
2020-12-16 14:46:16 UTC (rev 77976)
+++ brlcad/branches/extbuild/misc/repoconv/github_ci_actions.yml
2020-12-16 14:47:25 UTC (rev 77977)
@@ -34,7 +34,7 @@
- name: Configure
run: |
- cmake -S . -B build -G Ninja -D CMAKE_C_COMPILER="cl.exe" -D
CMAKE_CXX_COMPILER="cl.exe" -D ENABLE_ALL=ON -D CMAKE_BUILD_TYPE=Release
+ cmake -S . -B build -G Ninja -D CMAKE_C_COMPILER="cl.exe" -D
CMAKE_CXX_COMPILER="cl.exe" -D ENABLE_ALL=ON -D CMAKE_BUILD_TYPE=Release
-DEXT_BUILD_VERBOSE=ON
#cmake -S . -B build -D ENABLE_ALL=ON
powershell Write-VolumeCache C
powershell Write-VolumeCache D
@@ -69,7 +69,7 @@
- name: Configure
run: |
export PATH=$ENV{GITHUB_WORKSPACE}:$PATH
- cmake -S . -G Ninja -B build -D ENABLE_ALL=ON -D
CMAKE_BUILD_TYPE=Release
+ cmake -S . -G Ninja -B build -D ENABLE_ALL=ON -D
CMAKE_BUILD_TYPE=Release -DEXT_BUILD_VERBOSE=ON
- name: Build
run: |
@@ -102,7 +102,7 @@
export PATH=$ENV{GITHUB_WORKSPACE}:$PATH
export CC=clang
export CXX=clang++
- cmake -S . -G Ninja -B build -D ENABLE_ALL=ON -D
CMAKE_BUILD_TYPE=Release
+ cmake -S . -G Ninja -B build -D ENABLE_ALL=ON -D
CMAKE_BUILD_TYPE=Release -DEXT_BUILD_VERBOSE=ON
- name: Build
run: |
Modified: brlcad/branches/extbuild/src/external/Creo/creo-brl.h
===================================================================
--- brlcad/branches/extbuild/src/external/Creo/creo-brl.h 2020-12-16
14:46:16 UTC (rev 77976)
+++ brlcad/branches/extbuild/src/external/Creo/creo-brl.h 2020-12-16
14:47:25 UTC (rev 77977)
@@ -45,6 +45,7 @@
#include <ProArray.h>
#include <ProAsmcomppath.h>
#include <ProAssembly.h>
+#include <ProElement.h>
#include <ProFaminstance.h>
#include <ProFeatType.h>
#include <ProHole.h>
Modified: brlcad/branches/extbuild/src/external/Creo/csg.cpp
===================================================================
--- brlcad/branches/extbuild/src/external/Creo/csg.cpp 2020-12-16 14:46:16 UTC
(rev 77976)
+++ brlcad/branches/extbuild/src/external/Creo/csg.cpp 2020-12-16 14:47:25 UTC
(rev 77977)
@@ -51,120 +51,70 @@
return PRO_TK_NO_ERROR;
}
+
extern "C" ProError
hole_elem_visit(ProElement UNUSED(elem_tree), ProElement elem, ProElempath
UNUSED(elem_path), ProAppData data)
{
- ProError ret;
- ProElemId elem_id;
- ProValue val_junk;
- ProValueData val;
+ ProError err;
+ ProElemId elemid;
+ ProValueDataType data_type;
+
struct hole_info *hinfo = (struct hole_info *)data;
- if ((ret = ProElementIdGet(elem, &elem_id)) != PRO_TK_NO_ERROR) return ret;
-
- switch (elem_id) {
- case PRO_E_HLE_ADD_CBORE:
- if ((ret = ProElementValueGet(elem, &val_junk)) != PRO_TK_NO_ERROR)
return ret;
- if ((ret = ProValueDataGet(val_junk, &val)) != PRO_TK_NO_ERROR)
return ret;
- hinfo->add_cbore = val.v.i;
- break;
- case PRO_E_HLE_ADD_CSINK:
- if ((ret = ProElementValueGet(elem, &val_junk)) != PRO_TK_NO_ERROR)
return ret;
- if ((ret = ProValueDataGet(val_junk, &val)) != PRO_TK_NO_ERROR)
return ret;
- hinfo->add_csink = val.v.i;
- break;
- case PRO_E_DIAMETER:
- /* diameter of straight hole */
- if ((ret = ProElementValueGet(elem, &val_junk)) != PRO_TK_NO_ERROR)
return ret;
- if ((ret = ProValueDataGet(val_junk, &val)) != PRO_TK_NO_ERROR)
return ret;
- hinfo->hole_diam = val.v.d;
- break;
- case PRO_E_HLE_HOLEDIAM:
- /* diameter of main portion of standard drilled hole */
- if ((ret = ProElementValueGet(elem, &val_junk)) != PRO_TK_NO_ERROR)
return ret;
- if ((ret = ProValueDataGet(val_junk, &val)) != PRO_TK_NO_ERROR)
return ret;
- hinfo->hole_diam = val.v.d;
- break;
- case PRO_E_HLE_CBOREDEPTH:
- /* depth of counterbore */
- if ((ret = ProElementValueGet(elem, &val_junk)) != PRO_TK_NO_ERROR)
return ret;
- if ((ret = ProValueDataGet(val_junk, &val)) != PRO_TK_NO_ERROR)
return ret;
- hinfo->cb_depth = val.v.d;
- break;
- case PRO_E_HLE_CBOREDIAM:
- /* diameter of counterbore */
- if ((ret = ProElementValueGet(elem, &val_junk)) != PRO_TK_NO_ERROR)
return ret;
- if ((ret = ProValueDataGet(val_junk, &val)) != PRO_TK_NO_ERROR)
return ret;
- hinfo->cb_diam = val.v.d;
- break;
- case PRO_E_HLE_CSINKANGLE:
- /* angle of countersink (degrees) */
- if ((ret = ProElementValueGet(elem, &val_junk)) != PRO_TK_NO_ERROR)
return ret;
- if ((ret = ProValueDataGet(val_junk, &val)) != PRO_TK_NO_ERROR)
return ret;
- hinfo->cs_angle = val.v.d;
- break;
- case PRO_E_HLE_CSINKDIAM:
- /* diameter of countersink */
- if ((ret = ProElementValueGet(elem, &val_junk)) != PRO_TK_NO_ERROR)
return ret;
- if ((ret = ProValueDataGet(val_junk, &val)) != PRO_TK_NO_ERROR)
return ret;
- hinfo->cs_diam = val.v.d;
- break;
- case PRO_E_HLE_DRILLDEPTH:
- /* overall depth of standard drilled hole without drill tip */
- if ((ret = ProElementValueGet(elem, &val_junk)) != PRO_TK_NO_ERROR)
return ret;
- if ((ret = ProValueDataGet(val_junk, &val)) != PRO_TK_NO_ERROR)
return ret;
- hinfo->hole_depth = val.v.d;
- break;
- case PRO_E_HLE_DRILLANGLE:
- /* drill tip angle (degrees) */
- if ((ret = ProElementValueGet(elem, &val_junk)) != PRO_TK_NO_ERROR)
return ret;
- if ((ret = ProValueDataGet(val_junk, &val)) != PRO_TK_NO_ERROR)
return ret;
- hinfo->drill_angle = val.v.d;
- break;
- case PRO_E_HLE_DEPTH:
- if ((ret = ProElementValueGet(elem, &val_junk)) != PRO_TK_NO_ERROR)
return ret;
- if ((ret = ProValueDataGet(val_junk, &val)) != PRO_TK_NO_ERROR)
return ret;
- hinfo->hole_depth_type = val.v.i;
- break;
- case PRO_E_HLE_TYPE_NEW:
- if ((ret = ProElementValueGet(elem, &val_junk)) != PRO_TK_NO_ERROR)
return ret;
- if ((ret = ProValueDataGet(val_junk, &val)) != PRO_TK_NO_ERROR)
return ret;
- hinfo->hole_type = val.v.i;
- break;
- case PRO_E_HLE_STAN_TYPE:
- if ((ret = ProElementValueGet(elem, &val_junk)) != PRO_TK_NO_ERROR)
return ret;
- if ((ret = ProValueDataGet(val_junk, &val)) != PRO_TK_NO_ERROR)
return ret;
- break;
- case PRO_E_STD_EDGE_CHAMF_DIM1:
- if ((ret = ProElementValueGet(elem, &val_junk)) != PRO_TK_NO_ERROR)
return ret;
- if ((ret = ProValueDataGet(val_junk, &val)) != PRO_TK_NO_ERROR)
return ret;
- break;
- case PRO_E_STD_EDGE_CHAMF_DIM2:
- if ((ret = ProElementValueGet(elem, &val_junk)) != PRO_TK_NO_ERROR)
return ret;
- if ((ret = ProValueDataGet(val_junk, &val)) != PRO_TK_NO_ERROR)
return ret;
- break;
- case PRO_E_STD_EDGE_CHAMF_ANGLE:
- if ((ret = ProElementValueGet(elem, &val_junk)) != PRO_TK_NO_ERROR)
return ret;
- if ((ret = ProValueDataGet(val_junk, &val)) != PRO_TK_NO_ERROR)
return ret;
- break;
- case PRO_E_STD_EDGE_CHAMF_DIM:
- if ((ret = ProElementValueGet(elem, &val_junk)) != PRO_TK_NO_ERROR)
return ret;
- if ((ret = ProValueDataGet(val_junk, &val)) != PRO_TK_NO_ERROR)
return ret;
- break;
- case PRO_E_STD_EDGE_CHAMF_SCHEME:
- if ((ret = ProElementValueGet(elem, &val_junk)) != PRO_TK_NO_ERROR)
return ret;
- if ((ret = ProValueDataGet(val_junk, &val)) != PRO_TK_NO_ERROR)
return ret;
- break;
- case PRO_E_EXT_DEPTH_FROM_VALUE:
- if ((ret = ProElementValueGet(elem, &val_junk)) != PRO_TK_NO_ERROR)
return ret;
- if ((ret = ProValueDataGet(val_junk, &val)) != PRO_TK_NO_ERROR)
return ret;
- break;
- case PRO_E_EXT_DEPTH_TO_VALUE:
- if ((ret = ProElementValueGet(elem, &val_junk)) != PRO_TK_NO_ERROR)
return ret;
- if ((ret = ProValueDataGet(val_junk, &val)) != PRO_TK_NO_ERROR)
return ret;
- break;
- }
-
+ if ((err = ProElementValuetypeGet(elem, &data_type)) != PRO_TK_NO_ERROR)
return err;
+
+ switch (data_type) {
+ case PRO_VALUE_TYPE_INT: /* integer data
type */
+ int intval;
+ if ((err = ProElementIntegerGet(elem, NULL, &intval)) !=
PRO_TK_NO_ERROR) return err;
+ if ((err = ProElementIdGet(elem, &elemid)) !=
PRO_TK_NO_ERROR) return err;
+ switch (elemid) {
+ case PRO_E_HLE_ADD_CBORE: /* add counterbore
*/
+ hinfo->add_cbore = intval;
+ break;
+ case PRO_E_HLE_ADD_CSINK: /* add countersink
*/
+ hinfo->add_csink = intval;
+ break;
+ case PRO_E_HLE_DEPTH: /* hole depth */
+ hinfo->hole_depth_type = intval;
+ break;
+ case PRO_E_HLE_TYPE_NEW: /* hole type */
+ hinfo->hole_type = intval;
+ break;
+ }
+ break;
+ case PRO_VALUE_TYPE_DOUBLE: /* double data type
*/
+ double dblval;
+ if ((err = ProElementDoubleGet(elem, NULL, &dblval)) !=
PRO_TK_NO_ERROR) return err;
+ if ((err = ProElementIdGet(elem, &elemid)) !=
PRO_TK_NO_ERROR) return err;
+ switch (elemid) {
+ case PRO_E_DIAMETER: /* hole diameter */
+ hinfo->hole_diam = dblval;
+ break;
+ case PRO_E_HLE_CBOREDEPTH: /* counterbore
depth */
+ hinfo->cb_depth = dblval;
+ break;
+ case PRO_E_HLE_CBOREDIAM: /* counterbore
diameter */
+ hinfo->cb_diam = dblval;
+ break;
+ case PRO_E_HLE_CSINKANGLE: /* countersink
angle (deg) */
+ hinfo->cs_angle = dblval;
+ break;
+ case PRO_E_HLE_CSINKDIAM: /* countersink
diameter */
+ hinfo->cs_diam = dblval;
+ break;
+ case PRO_E_HLE_DRILLANGLE: /* drill tip angle
(deg) */
+ hinfo->drill_angle = dblval;
+ break;
+ case PRO_E_HLE_DRILLDEPTH: /* drill depth w/o
tip */
+ hinfo->hole_depth = dblval;
+ break;
+ case PRO_E_HLE_HOLEDIAM: /* hole diameter */
+ hinfo->hole_diam = dblval;
+ break;
+ }
+ break;
+ }
return PRO_TK_NO_ERROR;
}
@@ -245,7 +195,7 @@
hinfo->diameter = pinfo->diameter;
/* Do a more detailed characterization of the hole elements */
- if ((ret=ProFeatureElemtreeCreate(hinfo->feat, &elem_tree )) ==
PRO_TK_NO_ERROR ) {
+ if ((ret=ProFeatureElemtreeExtract(hinfo->feat, NULL,
PRO_FEAT_EXTRACT_NO_OPTS, &elem_tree )) == PRO_TK_NO_ERROR ) {
if ((ret=ProElemtreeElementVisit( elem_tree, elem_path,
hole_elem_filter, hole_elem_visit, (ProAppData)hinfo)) != PRO_TK_NO_ERROR ) {
if ( ProElementFree( &elem_tree ) != PRO_TK_NO_ERROR ) {fprintf(
stderr, "Error freeing element tree\n" );}
BU_PUT(hinfo, struct hole_info);
Modified: brlcad/branches/extbuild/src/external/Creo/shim.cpp
===================================================================
--- brlcad/branches/extbuild/src/external/Creo/shim.cpp 2020-12-16 14:46:16 UTC
(rev 77976)
+++ brlcad/branches/extbuild/src/external/Creo/shim.cpp 2020-12-16 14:47:25 UTC
(rev 77977)
@@ -29,12 +29,16 @@
extern "C" int ProCmdActionAdd(const
char*,int(*)(int,int*,void*),int,int(*)(int),int,int,int*) {return 0;}
extern "C" int ProDimensionTypeGet(void**,int*) {return 0;}
extern "C" int ProDimensionValueGet(void**,double *) {return 0;}
+extern "C" int ProElementDoubleGet(void*,void*,double*) {return 0;}
extern "C" int ProElementFree(void**) {return 0;}
extern "C" int ProElementIdGet(void*,int*) {return 0;}
+extern "C" int ProElementIntegerGet(void*,void*,int*) {return 0;}
extern "C" int ProElementValueGet(void*,void**) {return 0;}
+extern "C" int ProElementValuetypeGet(void*,int*) {return 0;}
extern "C" int ProElemtreeElementVisit(void*,void*,int
(*)(void*,void*,void*,void*),int (*)(void*,void*,void*,void*),void*) {return 0;}
extern "C" int ProFeatureDimensionVisit(ProFeature *,int (*)(void* *,int
,void*),int (*)(void**,void*),void*) {return 0;}
extern "C" int ProFeatureElemtreeCreate(ProFeature *,void**) {return 0;}
+extern "C" int ProFeatureElemtreeExtract(ProFeature *,void*,int,void**)
{return 0;}
extern "C" int ProFeatureGeomitemVisit(ProFeature *,int,int
(*)(void**,int,void*),int (*)(void**,void*),void*) {return 0;}
extern "C" int ProFeatureInit(void*,int,ProFeature*) {return 0;}
extern "C" int ProFeatureResume(void*,int*,int,void*,int) {return 0;}
@@ -54,6 +58,7 @@
extern "C" int ProMessageDisplay(wchar_t *,const char *,const char *) {return
0;}
extern "C" int ProParameterInit(void *,wchar_t *,void *) {return 0;}
extern "C" int ProParameterValueGet(ProParameter *,void *) {return 0;}
+extern "C" int ProParameterValueWithUnitsGet(ProParameter *,void *,void *)
{return 0;}
extern "C" int ProParameterVisit (void **, void*,int
(*)(ProParameter*,int,void*),void *) {return 0;}
extern "C" int ProParamvalueTypeGet(void **,void *) {return 0;}
extern "C" int ProParamvalueValueGet(void **,int,void *) {return 0;}
Modified: brlcad/branches/extbuild/src/external/Creo/shim.h
===================================================================
--- brlcad/branches/extbuild/src/external/Creo/shim.h 2020-12-16 14:46:16 UTC
(rev 77976)
+++ brlcad/branches/extbuild/src/external/Creo/shim.h 2020-12-16 14:47:25 UTC
(rev 77977)
@@ -99,6 +99,9 @@
#define PRO_PARAM_INTEGER 79
#define PRO_PARAM_BOOLEAN 80
#define PRO_PARAM_DOUBLE 81
+#define PRO_VALUE_TYPE_INT 82
+#define PRO_VALUE_TYPE_DOUBLE 83
+#define PRO_FEAT_EXTRACT_NO_OPTS 84
typedef int ProBool;
typedef int ProBoolean;
@@ -118,6 +121,7 @@
typedef int ProSurfaceOrient;
typedef int ProType;
typedef int ProUIMessageButton;
+typedef int ProValueDataType;
typedef int uiCmdAccessMode;
typedef int uiCmdAccessState;
typedef int uiCmdCmdId;
@@ -177,7 +181,6 @@
extern "C" int ProArraySizeGet(ProArray,int*);
extern "C" int ProAsmcompMdlGet(ProFeature*,void**);
extern "C" int ProAsmcompMdlNameGet(ProFeature*,int*,wchar_t*);
-extern "C" int ProAsmcompMdlNameGet(ProFeature*,int*,wchar_t*);
extern "C" int ProAsmcomppathInit(void*,ProIdTable,int,void**);
extern "C" int ProAsmcomppathTrfGet(void**,int,ProMatrix);
extern "C" int ProAssemblyIsExploded(void*,int*);
@@ -185,12 +188,16 @@
extern "C" int ProCmdActionAdd(const
char*,int(*)(int,int*,void*),int,int(*)(int),int,int,int*);
extern "C" int ProDimensionTypeGet(void**,int*);
extern "C" int ProDimensionValueGet(void**,double *);
+extern "C" int ProElementDoubleGet(void*,void*,double*);
extern "C" int ProElementFree(void**);
extern "C" int ProElementIdGet(void*,int*);
+extern "C" int ProElementIntegerGet(void*,void*,int*);
extern "C" int ProElementValueGet(void*,void**);
+extern "C" int ProElementValuetypeGet(void*,int*);
extern "C" int ProElemtreeElementVisit(void*,void*,int
(*)(void*,void*,void*,void*),int (*)(void*,void*,void*,void*),void*);
extern "C" int ProFeatureDimensionVisit(ProFeature *,int (*)(void* *,int
,void*),int (*)(void**,void*),void*);
extern "C" int ProFeatureElemtreeCreate(ProFeature *,void**);
+extern "C" int ProFeatureElemtreeExtract(ProFeature *,void*,int,void**);
extern "C" int ProFeatureGeomitemVisit(ProFeature *,int,int
(*)(void**,int,void*),int (*)(void**,void*),void*);
extern "C" int ProFeatureInit(void*,int,ProFeature*);
extern "C" int ProFeatureResume(void*,int*,int,void*,int);
@@ -210,6 +217,7 @@
extern "C" int ProMessageDisplay(wchar_t *,const char *,const char *);
extern "C" int ProParameterInit(void *,wchar_t *,void *);
extern "C" int ProParameterValueGet(ProParameter *,void *);
+extern "C" int ProParameterValueWithUnitsGet(ProParameter *,void *,void *);
extern "C" int ProParameterVisit (void **, void*,int
(*)(ProParameter*,int,void*),void *);
extern "C" int ProParamvalueTypeGet(void **,void *);
extern "C" int ProParamvalueValueGet(void **,int,void *);
@@ -248,6 +256,7 @@
extern "C" void
ProContourEdgeVisit(void*,void*,int(*)(void*,int,void*),int(*)(void*,void*),void*);
extern "C" void ProContourTraversalGet(void*,int*);
extern "C" void ProMdlIsSkeleton(void*, int*);
+extern "C" void ProMdlMdlNameGet(void*,int*,wchar_t*);
extern "C" void ProMdlMdlnameGet(void*,wchar_t*);
extern "C" void ProMessageClear();
extern "C" void ProPartTessellationFree(ProSurfaceTessellationData**);
@@ -261,6 +270,6 @@
extern "C" void ProUIMessageDialogDisplay(int,const wchar_t *,const wchar_t
*,ProUIMessageButton*,int,ProUIMessageButton*);
extern "C" void ProUnitInit(void*,const wchar_t *,void**);
extern "C" void ProWstringToString(char*,wchar_t*);
-extern "C" void* ProMdlToPart(void*);
-extern "C" void* ProMdlToSolid(void*);
+extern "C" void* ProMdlToPart(void*v);
+extern "C" void* ProMdlToSolid(void*v);
extern "C" void** PRO_CURVE_DATA(void*);
Modified: brlcad/branches/extbuild/src/external/Creo/util.cpp
===================================================================
--- brlcad/branches/extbuild/src/external/Creo/util.cpp 2020-12-16 14:46:16 UTC
(rev 77976)
+++ brlcad/branches/extbuild/src/external/Creo/util.cpp 2020-12-16 14:47:25 UTC
(rev 77977)
@@ -167,12 +167,16 @@
extern "C" ProError regex_key(ProParameter *param, ProError UNUSED(status),
ProAppData app_data)
{
- char pname[CREO_NAME_MAX];
- char val[CREO_NAME_MAX];
- wchar_t wval[CREO_NAME_MAX];
- ProParamvalue pval;
+ char pname[CREO_NAME_MAX];
+ char val[CREO_NAME_MAX];
+ wchar_t wval[CREO_NAME_MAX];
+
+ regex_t reg;
+
+ ProParamvalue pval;
ProParamvalueType ptype;
- regex_t reg;
+ ProUnititem punits;
+
struct pparam_data *pdata = (struct pparam_data *)app_data;
if (pdata->val)
return PRO_TK_NO_ERROR;
@@ -185,7 +189,7 @@
}
regfree(®);
- if (ProParameterValueGet(param, &pval) != PRO_TK_NO_ERROR)
+ if (ProParameterValueWithUnitsGet(param, &pval, &punits) !=
PRO_TK_NO_ERROR)
return PRO_TK_CONTINUE;
if (ProParamvalueTypeGet(&pval, &ptype) != PRO_TK_NO_ERROR)
@@ -209,17 +213,20 @@
creo_attribute_val(char **val, const char *key, ProMdl m)
{
struct bu_vls cpval = BU_VLS_INIT_ZERO;
- wchar_t wkey[CREO_NAME_MAX];
- char cval[CREO_NAME_MAX];
- char *fval = NULL;
- ProError pstatus;
- ProModelitem mitm;
- ProParameter param;
+ wchar_t wkey[CREO_NAME_MAX];
+ wchar_t w_val[CREO_NAME_MAX];
+ char cval[CREO_NAME_MAX];
+ char *fval = NULL;
+
+ ProError pstatus;
+ ProModelitem mitm;
+ ProParameter param;
ProParamvalueType ptype;
- ProParamvalue pval;
- wchar_t w_val[CREO_NAME_MAX];
- short b_val;
- int i_val;
+ ProParamvalue pval;
+ ProUnititem punits;
+
+ short b_val;
+ int i_val;
double d_val;
ProStringToWstring(wkey, (char *)key);
@@ -230,7 +237,7 @@
if (pstatus != PRO_TK_NO_ERROR)
return PRO_TK_CONTINUE;
- ProParameterValueGet(¶m, &pval);
+ ProParameterValueWithUnitsGet(¶m, &pval, &punits);
ProParamvalueTypeGet(&pval, &ptype);
switch (ptype) {
case PRO_PARAM_STRING:
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
