Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merging in minor misc bug fixes and the recipe reader #118

Merged
merged 14 commits into from
Jun 9, 2015

Conversation

FlanFlanagan
Copy link
Member

Last one!

@@ -4,7 +4,6 @@
import java.util.ArrayList;
import java.util.Base64;
import java.util.Map;
import java.util.Optional;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we need this line!

@gidden
Copy link
Member

gidden commented Jun 9, 2015

I have confirmed save/load now can resave

@gidden
Copy link
Member

gidden commented Jun 9, 2015

hi @FlanFlanagan, it looks like the "number" box in the institution pane still has an issue. I now see the full render of "Add" when I open the box, but now the "number" field is too small to actually show anything. It also looks like the field may not be updating when you type, only when you click the add button?

@gidden
Copy link
Member

gidden commented Jun 9, 2015

facility forms remember user level, nice!

@gidden
Copy link
Member

gidden commented Jun 9, 2015

Hi @FlanFlanagan, I don't think the null commodity treatment is quite right (though I'm not sure the best way to fix it). What I see now is that when I choose "New Commodity", an empty entry pops up in the "Simulation Commodities" pane, but the choice on the facility archetype does not update if I write anything there. Again, I'm not sure exactly what should happen instead..

@gidden
Copy link
Member

gidden commented Jun 9, 2015

Hi @FlanFlanagan, since we're getting up very close to the wire, would it be possible to split this PR into different PRs based on which issue is being addressed? That way we can selectively update features that definitely work. Let me know if you'd like any guidance -- I'm happy to help.

@@ -108,6 +109,7 @@ public void replaceSelection(String text) {
}
}
};
protoNumber.setMaxWidth(20);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this is too narrow. You can't see the number - probably needs to be at least 60.

@gonuke
Copy link
Member

gonuke commented Jun 9, 2015

@gidden - I'm not sure how easy it will be to untanggle this - may be better to push through.

@gonuke
Copy link
Member

gonuke commented Jun 9, 2015

What if we push this branch as a feature branch to cyclus/cyclist2 and then we can collaborate on it with direct pushes to the branch, and a new PR

@gonuke gonuke mentioned this pull request Jun 9, 2015
@gonuke
Copy link
Member

gonuke commented Jun 9, 2015

replacing this with #122 for collaborative development

@gonuke
Copy link
Member

gonuke commented Jun 9, 2015

This is good now @FlanFlanagan - merging.

gonuke pushed a commit that referenced this pull request Jun 9, 2015
Merging in minor misc bug fixes and the recipe reader
@gonuke gonuke merged commit a152ed3 into cyclus:v1.3.0-release Jun 9, 2015
gidden added a commit that referenced this pull request Jun 9, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants