Commit d1a24067 authored by claes's avatar claes

wb load with ignore objid implemented

parent 9bdace30
/* /*
* Proview $Id: wb_vrepwbl.h,v 1.37 2006-05-24 15:00:41 claes Exp $ * Proview $Id: wb_vrepwbl.h,v 1.38 2007-10-23 08:54:16 claes Exp $
* Copyright (C) 2005 SSAB Oxelsund AB. * Copyright (C) 2005 SSAB Oxelsund AB.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
...@@ -40,7 +40,6 @@ class wb_vrepwbl : public wb_vrep ...@@ -40,7 +40,6 @@ class wb_vrepwbl : public wb_vrep
wb_erep *m_erep; wb_erep *m_erep;
wb_merep *m_merep; wb_merep *m_merep;
unsigned int m_nRef; unsigned int m_nRef;
bool m_ignore_oix;
map<string, ref_wblnode> m_type_list; map<string, ref_wblnode> m_type_list;
map<pwr_tTid, ref_wblnode> m_tid_list; map<pwr_tTid, ref_wblnode> m_tid_list;
...@@ -74,6 +73,7 @@ public: ...@@ -74,6 +73,7 @@ public:
int load_files( const char *file_spec); int load_files( const char *file_spec);
void info(); void info();
bool m_ignore_oix;
wb_wblfile *file[WBL_FILEMAX]; wb_wblfile *file[WBL_FILEMAX];
wb_wblnode *root_object; wb_wblnode *root_object;
......
/* /*
* Proview $Id: wb_wblnode.cpp,v 1.58 2007-09-19 15:19:10 claes Exp $ * Proview $Id: wb_wblnode.cpp,v 1.59 2007-10-23 08:54:16 claes Exp $
* Copyright (C) 2005 SSAB Oxelsund AB. * Copyright (C) 2005 SSAB Oxelsund AB.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
...@@ -1657,7 +1657,7 @@ void wb_wblnode::registerNode( wb_vrepwbl *vol) ...@@ -1657,7 +1657,7 @@ void wb_wblnode::registerNode( wb_vrepwbl *vol)
if ((second_child->getType() == tokens.VALUE) || if ((second_child->getType() == tokens.VALUE) ||
(second_child->getType() == tokens.INT)) { (second_child->getType() == tokens.INT)) {
string oixstr = second_child->getText(); string oixstr = second_child->getText();
if ( !stringToOix( oixstr.c_str(), &o->m_oid.oix)) { if ( !stringToOix( oixstr.c_str(), &o->m_oid.oix) || m_vrep->m_ignore_oix) {
o->m_oid.oix = m_vrep->nextOix(); o->m_oid.oix = m_vrep->nextOix();
} }
if ( third_child && third_child->getType() == tokens.ASC_TIME) { if ( third_child && third_child->getType() == tokens.ASC_TIME) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment