Skip to content

Commit a00ac27

Browse files
committed
bug fix for variables dialog
1 parent 4409eb4 commit a00ac27

File tree

3 files changed

+6
-11
lines changed

3 files changed

+6
-11
lines changed

app/project.cpp

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -783,16 +783,11 @@ void Project::Initialize()
783783
ClearStoredData();
784784

785785
initialize_ssc_project();
786-
786+
//update ssc based on parameter/variable values
787787
ssc_to_lk_hash(m_ssc_data, m_parameters);
788788
ssc_to_lk_hash(m_ssc_data, m_variables);
789789

790-
/*parameters default_params;
791-
lk_hash_to_ssc(m_ssc_data, default_params);
792-
ssc_to_lk_hash(m_ssc_data, m_parameters);*/
793-
794790
cluster_outputs.clear();
795-
796791
}
797792

798793
Project::Project()

app/vardialog.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ VariableDialog::VariableDialog(wxWindow *parent, std::vector< void* > vargroups,
1717

1818
m_variable_data.clear();
1919
for( std::vector<void*>::iterator vg = vargroups.begin(); vg != vargroups.end(); vg ++)
20-
m_variable_data.push_back( static_cast<lk::varhash_t*>( *vg ) );
20+
m_variable_data.push_back( static_cast<hash_base*>( *vg ) );
2121

2222
wxPanel* main_panel = new wxPanel(this);
2323

@@ -139,12 +139,12 @@ void VariableDialog::UpdateHelp(const char* filter, const char* type)
139139
m_anchor_list.clear();
140140
m_anchor_list.push_back("top");
141141

142-
for (std::vector< lk::varhash_t* >::iterator grit = m_variable_data.begin(); grit != m_variable_data.end(); grit++)
142+
for (std::vector< hash_base* >::iterator grit = m_variable_data.begin(); grit != m_variable_data.end(); grit++)
143143
{
144144
std::string filtered_group_items;
145145
std::string group_formatted;
146146

147-
for (lk::varhash_t::iterator vit = (*grit)->begin(); vit != (*grit)->end(); vit++)
147+
for (hash_base::iterator vit = (*grit)->begin(); vit != (*grit)->end(); vit++)
148148
{
149149
data_base* v = static_cast<data_base*>(vit->second);
150150

@@ -279,7 +279,7 @@ void VariableDialog::OnHtmlEvent(wxHtmlLinkEvent &evt)
279279
return;
280280
wxString var = idparse.back();
281281

282-
for( std::vector< lk::varhash_t* >::iterator vgroup = m_variable_data.begin();
282+
for( std::vector< hash_base* >::iterator vgroup = m_variable_data.begin();
283283
vgroup!= m_variable_data.end();
284284
vgroup ++ )
285285
{

app/vardialog.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class VariableDialog : public wxFrame
1919
wxTextCtrl *m_searchtext;
2020
wxComboBox *m_searchselect;
2121
wxHtmlWindow *m_html;
22-
std::vector< lk::varhash_t* > m_variable_data;
22+
std::vector< hash_base* > m_variable_data;
2323
std::vector< std::string > m_anchor_list;
2424

2525

0 commit comments

Comments
 (0)